Hi,

and finally here are updates to latest stable releases of new glib/gtk2
branches. Some of the regress tests are failing too on sparc64, but this
is in the pipe. This doesn't _require_ previous cairo/atk/pango updates.
Gtk now embeds x11/gnome/gail, so they @conflict. I'm not sure of the
shlib version for gailutil, maybe it should follow the other libs'
versionning scheme.

Like the others, please put them in bulk builds and report
failures/fallouts. Comments on the diffs welcomed too !

Landry
? regress.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile    27 Sep 2008 17:58:25 -0000      1.51
+++ Makefile    19 Oct 2008 18:26:01 -0000
@@ -3,7 +3,7 @@
 COMMENT-main=          general-purpose utility library
 COMMENT-docs=          glib2 documentation
 
-VERSION=               2.16.6
+VERSION=               2.18.2
 DISTNAME=              glib-${VERSION}
 PKGNAME-main=          glib2-${VERSION}
 PKGNAME-docs=          glib2-docs-${VERSION}
@@ -11,11 +11,11 @@
 
 HOMEPAGE=              http://www.gtk.org/
 
-SHARED_LIBS+=  glib-2.0                1600.2
-SHARED_LIBS+=  gobject-2.0             1600.2
-SHARED_LIBS+=  gmodule-2.0             1600.2
-SHARED_LIBS+=  gthread-2.0             1600.2 
-SHARED_LIBS+=  gio-2.0                 1600.2
+SHARED_LIBS+=  glib-2.0                1800.0 #.1800.2
+SHARED_LIBS+=  gobject-2.0             1800.0
+SHARED_LIBS+=  gmodule-2.0             1800.0
+SHARED_LIBS+=  gthread-2.0             1800.0
+SHARED_LIBS+=  gio-2.0                 1800.0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -23,7 +23,7 @@
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/glib/2.16/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/glib/2.18/}
 EXTRACT_SUFX=          .tar.bz2
 
 MULTI_PACKAGES=                -main -docs
@@ -59,5 +59,10 @@
 # Port has "/usr/local" hardcoded, we prefer ${LOCALBASE}
 pre-build:
        perl -pi -e "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/glib/gutils.c
+
+# regress fail
+#checking g_time_val_to_iso8601...
+#        => date string = 1970-01-01T00:00:00Z (should be: 
1980-02-22T10:36:00Z)
+#ERROR:testglib.c:1375:various_string_tests: assertion failed: (strcmp 
(date_str, REF_STR_UTC) == 0)
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/glib2/distinfo,v
retrieving revision 1.29
diff -u -r1.29 distinfo
--- distinfo    27 Sep 2008 17:58:25 -0000      1.29
+++ distinfo    19 Oct 2008 18:26:01 -0000
@@ -1,5 +1,5 @@
-MD5 (glib-2.16.6.tar.bz2) = Zk5ZCTwxiWo6RrfNk/3T3Q==
-RMD160 (glib-2.16.6.tar.bz2) = OrCgNTpNiQhBzBteZA6kHFjlem4=
-SHA1 (glib-2.16.6.tar.bz2) = 1IHJqZ1f6J/4E32n/X1pD1pHl5U=
-SHA256 (glib-2.16.6.tar.bz2) = w9j4MbjRJ5Bfjn8Gb/U5hmj6JvahgJRbMqVkHAPEKSU=
-SIZE (glib-2.16.6.tar.bz2) = 4575345
+MD5 (glib-2.18.2.tar.bz2) = 0RpcxeCM/1M0mjSBgW/a/w==
+RMD160 (glib-2.18.2.tar.bz2) = Ut9WN13ZfAeDeuCF3ARc8p1vWaE=
+SHA1 (glib-2.18.2.tar.bz2) = Tq9z/tpC6OzwBlT1bjj3/t1qkmY=
+SHA256 (glib-2.18.2.tar.bz2) = lematPHMyavUhjauKu76EC2XSaX8jqY4bkRoOUL9czM=
+SIZE (glib-2.18.2.tar.bz2) = 4760532
Index: patches/patch-docs_reference_glib_Makefile_in
===================================================================
RCS file: patches/patch-docs_reference_glib_Makefile_in
diff -N patches/patch-docs_reference_glib_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-docs_reference_glib_Makefile_in       19 Oct 2008 18:26:01 
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- docs/reference/glib/Makefile.in.orig       Sat Oct 18 17:32:18 2008
++++ docs/reference/glib/Makefile.in    Sat Oct 18 17:33:31 2008
+@@ -378,8 +378,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
+ ########################################################################
+ man_MANS = \
+       glib-gettextize.1       \
+-      gtester.1               \
+-      gtester-report.1
++      gtester.1
+ 
+ BUILT_EXTRA_DIST = $(man_MANS)
+ all: all-am
Index: patches/patch-glib_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_Makefile_in,v
retrieving revision 1.10
diff -u -r1.10 patch-glib_Makefile_in
--- patches/patch-glib_Makefile_in      8 Jul 2008 08:38:26 -0000       1.10
+++ patches/patch-glib_Makefile_in      19 Oct 2008 18:26:01 -0000
@@ -2,12 +2,12 @@
 
 Don't install gtester-report, it'll only pull in python.
 
---- glib/Makefile.in.orig      Tue Jul  1 21:31:19 2008
-+++ glib/Makefile.in   Wed Jul  2 05:03:56 2008
-@@ -596,7 +596,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2)
- @[EMAIL PROTECTED] = libglib-2.0.la
+--- glib/Makefile.in.orig      Thu Oct 16 16:41:09 2008
++++ glib/Makefile.in   Sat Oct 18 16:47:49 2008
+@@ -616,7 +616,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
+ @OS_WIN32_TRUE@@[EMAIL PROTECTED] = libglib-2.0.la
  @[EMAIL PROTECTED] = gtester.c
