Date: Fri, 28 Feb 2014 21:24:51 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: bf@FreeBSD.org Subject: ports/187147: [PATCH] graphics/imlib2: fix X11 dependency Message-ID: <20140228172451.A6145164CE@hades.panopticon> Resent-Message-ID: <201402281730.s1SHU3oU020847@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187147
>Category: ports
>Synopsis: [PATCH] graphics/imlib2: fix X11 dependency
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 28 17:30:03 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
When imlib2's configure is run with --without-x, it adds #define
X_DISPLAY_MISSING into config.h and this X11 functionality is not
compiled it.
However, config.h is only used when imlib2 itself is build, and is
never installed, so after installation X_DISPLAY_MISSING is not
defined, which introduces hidden dependency on libX11, as to compile
Imlib2.h, you still need X11/Xlib.h
The patch attached fixes this by removing X11-related blocks in the
header completely when X11 option is disabled.
Port maintainer (bf@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- imlib2-1.4.6.patch begins here ---
diff -ruN /usr/ports/graphics/imlib2/Makefile ./Makefile
--- /usr/ports/graphics/imlib2/Makefile 2014-02-13 03:06:08.000000000 +0400
+++ ./Makefile 2014-02-28 21:14:30.981445010 +0400
@@ -98,8 +98,9 @@
.if ! ${PORT_OPTIONS:MX11}
post-patch:
@${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \
- ${WRKSRC}/src/lib/Makefile.in
-
+ ${WRKSRC}/src/lib/Makefile.in
+ @${REINPLACE_CMD} -e '/# ifndef X_DISPLAY_MISSING/,/# endif/ d' \
+ ${WRKSRC}/src/lib/Imlib2.h
.endif
.include <bsd.port.mk>
--- imlib2-1.4.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140228172451.A6145164CE>