Workaround breakage with gdk-pixbuf-csource and PTL2. Also, link the

gthread libraries into the gtk2 libraries and programs as some of them
implicitly want pthreads (PTL2).  Bump PKGREVISION.

6 files changed, 94 insertions, 17 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 6871091e0d2..0320902133a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/10/07 22:53:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/08 00:02:18 jlam Exp $
 #
 
 DISTNAME=		gtk+-2.0.6
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
@@ -16,15 +16,18 @@ COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
-USE_LIBTOOL=		yes
 USE_X11=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_GMAKE=		yes
 
 GNU_CONFIGURE=		 yes
 CONFIGURE_ARGS+=	--with-xinput=xfree
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+BUILD_DIRS=		${WRKSRC} ${WRKSRC}/demos/gtk-demo
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
 
@@ -37,4 +40,5 @@ post-install:
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 276ae2c789a..2ea2b18bba0 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2002/08/24 02:59:03 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2002/10/08 00:02:18 jlam Exp $
 
 SHA1 (gtk+-2.0.6.tar.gz) = 94b0f429d8f86742e385ae55881a52fbae2bb6e2
 Size (gtk+-2.0.6.tar.gz) = 8545717 bytes
-SHA1 (patch-aa) = 8fcc53371822d9672d7ad3de37241448f5927dc8
-SHA1 (patch-ab) = 88ccc48726501c1726ff202095087addd99ba4be
-SHA1 (patch-ac) = 33aab5703886362a3d412b8d115804b1ef132fb7
+SHA1 (patch-aa) = 3b5f08aca671cb965d3f9cdd078ca0ad9c2c644e
+SHA1 (patch-ab) = d9c84c3d896a999746e7750ead9791309e99e93d
+SHA1 (patch-ac) = 73793591a49fc5d600617240c92cb7369568cef8
 SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b
 SHA1 (patch-ae) = bb68fd2552b080f98c90c562de94780ff14bf4f2
 SHA1 (patch-af) = 387012e67fc3129cce87807d108ea1474ab4e90a
@@ -18,3 +18,4 @@ SHA1 (patch-am) = 80bcc1a0eff0b4be3e3f9375a5541954cea48266
 SHA1 (patch-an) = cee3722807b69b8c42d83505e99ef5abb2182f81
 SHA1 (patch-ao) = 9689fd1632e0dbe06bb2ca7fc1116b62cd3058e4
 SHA1 (patch-ap) = 384de00d880e1bc6123205a8f3e6545b0856de02
+SHA1 (patch-aq) = 1e5330847d80f3e39b6949a79a48a7e94b64bb4f
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index cbc60799ae5..18b6ad8498e 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2002/08/25 19:23:32 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
 
---- configure.orig	Sun Jun 16 00:58:22 2002
+--- configure.orig	Wed Jul 31 14:12:14 2002
 +++ configure
-@@ -10391,7 +10391,7 @@
+@@ -10391,7 +10391,7 @@ LIBS="$LIBS $INTLLIBS"
  
  # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -11,3 +11,44 @@ $NetBSD: patch-aa,v 1.5 2002/08/25 19:23:32 jlam Exp $
  
  
  echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
+@@ -14347,11 +14347,11 @@ echo "$as_me: error: Could not find a gd
+   fi
+ fi
+ 
+-GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
++GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0 gthread-2.0"
+ GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
+ GDK_PIXBUF_EXTRA_CFLAGS=
+ GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
++GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+ 
+ 
+ 
+@@ -16861,7 +16861,7 @@ fi
+ 
+ GDK_PIXBUF_XLIB_PACKAGES=
+ GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
++GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
+ 
+ 
+ 
+@@ -17077,7 +17077,7 @@ LDFLAGS="$saved_ldflags"
+ 
+ GDK_PACKAGES=$PANGO_PACKAGES
+ GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+ 
+ #
+ # If we aren't writing explicit dependencies, then don't put the extra libraries we need
+@@ -17195,7 +17195,7 @@ GTK_PACKAGES=atk
+ GTK_EXTRA_LIBS=
+ GTK_EXTRA_CFLAGS=
+ GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
+-GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
++GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+ 
+ 
+ 
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index e1c2e2dfc09..db6857b8cdd 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.5 2002/10/08 00:02:18 jlam Exp $
 
---- demos/Makefile.am.orig	Fri Mar  8 01:36:21 2002
+--- demos/Makefile.am.orig	Mon Jul 29 20:09:49 2002
 +++ demos/Makefile.am
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ DEPS = \
  	$(top_builddir)/gtk/@gtktargetlib@
  
  LDADDS = @STRIP_BEGIN@ 							\
@@ -10,3 +10,12 @@ $NetBSD: patch-ab,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
  	$(top_builddir)/gdk/@gdktargetlib@        			\
  	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@@ -35,7 +36,7 @@ noinst_PROGRAMS = 		\
+ if CROSS_COMPILING
+ pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
+ else
+-pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
++pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf $$topdir/gdk-pixbuf/gdk-pixbuf-csource
+ endif
+ 
+ test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index fa08e477d84..5ea3ef295d6 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2002/08/25 19:23:32 jlam Exp $
+$NetBSD: patch-ac,v 1.7 2002/10/08 00:02:18 jlam Exp $
 
---- demos/Makefile.in.orig	Sun Jun 16 01:16:31 2002
+--- demos/Makefile.in.orig	Wed Jul 31 15:10:15 2002
 +++ demos/Makefile.in
-@@ -195,6 +195,7 @@
+@@ -195,6 +195,7 @@ DEPS = \
  
  
  LDADDS = @STRIP_BEGIN@ 							\
@@ -10,3 +10,12 @@ $NetBSD: patch-ac,v 1.6 2002/08/25 19:23:32 jlam Exp $
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
  	$(top_builddir)/gdk/@gdktargetlib@        			\
  	$(top_builddir)/gtk/@gtktargetlib@ 				\
+@@ -210,7 +211,7 @@ noinst_PROGRAMS = \
+ 	pixbuf-demo
+ 
+ @CROSS_COMPILING_TRUE@pixbuf_csource = @CROSS_COMPILING_TRUE@$(GDK_PIXBUF_CSOURCE)
+-@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
++@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf $$topdir/gdk-pixbuf/gdk-pixbuf-csource
+ 
+ testpixbuf_DEPENDENCIES = $(DEPS)
+ testpixbuf_drawable_DEPENDENCIES = $(DEPS)
diff --git a/x11/gtk2/patches/patch-aq b/x11/gtk2/patches/patch-aq
new file mode 100644
index 00000000000..d389fffd515
--- /dev/null
+++ b/x11/gtk2/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2002/10/08 00:02:19 jlam Exp $
+
+--- Makefile.in.orig	Mon Oct  7 15:50:30 2002
++++ Makefile.in
+@@ -174,7 +174,7 @@ l = @l@
+ ms_librarian = @ms_librarian@
+ xinput_progs = @xinput_progs@
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
+ SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+ 
+ # require automake 1.4