- @[EMAIL PROTECTED] = libglib-2.0.la
+ @[EMAIL PROTECTED] = libglib-2.0.la 
 [EMAIL PROTECTED]@auto_config_binscripts = gtester-report
 [EMAIL PROTECTED]@auto_config_binscripts =
  @[EMAIL PROTECTED] = ${auto_config_binscripts}
Index: patches/patch-glib_gmacros_h
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gmacros_h,v
retrieving revision 1.8
diff -u -r1.8 patch-glib_gmacros_h
--- patches/patch-glib_gmacros_h        9 Apr 2008 13:10:17 -0000       1.8
+++ patches/patch-glib_gmacros_h        19 Oct 2008 18:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-glib_gmacros_h,v 1.8 2008/04/09 13:10:17 jasper Exp $
---- glib/gmacros.h.orig        Mon Feb 11 18:14:22 2008
-+++ glib/gmacros.h     Fri Feb 22 11:40:05 2008
-@@ -34,6 +34,7 @@
+--- glib/gmacros.h.orig        Thu Oct 16 16:31:58 2008
++++ glib/gmacros.h     Sat Oct 18 16:46:26 2008
+@@ -38,6 +38,7 @@
  /* We include stddef.h to get the system's definition of NULL
   */
  #include <stddef.h>
