pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/gtk2 Use ${COMPILER_RPATH_FLAG} instead of -R for ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f4cb49e2d43
branches:  trunk
changeset: 567888:7f4cb49e2d43
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Nov 27 16:54:29 2009 +0000

description:
Use ${COMPILER_RPATH_FLAG} instead of -R for X_LIBS in pkg-config files.
This fixes firefox run-time breakage with native X11 on netbsd-4 caused by
pkgsrc wrappers not dealing with -R.
Bump PKGREVISION.

diffstat:

 x11/gtk2/Makefile         |   3 ++-
 x11/gtk2/distinfo         |   3 ++-
 x11/gtk2/patches/patch-af |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r 26ae6b2afb0d -r 7f4cb49e2d43 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Fri Nov 27 13:34:25 2009 +0000
+++ b/x11/gtk2/Makefile Fri Nov 27 16:54:29 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.190 2009/11/18 08:11:08 wiz Exp $
+# $NetBSD: Makefile,v 1.191 2009/11/27 16:54:29 tnn Exp $
 
 DISTNAME=              gtk+-2.18.3
+PKGREVISION=           1
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/2.18/ \
diff -r 26ae6b2afb0d -r 7f4cb49e2d43 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Fri Nov 27 13:34:25 2009 +0000
+++ b/x11/gtk2/distinfo Fri Nov 27 16:54:29 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2009/10/21 15:34:06 drochner Exp $
+$NetBSD: distinfo,v 1.118 2009/11/27 16:54:30 tnn Exp $
 
 SHA1 (gtk+-2.18.3.tar.bz2) = a5432017a3116cb66460150d089e8aedbe756641
 RMD160 (gtk+-2.18.3.tar.bz2) = 44b44501d8ef3490787964200b52965d9d282d5c
@@ -8,6 +8,7 @@
 SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104
 SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
 SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
+SHA1 (patch-af) = 372a21cdb884e7c62852680d0029ded12c706efd
 SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
 SHA1 (patch-iojpeg) = 0042e773df5ed24abea22fa4b15469db0457d88d
diff -r 26ae6b2afb0d -r 7f4cb49e2d43 x11/gtk2/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-af Fri Nov 27 16:54:29 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.16 2009/11/27 16:54:30 tnn Exp $
+
+--- configure.orig     2009-10-17 03:53:05.000000000 +0200
++++ configure
+@@ -28849,7 +28849,7 @@ $as_echo "$ac_try_echo") >&5
+        }; then
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+-       X_LIBS="$X_LIBS -R$x_libraries"
++       X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5



Home | Main Index | Thread Index | Old Index