Skip to content

Commit

Permalink
x11/gromit: revert/redo naive and actually incorrect previous build "…
Browse files Browse the repository at this point in the history
…fix"

I've noticed that the program started to crash after commit 363f2d5
due to missing function prototypes (guarded with GDK_DISABLE_DEPRECATED).
While I'm here, add EXAMPLES option and assume the port's maintainership.
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed Mar 21, 2024
1 parent 82151f5 commit eca5aa4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
20 changes: 8 additions & 12 deletions x11/gromit/Makefile
@@ -1,41 +1,37 @@
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/

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
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}

do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

.include <bsd.port.post.mk>
.include <bsd.port.mk>
2 changes: 1 addition & 1 deletion x11/gromit/files/patch-Makefile
Expand Up @@ -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

0 comments on commit eca5aa4

Please sign in to comment.