From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 28 17:30:04 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DFCCB3E for ; Fri, 28 Feb 2014 17:30:04 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DCFCE129C for ; Fri, 28 Feb 2014 17:30:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1SHU3uB020848 for ; Fri, 28 Feb 2014 17:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1SHU3oU020847; Fri, 28 Feb 2014 17:30:03 GMT (envelope-from gnats) Resent-Date: Fri, 28 Feb 2014 17:30:03 GMT Resent-Message-Id: <201402281730.s1SHU3oU020847@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B9D4ABB; Fri, 28 Feb 2014 17:24:57 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E86F41269; Fri, 28 Feb 2014 17:24:56 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WJRB6-0000bo-5Z; Fri, 28 Feb 2014 21:24:52 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id BCDD78FD; Fri, 28 Feb 2014 21:24:51 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id A6145164CE; Fri, 28 Feb 2014 21:24:51 +0400 (MSK) Message-Id: <20140228172451.A6145164CE@hades.panopticon> Date: Fri, 28 Feb 2014 21:24:51 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187147: [PATCH] graphics/imlib2: fix X11 dependency Cc: bf@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 17:30:04 -0000 >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 --- imlib2-1.4.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: