Date: Thu, 21 Mar 2024 10:24:40 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eca5aa49bdb0 - main - x11/gromit: revert/redo naive and actually incorrect previous build "fix" Message-ID: <202403211024.42LAOefK048995@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=eca5aa49bdb0e8ec11402678bf5994666c4289c4 commit eca5aa49bdb0e8ec11402678bf5994666c4289c4 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-03-21 10:23:56 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2024-03-21 10:23:56 +0000 x11/gromit: revert/redo naive and actually incorrect previous build "fix" I've noticed that the program started to crash after commit 363f2d568101 due to missing function prototypes (guarded with GDK_DISABLE_DEPRECATED). While I'm here, add EXAMPLES option and assume the port's maintainership. --- x11/gromit/Makefile | 20 ++++++++------------ x11/gromit/files/patch-Makefile | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile index 8fb2f1302595..98d08a80a227 100644 --- a/x11/gromit/Makefile +++ b/x11/gromit/Makefile @@ -1,10 +1,10 @@ PORTNAME= gromit PORTVERSION= 20041213 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= GRaphics Over Miscellaneous Objects (Gromit) WWW= https://www.home.unix-ag.org/simon/gromit/ @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz USES= gnome pkgconfig xorg USE_GNOME= cairo gdkpixbuf2 gtk20 @@ -21,16 +21,12 @@ USE_XORG= x11 DOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= DOCS - -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=int-conversion -.endif +OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gromit ${STAGEDIR}${PREFIX}/bin + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/gromitrc ${STAGEDIR}${EXAMPLESDIR} @@ -38,4 +34,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gromit/files/patch-Makefile b/x11/gromit/files/patch-Makefile index aa8153a5752e..e841a3bc1168 100644 --- a/x11/gromit/files/patch-Makefile +++ b/x11/gromit/files/patch-Makefile @@ -5,4 +5,4 @@ gromit: gromit.c Makefile - gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0` -+ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0 x11` -lm ++ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0 x11` -lm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403211024.42LAOefK048995>