update to 2.22.0

This switches to the gnome-2.32 release branch

3 files changed, 9 insertions, 42 deletions

diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
deleted file mode 100644
index 144f4c51bb5..00000000000
--- a/x11/gtk2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2009/10/21 15:34:06 drochner Exp $
-
---- gdk-pixbuf/Makefile.in.orig	2009-09-23 04:22:48.000000000 +0200
-+++ gdk-pixbuf/Makefile.in
-@@ -1324,7 +1324,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
- gdk_pixbuf_csource_LDADD = $(LDADDS)
- gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
--gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) __PTHREAD_FLAGS__
- gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
- 
- #
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 21b35e6fa94..57ba77c8148 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,28 +1,8 @@
-$NetBSD: patch-af,v 1.18 2010/06/13 22:45:39 wiz Exp $
+$NetBSD: patch-af,v 1.19 2010/11/15 18:28:45 drochner Exp $
 
---- configure.orig	2010-05-02 23:55:05.000000000 +0000
+--- configure.orig	2010-09-23 14:27:27.000000000 +0000
 +++ configure
-@@ -21748,14 +21748,14 @@ $as_echo "$as_me: WARNING: *** JPEG load
- fi
- 
-   if test x$with_libpng != xno && test -z "$LIBPNG"; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
--$as_echo_n "checking for libpng12... " >&6; }
--    if $PKG_CONFIG --exists libpng12 ; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-+$as_echo_n "checking for libpng... " >&6; }
-+    if $PKG_CONFIG --exists libpng ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-         PNG='png'
--	PNG_DEP_CFLAGS_PACKAGES=libpng12
--	LIBPNG=`$PKG_CONFIG --libs libpng12`
-+	PNG_DEP_CFLAGS_PACKAGES=libpng
-+	LIBPNG=`$PKG_CONFIG --libs libpng`
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -23098,7 +23098,7 @@ _ACEOF
+@@ -21936,7 +21936,7 @@ _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index 80aec9904df..99d1b09a0cd 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.13 2009/10/21 15:34:06 drochner Exp $
+$NetBSD: patch-aj,v 1.14 2010/11/15 18:28:45 drochner Exp $
 
---- Makefile.in.orig	2009-09-23 04:22:53.000000000 +0200
+--- Makefile.in.orig	2010-09-23 14:27:26.000000000 +0000
 +++ Makefile.in
-@@ -464,7 +464,7 @@ XVFB_START = \
+@@ -458,7 +458,7 @@ XVFB_START = \
  	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  
  # require automake 1.4