diff options
| author | tron <tron> | 2009-11-29 15:33:19 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-11-29 15:33:19 +0000 |
| commit | e51aa7373c1d462bb8c6f83b0f54228f08cc21c6 (patch) | |
| tree | a43ce28036b74b219cad1b65b455dae2430441d5 | |
| parent | f7d73d614be48df96bb356b57805f1ea91486992 (diff) | |
| download | pkgsrc-e51aa7373c1d462bb8c6f83b0f54228f08cc21c6.tar.gz | |
Pullup ticket #2937 - requested by tnn
gtk2: portability fix
Revisions pulled up:
- x11/gtk2/Makefile 1.191 (via patch)
- x11/gtk2/distinfo 1.118 (via patch)
- x11/gtk2/patches/patch-af 1.16
---
Module Name: pkgsrc
Committed By: tnn
Date: Fri Nov 27 16:54:30 UTC 2009
Modified Files:
pkgsrc/x11/gtk2: Makefile distinfo
Added Files:
pkgsrc/x11/gtk2/patches: patch-af
Log Message:
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.
| -rw-r--r-- | x11/gtk2/Makefile | 3 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-af | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 42862f0023b..f8377f03022 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.188 2009/10/05 08:39:06 sketch Exp $ +# $NetBSD: Makefile,v 1.188.2.1 2009/11/29 15:33:19 tron Exp $ DISTNAME= gtk+-2.16.6 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/gtk/gtk2/} PKGREVISION= 2 CATEGORIES= x11 diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 083642b0722..4cadc646046 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.116 2009/08/29 18:00:00 wiz Exp $ +$NetBSD: distinfo,v 1.116.2.1 2009/11/29 15:33:19 tron Exp $ SHA1 (gtk+-2.16.6.tar.bz2) = f69cb48311d60664bac7cf68351c175c7a214ae6 RMD160 (gtk+-2.16.6.tar.bz2) = 1048704042ffbbabe0de60278f49f8b7700f2d1f @@ -8,6 +8,7 @@ SHA1 (patch-ab) = 075dcdceeeea06d93802643b9bd2c23f0ee32a64 SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104 SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15 SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863 +SHA1 (patch-af) = 372a21cdb884e7c62852680d0029ded12c706efd SHA1 (patch-aj) = 4e36ab908ae14d81bd62c3eb170be87f14bb6a35 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79 SHA1 (patch-iojpeg) = 0042e773df5ed24abea22fa4b15469db0457d88d diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af new file mode 100644 index 00000000000..b908a64ae34 --- /dev/null +++ b/x11/gtk2/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.16.2.2 2009/11/29 15:33:19 tron 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 |