summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanw <danw@pkgsrc.org>2003-10-04 18:03:26 +0000
committerdanw <danw@pkgsrc.org>2003-10-04 18:03:26 +0000
commit20f673d41ef7a3c89f0ab833fabc204d2de8879c (patch)
tree285c31d92cfdc5559c62acd34613efb0c7b3faf7
parent888b092600157004a1f88f76cd001f1e8acb95e7 (diff)
downloadpkgsrc-20f673d41ef7a3c89f0ab833fabc204d2de8879c.tar.gz
Fixes for Darwin: add CONFIG_SUB_OVERRIDE, don't use X shared memory
extension, and tweak the gtk-config patch so it's still syntactically correct after RPATH_FLAG stripping
-rw-r--r--x11/gtk/Makefile3
-rw-r--r--x11/gtk/distinfo5
-rw-r--r--x11/gtk/patches/patch-af4
-rw-r--r--x11/gtk/patches/patch-ag13
4 files changed, 20 insertions, 5 deletions
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 69552227062..aceecf9ed95 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2003/08/09 11:34:09 seb Exp $
+# $NetBSD: Makefile,v 1.91 2003/10/04 18:03:26 danw Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 5
@@ -20,6 +20,7 @@ USE_GMAKE= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub
PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+.pc.in
diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo
index d788d1bf0f7..597e702c6fb 100644
--- a/x11/gtk/distinfo
+++ b/x11/gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/10/30 03:09:39 rh Exp $
+$NetBSD: distinfo,v 1.7 2003/10/04 18:03:26 danw Exp $
SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
Size (gtk+-1.2.10.tar.gz) = 2868322 bytes
@@ -7,4 +7,5 @@ SHA1 (patch-ab) = 17db6fd368e0bc63437f3f0a3d47ca9042cffea9
SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db
SHA1 (patch-ad) = 86c29afeaf008e0412298047da6e7cb545c8fc60
SHA1 (patch-ae) = 8ad654085ee8688d083e00b5f968dd732285ff9c
-SHA1 (patch-af) = d969891b6d8fa493294971894b5a355023c75460
+SHA1 (patch-af) = 22846f1bd14d6ba7f071d98afb2910ea4cb528c0
+SHA1 (patch-ag) = fb08ae3210a6994c633b45f15bbe5adcb26c4284
diff --git a/x11/gtk/patches/patch-af b/x11/gtk/patches/patch-af
index 3353533debf..600f53ae5f7 100644
--- a/x11/gtk/patches/patch-af
+++ b/x11/gtk/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1999/04/29 11:14:35 tron Exp $
+$NetBSD: patch-af,v 1.3 2003/10/04 18:03:26 danw Exp $
--- gtk-config.in.orig Tue Feb 2 00:17:38 1999
+++ gtk-config.in Thu Apr 29 12:13:36 1999
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.2 1999/04/29 11:14:35 tron Exp $
+ libdirs="-L@libdir@ -Wl,-R@libdir@"
for i in $glib_libs ; do
- if test $i != -L@libdir@ ; then
-+ if test $i != -L@libdir@ -a $i != -Wl,-R@libdir@ ; then
++ if test $i != -L@libdir@ -a x$i != x-Wl,-R@libdir@ ; then
if test -z "$my_glib_libs" ; then
my_glib_libs="$i"
else
diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag
new file mode 100644
index 00000000000..c66ccf59a85
--- /dev/null
+++ b/x11/gtk/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 2003/10/04 18:03:26 danw Exp $
+
+--- gdk/gdkimage.c.orig Tue Sep 16 05:41:17 2003
++++ gdk/gdkimage.c Tue Sep 16 05:41:23 2003
+@@ -30,7 +30,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+
+-#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
++#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) && !defined (__APPLE__)
+ #define USE_SHM
+ #endif
+