@@ -9,7 +9,7 @@
  
  /* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
   * where this is valid. This allows for warningless compilation of
-@@ -171,11 +172,13 @@
+@@ -183,11 +184,13 @@
  #define       TRUE    (!FALSE)
  #endif
  
Index: patches/patch-glib_gprintf_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gprintf_c,v
retrieving revision 1.4
diff -u -r1.4 patch-glib_gprintf_c
--- patches/patch-glib_gprintf_c        24 Oct 2007 22:29:03 -0000      1.4
+++ patches/patch-glib_gprintf_c        19 Oct 2008 18:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-glib_gprintf_c,v 1.4 2007/10/24 22:29:03 jasper Exp $
---- glib/gprintf.c.orig        Sun Sep 16 18:28:33 2007
-+++ glib/gprintf.c     Tue Oct  2 20:47:04 2007
-@@ -87,6 +87,8 @@ g_fprintf (FILE        *file, 
+--- glib/gprintf.c.orig        Thu Oct 16 16:31:58 2008
++++ glib/gprintf.c     Sat Oct 18 16:46:26 2008
+@@ -89,6 +89,8 @@ g_fprintf (FILE        *file, 
    return retval;
  }
  
@@ -10,7 +10,7 @@
  /**
   * g_sprintf:
   * @string: A pointer to a memory buffer to contain the resulting string. It 
-@@ -210,6 +212,8 @@ g_vfprintf (FILE        *file,
+@@ -212,6 +214,8 @@ g_vfprintf (FILE        *file,
    return _g_vfprintf (file, format, args);
  }
  
Index: patches/patch-glib_gstrfuncs_c
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_gstrfuncs_c,v
retrieving revision 1.7
diff -u -r1.7 patch-glib_gstrfuncs_c
--- patches/patch-glib_gstrfuncs_c      9 Apr 2008 13:10:17 -0000       1.7
+++ patches/patch-glib_gstrfuncs_c      19 Oct 2008 18:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-glib_gstrfuncs_c,v 1.7 2008/04/09 13:10:17 jasper Exp $
---- glib/gstrfuncs.c.orig      Mon Feb 11 18:14:22 2008
-+++ glib/gstrfuncs.c   Fri Feb 22 11:40:05 2008
-@@ -1311,7 +1311,7 @@ g_strerror (gint errnum)
+--- glib/gstrfuncs.c.orig      Thu Oct 16 16:31:58 2008
++++ glib/gstrfuncs.c   Sat Oct 18 16:46:26 2008
+@@ -1313,7 +1313,7 @@ g_strerror (gint errnum)
        g_static_private_set (&msg_private, msg, g_free);
      }
  
@@ -10,7 +10,7 @@
  
    errno = saved_errno;
    return msg;
-@@ -1461,7 +1461,7 @@ extern const char *strsignal(int);
+@@ -1463,7 +1463,7 @@ extern const char *strsignal(int);
        g_static_private_set (&msg_private, msg, g_free);
      }
  
Index: patches/patch-tests_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-tests_Makefile_in
--- patches/patch-tests_Makefile_in     8 Jul 2008 08:38:26 -0000       1.8
+++ patches/patch-tests_Makefile_in     19 Oct 2008 18:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-tests_Makefile_in,v 1.8 2008/07/08 08:38:26 brad Exp $
---- tests/Makefile.in.orig     Tue Jul  1 21:31:21 2008
-+++ tests/Makefile.in  Wed Jul  2 05:03:57 2008
-@@ -718,7 +718,6 @@ test_programs = \
+--- tests/Makefile.in.orig     Thu Oct 16 16:41:11 2008
++++ tests/Makefile.in  Sat Oct 18 16:46:27 2008
+@@ -672,7 +672,6 @@ test_programs = \
        tree-test                               \
        type-test                               \
        unicode-caseconv                        \
Index: patches/patch-tests_refcount_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_refcount_Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-tests_refcount_Makefile_in
--- patches/patch-tests_refcount_Makefile_in    8 Jul 2008 08:38:26 -0000       
1.8
+++ patches/patch-tests_refcount_Makefile_in    19 Oct 2008 18:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-tests_refcount_Makefile_in,v 1.8 2008/07/08 08:38:26 brad Exp $
---- tests/refcount/Makefile.in.orig    Tue Jul  1 21:31:21 2008
-+++ tests/refcount/Makefile.in Wed Jul  2 05:03:57 2008
-@@ -345,7 +345,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
+--- tests/refcount/Makefile.in.orig    Thu Oct 16 16:41:11 2008
++++ tests/refcount/Makefile.in Sat Oct 18 16:46:27 2008
+@@ -343,7 +343,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
  libgobject = $(top_builddir)/gobject/libgobject-2.0.la
  LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
  test_programs = \
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/devel/glib2/pkg/PLIST-docs,v
retrieving revision 1.14
diff -u -r1.14 PLIST-docs
--- pkg/PLIST-docs      9 Apr 2008 13:10:18 -0000       1.14
+++ pkg/PLIST-docs      19 Oct 2008 18:26:01 -0000
@@ -11,6 +11,8 @@
 share/gtk-doc/html/gio/GDataInputStream.html
 share/gtk-doc/html/gio/GDataOutputStream.html
 share/gtk-doc/html/gio/GDrive.html
+share/gtk-doc/html/gio/GEmblem.html
+share/gtk-doc/html/gio/GEmblemedIcon.html
 share/gtk-doc/html/gio/GFile.html
 share/gtk-doc/html/gio/GFileEnumerator.html
 share/gtk-doc/html/gio/GFileIcon.html
@@ -47,6 +49,7 @@
 share/gtk-doc/html/gio/ch15s02.html
 share/gtk-doc/html/gio/ch15s03.html
 share/gtk-doc/html/gio/extending.html
+share/gtk-doc/html/gio/extending-gio.html
 share/gtk-doc/html/gio/file_mon.html
 share/gtk-doc/html/gio/file_ops.html
 share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
@@ -56,7 +59,6 @@
 share/gtk-doc/html/gio/gio-GIOError.html
 share/gtk-doc/html/gio/gio-GIOScheduler.html
 share/gtk-doc/html/gio/gio-Unix-Mounts.html
-share/gtk-doc/html/gio/gio-extension-points.html
 share/gtk-doc/html/gio/gio-hierarchy.html
 share/gtk-doc/html/gio/gio.devhelp
 share/gtk-doc/html/gio/gio.devhelp2
@@ -66,6 +68,7 @@
 share/gtk-doc/html/gio/index.html
 share/gtk-doc/html/gio/index.sgml
 share/gtk-doc/html/gio/ix01.html
+share/gtk-doc/html/gio/ix02.html
 share/gtk-doc/html/gio/left.png
 share/gtk-doc/html/gio/migrating.html
 share/gtk-doc/html/gio/pt01.html
@@ -159,6 +162,8 @@
 share/gtk-doc/html/glib/glib.devhelp
 share/gtk-doc/html/glib/glib.devhelp2
 share/gtk-doc/html/glib/glib.html
+share/gtk-doc/html/glib/gtester-report.html
+share/gtk-doc/html/glib/gtester.html
 share/gtk-doc/html/glib/home.png
 share/gtk-doc/html/glib/index.html
 share/gtk-doc/html/glib/index.sgml
@@ -172,6 +177,7 @@
 share/gtk-doc/html/glib/ix08.html
 share/gtk-doc/html/glib/ix09.html
 share/gtk-doc/html/glib/ix10.html
+share/gtk-doc/html/glib/ix11.html
 share/gtk-doc/html/glib/left.png
 share/gtk-doc/html/glib/mainloop-states.gif
 share/gtk-doc/html/glib/right.png
@@ -183,8 +189,6 @@
 share/gtk-doc/html/gobject/GTypePlugin.html
 share/gtk-doc/html/gobject/ch01s02.html
 share/gtk-doc/html/gobject/ch06s03.html
-share/gtk-doc/html/gobject/ch07s02.html
-share/gtk-doc/html/gobject/ch07s03.html
 share/gtk-doc/html/gobject/chapter-gobject.html
 share/gtk-doc/html/gobject/chapter-gtype.html
 share/gtk-doc/html/gobject/chapter-intro.html
@@ -234,6 +238,7 @@
 share/gtk-doc/html/gobject/ix07.html
 share/gtk-doc/html/gobject/ix08.html
 share/gtk-doc/html/gobject/ix09.html
+share/gtk-doc/html/gobject/ix10.html
 share/gtk-doc/html/gobject/left.png
 share/gtk-doc/html/gobject/pr01.html
 share/gtk-doc/html/gobject/pt01.html
@@ -248,4 +253,5 @@
 share/gtk-doc/html/gobject/tools-gob.html
 share/gtk-doc/html/gobject/tools-gtkdoc.html
 share/gtk-doc/html/gobject/tools-refdb.html
+share/gtk-doc/html/gobject/tools-vala.html
 share/gtk-doc/html/gobject/up.png
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/glib2/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -r1.5 PLIST-main
--- pkg/PLIST-main      8 Jul 2008 08:38:26 -0000       1.5
+++ pkg/PLIST-main      19 Oct 2008 18:26:01 -0000
@@ -23,6 +23,8 @@
 include/glib-2.0/gio/gdatainputstream.h
 include/glib-2.0/gio/gdataoutputstream.h
 include/glib-2.0/gio/gdrive.h
+include/glib-2.0/gio/gemblem.h
+include/glib-2.0/gio/gemblemedicon.h
 include/glib-2.0/gio/gfile.h
 include/glib-2.0/gio/gfileattribute.h
 include/glib-2.0/gio/gfileenumerator.h
@@ -37,10 +39,12 @@
 include/glib-2.0/gio/gicon.h
 include/glib-2.0/gio/ginputstream.h
 include/glib-2.0/gio/gio.h
+include/glib-2.0/gio/gioenums.h
 include/glib-2.0/gio/gioenumtypes.h
 include/glib-2.0/gio/gioerror.h
 include/glib-2.0/gio/giomodule.h
 include/glib-2.0/gio/gioscheduler.h
+include/glib-2.0/gio/giotypes.h
 include/glib-2.0/gio/gloadableicon.h
 include/glib-2.0/gio/gmemoryinputstream.h
 include/glib-2.0/gio/gmemoryoutputstream.h
@@ -136,6 +140,8 @@
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 @comment lib/charset.alias
+lib/gio/
+lib/gio/modules/
 lib/glib-2.0/
 lib/glib-2.0/include/
 lib/glib-2.0/include/glibconfig.h
@@ -149,6 +155,7 @@
 lib/libgobject-2.0.la
 lib/libgthread-2.0.a
 lib/libgthread-2.0.la
+lib/pkgconfig/
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -161,6 +168,7 @@
 @man man/man1/glib-gettextize.1
 @man man/man1/glib-mkenums.1
 @man man/man1/gobject-query.1
[EMAIL PROTECTED] man/man1/gtester.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/
@@ -214,8 +222,6 @@
 share/locale/eo/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
 share/locale/et/LC_MESSAGES/glib20.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fa/
 share/locale/fa/LC_MESSAGES/
@@ -256,6 +262,9 @@
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/glib20.mo
 share/locale/lv/LC_MESSAGES/glib20.mo
+share/locale/mai/
+share/locale/mai/LC_MESSAGES/
+share/locale/mai/LC_MESSAGES/glib20.mo
 share/locale/mg/
 share/locale/mg/LC_MESSAGES/
 share/locale/mg/LC_MESSAGES/glib20.mo
@@ -290,6 +299,9 @@
 share/locale/pa/LC_MESSAGES/
 share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
+share/locale/ps/
+share/locale/ps/LC_MESSAGES/
+share/locale/ps/LC_MESSAGES/glib20.mo
 share/locale/pt/LC_MESSAGES/glib20.mo
 share/locale/pt_BR/LC_MESSAGES/glib20.mo
 share/locale/ro/LC_MESSAGES/glib20.mo
@@ -306,12 +318,12 @@
 share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/glib20.mo
 share/locale/sr/LC_MESSAGES/glib20.mo
-share/locale/[EMAIL PROTECTED]/
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/glib20.mo
 share/locale/[EMAIL PROTECTED]/
 share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
 share/locale/[EMAIL PROTECTED]/LC_MESSAGES/glib20.mo
+share/locale/[EMAIL PROTECTED]/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/
 share/locale/ta/LC_MESSAGES/
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- Makefile    27 Sep 2008 17:59:12 -0000      1.69
+++ Makefile    20 Oct 2008 08:19:23 -0000
@@ -6,17 +6,18 @@
 COMMENT-docs=                  gtk+2 documentation
 COMMENT-cups=                  gtk+2 CUPS print backend
 
-VERSION=                       2.12.12
+VERSION=                       2.14.3
 DISTNAME=                      gtk+-${VERSION}
 PKGNAME-main=                  gtk+2-${VERSION}
 PKGNAME-docs=                  gtk+2-docs-${VERSION}
 PKGNAME-cups=                  gtk+2-cups-${VERSION}
 CATEGORIES=                    x11 devel
 
-SHARED_LIBS+=  gdk_pixbuf-2.0          1200.11
-SHARED_LIBS+=  gdk-x11-2.0             1200.11
-SHARED_LIBS+=  gtk-x11-2.0             1200.11
-SHARED_LIBS+=  gdk_pixbuf_xlib-2.0     1200.11
+SHARED_LIBS+=  gdk_pixbuf-2.0          1400.0 #.1400.3
+SHARED_LIBS+=  gdk-x11-2.0             1400.0
+SHARED_LIBS+=  gtk-x11-2.0             1400.0
+SHARED_LIBS+=  gdk_pixbuf_xlib-2.0     1400.0
+SHARED_LIBS+=  gailutil                22.0   #.18.1
 
 HOMEPAGE=                      http://www.gtk.org/
 
@@ -26,7 +27,7 @@
 PERMIT_DISTFILES_CDROM=                Yes
 PERMIT_DISTFILES_FTP=          Yes
 
-MASTER_SITES=                  ${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
+MASTER_SITES=                  ${MASTER_SITE_GNOME:=sources/gtk+/2.14/}
 EXTRACT_SUFX=                  .tar.bz2
 
 MULTI_PACKAGES=                -main -docs -cups
@@ -41,11 +42,12 @@
 RUN_DEPENDS=           ::x11/hicolor-icon-theme
 
 LIB_DEPENDS-main=      ${LIB_DEPENDS} \
-                       
glib-2.0.>=1000.0,gmodule-2.0.>=1000.0,gobject-2.0.>=1000.0,gthread-2.0::devel/glib2
 \
-                       
pango-1.0.>=1300.0,pangocairo-1.0.>=1300.0,pangoft2-1.0.>=1300.0::devel/pango \
+                       
glib-2.0.>=1800.0,gmodule-2.0.>=1800.0,gobject-2.0.>=1800.0,gio-2.0::devel/glib2
 \
+                       
pango-1.0.>=1600.0,pangocairo-1.0.>=1600.0,pangoft2-1.0.>=1600.0::devel/pango \
                        atk-1.0.>=1809.0::devel/atk \
                        tiff.>=35::graphics/tiff \
                        png.>=3::graphics/png \
+                       jasper::graphics/jasper \
                        jpeg.>=62::graphics/jpeg
 WANTLIB-main=          ${WANTLIB} c pthread
 
@@ -57,7 +59,7 @@
 LIB_DEPENDS-cups=      ${LIB_DEPENDS} \
                        cups.>=3::print/cups \
                        
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::${BASE_PKGPATH},-main
-WANTLIB-cups=          ${WANTLIB} atk-1.0 crypto glib-2.0 gmodule-2.0 \
+WANTLIB-cups=          ${WANTLIB} atk-1.0 crypto gio-2.0 glib-2.0 gmodule-2.0 \
                        gobject-2.0 pango-1.0 pangocairo-1.0 \
                        pangoft2-1.0 png ssl
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gtk+2/distinfo,v
retrieving revision 1.37
diff -u -r1.37 distinfo
--- distinfo    27 Sep 2008 17:59:12 -0000      1.37
+++ distinfo    20 Oct 2008 08:19:23 -0000
@@ -1,5 +1,5 @@
-MD5 (gtk+-2.12.12.tar.bz2) = iy3yHOcL2OdaRYiarwqUjg==
-RMD160 (gtk+-2.12.12.tar.bz2) = Ku7rZVdTDWBi55nhETgYalfdrtI=
-SHA1 (gtk+-2.12.12.tar.bz2) = 48JHeD2pMP873Of0zcc4107hoD8=
-SHA256 (gtk+-2.12.12.tar.bz2) = 7qy0m5kxLonGEdnucrQ1GzahNsE0QGSvLIMdRS3ZIRY=
-SIZE (gtk+-2.12.12.tar.bz2) = 16222631
+MD5 (gtk+-2.14.3.tar.bz2) = NZ5EyOR9/gSgmsCbjgFeWA==
+RMD160 (gtk+-2.14.3.tar.bz2) = vHpgjsMLATvzYMOmpsDhWt8zcnI=
+SHA1 (gtk+-2.14.3.tar.bz2) = 1QBWvjPYImXetDPftyw+RvIIIMA=
+SHA256 (gtk+-2.14.3.tar.bz2) = Ta0YXHoi3AuXlyOcBJuPLIVZEoU4hY9bcdVgmuOXjUk=
+SIZE (gtk+-2.14.3.tar.bz2) = 17149160
Index: patches/patch-demos_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-demos_Makefile_in,v
retrieving revision 1.15
diff -u -r1.15 patch-demos_Makefile_in
--- patches/patch-demos_Makefile_in     8 Jul 2008 08:40:11 -0000       1.15
+++ patches/patch-demos_Makefile_in     20 Oct 2008 08:19:23 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-demos_Makefile_in,v 1.15 2008/07/08 08:40:11 brad Exp $
---- demos/Makefile.in.orig     Tue Jun  3 17:20:31 2008
-+++ demos/Makefile.in  Mon Jun 23 23:34:01 2008
-@@ -835,6 +835,7 @@ uninstall-info: uninstall-info-recursive
- 
+--- demos/Makefile.in.orig     Wed Sep 24 05:11:35 2008
++++ demos/Makefile.in  Sun Oct 19 20:04:31 2008
+@@ -964,6 +964,7 @@ test-report perf-report full-report:       ${TEST_PROGS}
+ check-local: test
  
  test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
 +      LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs \
Index: patches/patch-gdk-pixbuf_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in,v
retrieving revision 1.18
diff -u -r1.18 patch-gdk-pixbuf_Makefile_in
--- patches/patch-gdk-pixbuf_Makefile_in        8 Jul 2008 08:40:11 -0000       
1.18
+++ patches/patch-gdk-pixbuf_Makefile_in        20 Oct 2008 08:19:23 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.18 2008/07/08 08:40:11 brad Exp $
---- gdk-pixbuf/Makefile.in.orig        Tue Jun  3 17:20:32 2008
-+++ gdk-pixbuf/Makefile.in     Mon Jun 23 23:34:01 2008
-@@ -570,7 +570,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+--- gdk-pixbuf/Makefile.in.orig        Wed Sep 24 05:11:37 2008
++++ gdk-pixbuf/Makefile.in     Sun Oct 19 20:04:31 2008
+@@ -852,7 +852,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
  gdk_pixbuf_csource_LDADD = $(LDADDS)
  
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
@@ -10,7 +10,7 @@
  
  gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
  
-@@ -1644,13 +1644,6 @@ install-data-hook: install-ms-lib install-def-file
+@@ -2239,13 +2239,6 @@ install-data-hook: install-ms-lib install-def-file
        @if $(RUN_QUERY_LOADER_TEST) ; then \
          $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
          $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
@@ -24,7 +24,7 @@
        fi
  
  uninstall-local: uninstall-ms-lib uninstall-def-file
-@@ -1662,7 +1655,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
+@@ -2257,7 +2250,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
  @BUILD_DYNAMIC_MODULES_TRUE@  LOADERS=`echo libpixbufloader-*.la` ; \
  @BUILD_DYNAMIC_MODULES_TRUE@  if test "x$$LOADERS" != 'xlibpixbufloader-*.la' 
; then \
  @BUILD_DYNAMIC_MODULES_TRUE@          echo "Writing a gdk-pixbuf.loader file 
to use when running examples before installing gdk-pixbuf."; \
Index: patches/patch-gdk-pixbuf_gdk-pixbuf-io_c
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gdk-pixbuf_gdk-pixbuf-io_c,v
retrieving revision 1.7
diff -u -r1.7 patch-gdk-pixbuf_gdk-pixbuf-io_c
--- patches/patch-gdk-pixbuf_gdk-pixbuf-io_c    23 Apr 2007 16:29:05 -0000      
1.7
+++ patches/patch-gdk-pixbuf_gdk-pixbuf-io_c    20 Oct 2008 08:19:23 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.7 2007/04/23 16:29:05 jasper 
Exp $
---- gdk-pixbuf/gdk-pixbuf-io.c.orig    Mon Mar 12 14:57:01 2007
-+++ gdk-pixbuf/gdk-pixbuf-io.c Fri Apr 20 19:19:51 2007
-@@ -277,7 +277,7 @@ gdk_pixbuf_get_module_file (void)
+--- gdk-pixbuf/gdk-pixbuf-io.c.orig    Fri Sep 19 16:35:27 2008
++++ gdk-pixbuf/gdk-pixbuf-io.c Sun Oct 19 20:04:31 2008
+@@ -298,7 +298,7 @@ gdk_pixbuf_get_module_file (void)
    gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
  
    if (!result)
Index: patches/patch-gtk_gtksettings_c
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gtk_gtksettings_c,v
retrieving revision 1.6
diff -u -r1.6 patch-gtk_gtksettings_c
--- patches/patch-gtk_gtksettings_c     24 Oct 2007 22:34:34 -0000      1.6
+++ patches/patch-gtk_gtksettings_c     20 Oct 2008 08:19:23 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-gtk_gtksettings_c,v 1.6 2007/10/24 22:34:34 jasper Exp $
---- gtk/gtksettings.c.orig     Thu Sep 13 14:35:41 2007
-+++ gtk/gtksettings.c  Wed Oct 10 12:37:07 2007
-@@ -299,7 +299,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
+--- gtk/gtksettings.c.orig     Fri Sep 19 06:44:04 2008
++++ gtk/gtksettings.c  Sun Oct 19 20:04:32 2008
+@@ -310,7 +310,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                               g_param_spec_string 
("gtk-key-theme-name",
                                                                  P_("Key Theme 
Name"),
                                                                  P_("Name of 
key theme RC file to load"),
Index: patches/patch-modules_input_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-modules_input_Makefile_in,v
retrieving revision 1.17
diff -u -r1.17 patch-modules_input_Makefile_in
--- patches/patch-modules_input_Makefile_in     8 Jul 2008 08:40:11 -0000       
1.17
+++ patches/patch-modules_input_Makefile_in     20 Oct 2008 08:19:23 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-modules_input_Makefile_in,v 1.17 2008/07/08 08:40:11 brad Exp $
---- modules/input/Makefile.in.orig     Tue Jun  3 17:20:36 2008
-+++ modules/input/Makefile.in  Mon Jun 23 23:34:01 2008
-@@ -975,19 +975,13 @@ install-data-hook:
+--- modules/input/Makefile.in.orig     Wed Sep 24 05:11:41 2008
++++ modules/input/Makefile.in  Sun Oct 19 20:05:54 2008
+@@ -1336,13 +1336,6 @@ install-data-hook:
          $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
          echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
          $(top_builddir)/gtk/gtk-query-immodules-2.0 > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
@@ -15,7 +15,8 @@
          fi
  
  uninstall-local:
-       rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+@@ -1351,6 +1344,7 @@ uninstall-local:
+ included-modules: $(noinst_LTLIBRARIES)
  
  gtk.immodules: Makefile.am $(module_LTLIBRARIES)
 +      
LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs/:$(top_builddir)/gdk/.libs/:$(top_builddir)/gtk/.libs/
 \
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-docs,v
retrieving revision 1.22
diff -u -r1.22 PLIST-docs
--- pkg/PLIST-docs      9 Feb 2008 17:55:39 -0000       1.22
+++ pkg/PLIST-docs      20 Oct 2008 08:19:23 -0000
@@ -2,12 +2,34 @@
 @conflict gtk+2-<2.4.9
 share/gtk-doc/
 share/gtk-doc/html/
+share/gtk-doc/html/gail-libgail-util/
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailTextUtil.html
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp2
+share/gtk-doc/html/gail-libgail-util/home.png
+share/gtk-doc/html/gail-libgail-util/index.html
+share/gtk-doc/html/gail-libgail-util/index.sgml
+share/gtk-doc/html/gail-libgail-util/left.png
+share/gtk-doc/html/gail-libgail-util/libgail-util-main.html
+share/gtk-doc/html/gail-libgail-util/right.png
+share/gtk-doc/html/gail-libgail-util/style.css
+share/gtk-doc/html/gail-libgail-util/up.png
 share/gtk-doc/html/gdk/
 share/gtk-doc/html/gdk-pixbuf/
 share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
 share/gtk-doc/html/gdk-pixbuf/apa.html
 share/gtk-doc/html/gdk-pixbuf/apas02.html
 share/gtk-doc/html/gdk-pixbuf/apas03.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html
+share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html
+share/gtk-doc/html/gdk-pixbuf/api-index-full.html
 share/gtk-doc/html/gdk-pixbuf/composite.png
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
@@ -33,12 +55,6 @@
 share/gtk-doc/html/gdk-pixbuf/home.png
 share/gtk-doc/html/gdk-pixbuf/index.html
 share/gtk-doc/html/gdk-pixbuf/index.sgml
-share/gtk-doc/html/gdk-pixbuf/ix01.html
-share/gtk-doc/html/gdk-pixbuf/ix02.html
-share/gtk-doc/html/gdk-pixbuf/ix03.html
-share/gtk-doc/html/gdk-pixbuf/ix04.html
-share/gtk-doc/html/gdk-pixbuf/ix05.html
-share/gtk-doc/html/gdk-pixbuf/ix06.html
 share/gtk-doc/html/gdk-pixbuf/left.png
 share/gtk-doc/html/gdk-pixbuf/license.html
 share/gtk-doc/html/gdk-pixbuf/right.png
@@ -50,6 +66,15 @@
 share/gtk-doc/html/gdk/GdkDisplayManager.html
 share/gtk-doc/html/gdk/GdkScreen.html
 share/gtk-doc/html/gdk/X_cursor.png
+share/gtk-doc/html/gdk/api-index-2-10.html
+share/gtk-doc/html/gdk/api-index-2-12.html
+share/gtk-doc/html/gdk/api-index-2-14.html
+share/gtk-doc/html/gdk/api-index-2-2.html
+share/gtk-doc/html/gdk/api-index-2-4.html
+share/gtk-doc/html/gdk/api-index-2-6.html
+share/gtk-doc/html/gdk/api-index-2-8.html
+share/gtk-doc/html/gdk/api-index-deprecated.html
+share/gtk-doc/html/gdk/api-index-full.html
 share/gtk-doc/html/gdk/arrow.png
 share/gtk-doc/html/gdk/based_arrow_down.png
 share/gtk-doc/html/gdk/based_arrow_up.png
@@ -76,6 +101,7 @@
 share/gtk-doc/html/gdk/draped_box.png
 share/gtk-doc/html/gdk/exchange.png
 share/gtk-doc/html/gdk/fleur.png
+share/gtk-doc/html/gdk/gdk-Application-launching.html
 share/gtk-doc/html/gdk/gdk-Bitmaps-and-Pixmaps.html
 share/gtk-doc/html/gdk/gdk-Cairo-Interaction.html
 share/gtk-doc/html/gdk/gdk-Colormaps-and-Colors.html
@@ -97,6 +123,7 @@
 share/gtk-doc/html/gdk/gdk-Points-Rectangles-and-Regions.html
 share/gtk-doc/html/gdk/gdk-Properties-and-Atoms.html
 share/gtk-doc/html/gdk/gdk-Selections.html
+share/gtk-doc/html/gdk/gdk-Testing.html
 share/gtk-doc/html/gdk/gdk-Threads.html
 share/gtk-doc/html/gdk/gdk-Visuals.html
 share/gtk-doc/html/gdk/gdk-Windows.html
@@ -113,14 +140,6 @@
 share/gtk-doc/html/gdk/index.html
 share/gtk-doc/html/gdk/index.sgml
 share/gtk-doc/html/gdk/iron_cross.png
-share/gtk-doc/html/gdk/ix01.html
-share/gtk-doc/html/gdk/ix02.html
-share/gtk-doc/html/gdk/ix03.html
-share/gtk-doc/html/gdk/ix04.html
-share/gtk-doc/html/gdk/ix05.html
-share/gtk-doc/html/gdk/ix06.html
-share/gtk-doc/html/gdk/ix07.html
-share/gtk-doc/html/gdk/ix08.html
 share/gtk-doc/html/gdk/left.png
 share/gtk-doc/html/gdk/left_ptr.png
 share/gtk-doc/html/gdk/left_side.png
@@ -325,6 +344,7 @@
 share/gtk-doc/html/gtk/GtkToggleToolButton.html
 share/gtk-doc/html/gtk/GtkToolButton.html
 share/gtk-doc/html/gtk/GtkToolItem.html
+share/gtk-doc/html/gtk/GtkToolShell.html
 share/gtk-doc/html/gtk/GtkToolbar.html
 share/gtk-doc/html/gtk/GtkTooltip.html
 share/gtk-doc/html/gtk/GtkTooltips.html
@@ -368,6 +388,15 @@
 share/gtk-doc/html/gtk/TreeWidgetObjects.html
 share/gtk-doc/html/gtk/WindowWidgets.html
 share/gtk-doc/html/gtk/accel-label.png
+share/gtk-doc/html/gtk/api-index-2-10.html
+share/gtk-doc/html/gtk/api-index-2-12.html
+share/gtk-doc/html/gtk/api-index-2-14.html
+share/gtk-doc/html/gtk/api-index-2-2.html
+share/gtk-doc/html/gtk/api-index-2-4.html
+share/gtk-doc/html/gtk/api-index-2-6.html
+share/gtk-doc/html/gtk/api-index-2-8.html
+share/gtk-doc/html/gtk/api-index-deprecated.html
+share/gtk-doc/html/gtk/api-index-full.html
 share/gtk-doc/html/gtk/assistant.png
 share/gtk-doc/html/gtk/button.png
 share/gtk-doc/html/gtk/ch01.html
@@ -393,6 +422,7 @@
 share/gtk-doc/html/gtk/gtk-Clipboards.html
 share/gtk-doc/html/gtk/gtk-Drag-and-Drop.html
 share/gtk-doc/html/gtk/gtk-Feature-Test-Macros.html
+share/gtk-doc/html/gtk/gtk-Filesystem-utilities.html
 share/gtk-doc/html/gtk/gtk-General.html
 share/gtk-doc/html/gtk/gtk-Graphics-Contexts.html
 share/gtk-doc/html/gtk/gtk-GtkPaperSize.html
@@ -405,6 +435,7 @@
 share/gtk-doc/html/gtk/gtk-Signals.html
 share/gtk-doc/html/gtk/gtk-Standard-Enumerations.html
 share/gtk-doc/html/gtk/gtk-Stock-Items.html
+share/gtk-doc/html/gtk/gtk-Testing.html
 share/gtk-doc/html/gtk/gtk-Themeable-Stock-Images.html
 share/gtk-doc/html/gtk/gtk-Types.html
 share/gtk-doc/html/gtk/gtk-about.png
@@ -513,6 +544,10 @@
 share/gtk-doc/html/gtk/gtk-preferences.png
 share/gtk-doc/html/gtk/gtk-print-preview.png
 share/gtk-doc/html/gtk/gtk-print.png
+share/gtk-doc/html/gtk/gtk-print-error.png
+share/gtk-doc/html/gtk/gtk-print-paused.png
+share/gtk-doc/html/gtk/gtk-print-report.png
+share/gtk-doc/html/gtk/gtk-print-warning.png
 share/gtk-doc/html/gtk/gtk-properties.png
 share/gtk-doc/html/gtk/gtk-query-immodules-2.0.html
 share/gtk-doc/html/gtk/gtk-question-index.html
@@ -565,14 +600,6 @@
 share/gtk-doc/html/gtk/image.png
 share/gtk-doc/html/gtk/index.html
 share/gtk-doc/html/gtk/index.sgml
-share/gtk-doc/html/gtk/ix01.html
-share/gtk-doc/html/gtk/ix02.html
-share/gtk-doc/html/gtk/ix03.html
-share/gtk-doc/html/gtk/ix04.html
-share/gtk-doc/html/gtk/ix05.html
-share/gtk-doc/html/gtk/ix06.html
-share/gtk-doc/html/gtk/ix07.html
-share/gtk-doc/html/gtk/ix08.html
 share/gtk-doc/html/gtk/label.png
 share/gtk-doc/html/gtk/left.png
 share/gtk-doc/html/gtk/link-button.png
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -r1.8 PLIST-main
--- pkg/PLIST-main      8 Jul 2008 08:40:11 -0000       1.8
+++ pkg/PLIST-main      20 Oct 2008 08:19:23 -0000
@@ -1,11 +1,19 @@
 @comment $OpenBSD: PLIST-main,v 1.8 2008/07/08 08:40:11 brad Exp $
 @pkgpath x11/gtk+2
[EMAIL PROTECTED] gail-*
 @bin bin/gdk-pixbuf-csource
 @bin bin/gdk-pixbuf-query-loaders
 bin/gtk-builder-convert
 @bin bin/gtk-demo
 @bin bin/gtk-query-immodules-2.0
 @bin bin/gtk-update-icon-cache
+include/gail-1.0/
+include/gail-1.0/gail/
+include/gail-1.0/gail/gailwidget.h
+include/gail-1.0/libgail-util/
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
 include/gtk-2.0/
 include/gtk-2.0/gdk/
 include/gtk-2.0/gdk-pixbuf/
@@ -24,7 +32,7 @@
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
-include/gtk-2.0/gdk/gdkalias.h
+include/gtk-2.0/gdk/gdkapplaunchcontext.h
 include/gtk-2.0/gdk/gdkcairo.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -51,6 +59,7 @@
 include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdkspawn.h
+include/gtk-2.0/gdk/gdktestutils.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
@@ -117,7 +126,6 @@
 include/gtk-2.0/gtk/gtkfilechooserwidget.h
 include/gtk-2.0/gtk/gtkfilefilter.h
 include/gtk-2.0/gtk/gtkfilesel.h
-include/gtk-2.0/gtk/gtkfilesystem.h
 include/gtk-2.0/gtk/gtkfixed.h
 include/gtk-2.0/gtk/gtkfontbutton.h
 include/gtk-2.0/gtk/gtkfontsel.h
@@ -132,6 +140,7 @@
 include/gtk-2.0/gtk/gtkhscale.h
 include/gtk-2.0/gtk/gtkhscrollbar.h
 include/gtk-2.0/gtk/gtkhseparator.h
+include/gtk-2.0/gtk/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkicontheme.h
 include/gtk-2.0/gtk/gtkiconview.h
@@ -161,6 +170,7 @@
 include/gtk-2.0/gtk/gtkmessagedialog.h
 include/gtk-2.0/gtk/gtkmisc.h
 include/gtk-2.0/gtk/gtkmodules.h
+include/gtk-2.0/gtk/gtkmountoperation.h
 include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
 include/gtk-2.0/gtk/gtkoldeditable.h
@@ -201,6 +211,7 @@
 include/gtk-2.0/gtk/gtkseparatormenuitem.h
 include/gtk-2.0/gtk/gtkseparatortoolitem.h
 include/gtk-2.0/gtk/gtksettings.h
+include/gtk-2.0/gtk/gtkshow.h
 include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
@@ -211,6 +222,7 @@
 include/gtk-2.0/gtk/gtkstyle.h
 include/gtk-2.0/gtk/gtktable.h
 include/gtk-2.0/gtk/gtktearoffmenuitem.h
+include/gtk-2.0/gtk/gtktestutils.h
 include/gtk-2.0/gtk/gtktext.h
 include/gtk-2.0/gtk/gtktextbuffer.h
 include/gtk-2.0/gtk/gtktextbufferrichtext.h
@@ -229,6 +241,7 @@
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolshell.h
 include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
@@ -263,6 +276,7 @@
 include/gtk-unix-print-2.0/gtk/gtkprinter.h
 include/gtk-unix-print-2.0/gtk/gtkprintjob.h
 include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkunixprint.h
 lib/gtk-2.0/
 lib/gtk-2.0/2.10.0/
 lib/gtk-2.0/2.10.0/engines/
@@ -313,9 +327,15 @@
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.la
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.so
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.la
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.so
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
@@ -355,6 +375,16 @@
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
 lib/gtk-2.0/include/
 lib/gtk-2.0/include/gdkconfig.h
+lib/gtk-2.0/modules/
+lib/gtk-2.0/modules/libferret.a
+lib/gtk-2.0/modules/libferret.la
+lib/gtk-2.0/modules/libferret.so
+lib/gtk-2.0/modules/libgail.a
+lib/gtk-2.0/modules/libgail.la
+lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
+lib/libgailutil.la
[EMAIL PROTECTED] lib/libgailutil.so.${LIBgailutil_VERSION}
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 @lib lib/libgdk-x11-2.0.so.${LIBgdk-x11-2.0_VERSION}
@@ -367,6 +397,7 @@
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 @lib lib/libgtk-x11-2.0.so.${LIBgtk-x11-2.0_VERSION}
+lib/pkgconfig/gail.pc
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -547,6 +578,8 @@
 share/locale/lt/LC_MESSAGES/gtk20.mo
 share/locale/lv/LC_MESSAGES/gtk20-properties.mo
 share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mai/LC_MESSAGES/gtk20-properties.mo
+share/locale/mai/LC_MESSAGES/gtk20.mo
 share/locale/mi/
 share/locale/mi/LC_MESSAGES/
 share/locale/mi/LC_MESSAGES/gtk20-properties.mo
@@ -581,6 +614,8 @@
 share/locale/pa/LC_MESSAGES/gtk20.mo
 share/locale/pl/LC_MESSAGES/gtk20-properties.mo
 share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/ps/LC_MESSAGES/gtk20-properties.mo
+share/locale/ps/LC_MESSAGES/gtk20.mo
 share/locale/pt/LC_MESSAGES/gtk20-properties.mo
 share/locale/pt/LC_MESSAGES/gtk20.mo
 share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
@@ -601,10 +636,10 @@
 share/locale/sq/LC_MESSAGES/gtk20.mo
 share/locale/sr/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr/LC_MESSAGES/gtk20.mo
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20-properties.mo
-share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20.mo
 share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20-properties.mo
 share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20-properties.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gtk20.mo
 share/locale/sv/LC_MESSAGES/gtk20-properties.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
 share/locale/ta/LC_MESSAGES/gtk20-properties.mo

Reply via email to