Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

12 files changed, 275 insertions, 117 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index e5462e4..edebf89 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.2.4
-PORTREVISION=	2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.3/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,19 +19,14 @@ MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
-.if defined(WITH_DROPSHADOW)
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR=	xfce
-PATCHFILES=	gtk+-menushadow.patch
-PATCH_DIST_STRIP=	-p1
-.endif
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
+		${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_BZIP2=	yes
 LATEST_LINK=	gtk20
@@ -41,33 +35,23 @@ USE_XPM=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack atk pango
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-PLIST_SUB=	GTK_VERSION="2.2.0"
-
-MAN1=		gdk-pixbuf-csource.1
-
-pre-everything::
-.if !defined(WITH_DROPSHADOW)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch,
-	@${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\""
-	@${ECHO_MSG} "NOTE: This option is not supported by FreeBSD GNOME Team."
-	@${ECHO_MSG} "Please, don't bug us if it doesn't work or build broken."
-	@${ECHO_MSG}
-.endif
+PLIST_SUB=	GTK_VERSION="2.4.0"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/gtk/xdgmime/xdgmime.c
 
 pre-build:
-	${RM} -rf ${WRKSRC}/docs/gtk.info*
+	@${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index d327f8a..44f12bf 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,4 +1,2 @@
-MD5 (gnome2/gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671
-SIZE (gnome2/gtk+-2.2.4.tar.bz2) = 7189272
-MD5 (gnome2/gtk+-menushadow.patch) = 5e02af6c81df2c312c569b40bea129ba
-SIZE (gnome2/gtk+-menushadow.patch) = 15970
+MD5 (gnome2/gtk+-2.4.0.tar.bz2) = fd16157de447c7f0a86495ad0dc67a1b
+SIZE (gnome2/gtk+-2.4.0.tar.bz2) = 8476610
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
index 85e372a..c47baaa 100644
--- a/x11-toolkits/gtk20/files/patch-Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/02/12 13:29:11	1.1
-+++ Makefile.in	2002/02/12 13:29:28
-@@ -168,7 +168,7 @@
- ms_librarian = @ms_librarian@
- xinput_progs = @xinput_progs@
+--- Makefile.in.orig	Thu Jan 22 19:40:10 2004
++++ Makefile.in	Thu Jan 22 19:40:52 2004
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
 -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
  
  # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
deleted file mode 100644
index b1750b7..0000000
--- a/x11-toolkits/gtk20/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Thu Sep  4 13:17:19 2003
-+++ configure	Tue Mar 16 17:14:34 2004
-@@ -18367,6 +18367,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -24746,7 +24747,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include FT_ERRORS_H
- 
- int
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index c4879a2..b34d2b3 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,19 +1,19 @@
---- gtk/Makefile.in.orig	Sat May  3 02:43:20 2003
-+++ gtk/Makefile.in	Sat May  3 02:46:30 2003
-@@ -175,7 +175,7 @@
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
+--- gtk/Makefile.in.orig	Fri Oct 24 21:45:12 2003
++++ gtk/Makefile.in	Fri Oct 24 21:46:49 2003
+@@ -301,7 +301,7 @@
  	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
  	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
 -	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
-+	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"		\
- 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
- 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
- 	-DGTK_HOST=\"@host@\"	                        \
-@@ -651,6 +651,7 @@
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DGTK_HOST=\"$(host)\"				\
+@@ -856,6 +856,7 @@
  TEST_DEPS = $(DEPS) gtk.immodules
  
- LDADDS = @STRIP_BEGIN@ \
+ LDADDS = \
 +	$(GLIB_LIBS)							\
  	$(gtktargetlib)							\
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/$(gdktargetlib) 				\
+ 	$(top_builddir)/gdk/$(gdktargetlib)
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 32c2663..88bfe20 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- docs/Makefile.in.orig	Wed Oct 24 10:33:45 2001
-+++ docs/Makefile.in	Wed Oct 24 10:33:46 2001
-@@ -136,7 +136,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
+--- docs/Makefile.in.orig	Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in	Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
  MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index a128c58..a04d08e 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	Sat Nov 18 03:17:56 2000
-+++ docs/reference/Makefile.in	Mon Nov 20 15:33:25 2000
-@@ -160,7 +160,7 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
+--- docs/reference/Makefile.in.orig	Fri Oct 24 23:38:06 2003
++++ docs/reference/Makefile.in	Fri Oct 24 23:48:00 2003
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
 -SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS = 
++SUBDIRS = #gdk-pixbuf gdk gtk
+ subdir = docs/reference
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
index fa3e127..c2cb10b 100644
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -1,6 +1,6 @@
---- gdk-pixbuf/Makefile.in.orig	Sat May  3 02:51:31 2003
-+++ gdk-pixbuf/Makefile.in	Sat May  3 02:51:59 2003
-@@ -384,7 +384,9 @@
+--- gdk-pixbuf/Makefile.in.orig	Thu Nov 20 15:39:55 2003
++++ gdk-pixbuf/Makefile.in	Thu Nov 20 15:40:17 2003
+@@ -517,7 +517,9 @@
  
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
new file mode 100644
index 0000000..07bb57a
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
@@ -0,0 +1,26 @@
+--- gtk/gtkicontheme.c.orig	Thu Jan 29 16:53:42 2004
++++ gtk/gtkicontheme.c	Thu Jan 29 16:54:56 2004
+@@ -526,7 +526,7 @@
+ 
+   priv->custom_theme = FALSE;
+   priv->current_theme = g_strdup (DEFAULT_THEME_NAME);
+-  priv->search_path = g_new (char *, 5);
++  priv->search_path = g_new (char *, 7);
+   
+ 
+   priv->search_path[0] = g_build_filename (g_get_home_dir (),
+@@ -534,9 +534,11 @@
+ 					   NULL);
+   priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL);
+   priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL);
+-  priv->search_path[3] = g_strdup ("/usr/share/icons");
+-  priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
+-  priv->search_path_len = 5;
++  priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL);
++  priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL);
++  priv->search_path[5] = g_strdup ("/usr/share/icons");
++  priv->search_path[6] = g_strdup ("/usr/share/pixmaps");
++  priv->search_path_len = 7;
+ 
+   priv->themes_valid = FALSE;
+   priv->themes = NULL;
diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh
new file mode 100644
index 0000000..58384ee
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sat Dec  6 14:47:45 2003
++++ ltmain.sh	Tue Dec  9 14:09:01 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gtk20/pkg-descr b/x11-toolkits/gtk20/pkg-descr
index 83ab3d9..8cee4af 100644
--- a/x11-toolkits/gtk20/pkg-descr
+++ b/x11-toolkits/gtk20/pkg-descr
@@ -1,21 +1,10 @@
-   GTK is a library for creating graphical user interfaces similar to
-the Motif "look and feel". It is designed to be small and efficient, but
-still flexible enough to allow the programmer freedom in the interfaces
-created. GTK allows the programmer to use a variety of standard user
-interface widgets such as push, radio and check buttons, menus, lists
-and frames. It also provides several "container" widgets which can be
-used to control the layout of the user interface elements.
+The GIMP ToolKit (GTK+) is a collection of GUI widgets.  GTK+
+essentially provides the building blocks from which GUIs can be
+built.  It is highly themable, and its functionality is highly
+extensible.
 
-   GTK provides some unique features. (At least, I know of no other
-widget library which provides them). For example, a button does not
-contain a label, it contains a child widget, which in most instances
-will be a label. However, the child widget can also be a pixmap, image
-or any combination possible the programmer desires. This flexibility is
-adhered to throughout the library.
-
-GTK+-2.0 is a stable release, but many applications still require
-GTK+-1.2, the previous stable version. You can have the runtime and
-development environments for both GTK+-2.0 and GTK+-1.2 installed
-simultaneously on your computer.
+GTK+-2 is a very stable release, similar only in design to GTK+-1.
+GTK+-2 can coexist happily alongside GTK+-1, but applications are
+written for one version or the other.
 
 WWW: http://www.gtk.org/
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 07e8ff0..5b137af 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,6 +1,7 @@
 bin/gdk-pixbuf-csource
-bin/gtk-query-immodules-2.0
 bin/gdk-pixbuf-query-loaders
+bin/gtk-demo
+bin/gtk-query-immodules-2.0
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -38,6 +39,7 @@ include/gtk-2.0/gdk/gdkregion.h
 include/gtk-2.0/gdk/gdkrgb.h
 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/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
@@ -48,6 +50,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h
 include/gtk-2.0/gtk/gtkaccellabel.h
 include/gtk-2.0/gtk/gtkaccelmap.h
 include/gtk-2.0/gtk/gtkaccessible.h
+include/gtk-2.0/gtk/gtkaction.h
+include/gtk-2.0/gtk/gtkactiongroup.h
 include/gtk-2.0/gtk/gtkadjustment.h
 include/gtk-2.0/gtk/gtkalignment.h
 include/gtk-2.0/gtk/gtkarrow.h
@@ -59,6 +63,7 @@ include/gtk-2.0/gtk/gtkbox.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
 include/gtk-2.0/gtk/gtkcelleditable.h
+include/gtk-2.0/gtk/gtkcelllayout.h
 include/gtk-2.0/gtk/gtkcellrenderer.h
 include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
 include/gtk-2.0/gtk/gtkcellrenderertext.h
@@ -67,9 +72,12 @@ include/gtk-2.0/gtk/gtkcheckbutton.h
 include/gtk-2.0/gtk/gtkcheckmenuitem.h
 include/gtk-2.0/gtk/gtkclipboard.h
 include/gtk-2.0/gtk/gtkclist.h
+include/gtk-2.0/gtk/gtkcolorbutton.h
 include/gtk-2.0/gtk/gtkcolorsel.h
 include/gtk-2.0/gtk/gtkcolorseldialog.h
 include/gtk-2.0/gtk/gtkcombo.h
+include/gtk-2.0/gtk/gtkcombobox.h
+include/gtk-2.0/gtk/gtkcomboboxentry.h
 include/gtk-2.0/gtk/gtkcontainer.h
 include/gtk-2.0/gtk/gtkctree.h
 include/gtk-2.0/gtk/gtkcurve.h
@@ -80,9 +88,17 @@ include/gtk-2.0/gtk/gtkdrawingarea.h
 include/gtk-2.0/gtk/gtkeditable.h
 include/gtk-2.0/gtk/gtkentry.h
 include/gtk-2.0/gtk/gtkenums.h
+include/gtk-2.0/gtk/gtkentrycompletion.h
+include/gtk-2.0/gtk/gtkexpander.h
 include/gtk-2.0/gtk/gtkeventbox.h
+include/gtk-2.0/gtk/gtkfilechooser.h
+include/gtk-2.0/gtk/gtkfilechooserdialog.h
+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
 include/gtk-2.0/gtk/gtkframe.h
 include/gtk-2.0/gtk/gtkgamma.h
@@ -96,6 +112,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/gtkiconfactory.h
+include/gtk-2.0/gtk/gtkicontheme.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
@@ -130,8 +147,10 @@ include/gtk-2.0/gtk/gtkpreview.h
 include/gtk-2.0/gtk/gtkprivate.h
 include/gtk-2.0/gtk/gtkprogress.h
 include/gtk-2.0/gtk/gtkprogressbar.h
+include/gtk-2.0/gtk/gtkradioaction.h
 include/gtk-2.0/gtk/gtkradiobutton.h
 include/gtk-2.0/gtk/gtkradiomenuitem.h
+include/gtk-2.0/gtk/gtkradiotoolbutton.h
 include/gtk-2.0/gtk/gtkrange.h
 include/gtk-2.0/gtk/gtkrc.h
 include/gtk-2.0/gtk/gtkruler.h
@@ -141,6 +160,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
 include/gtk-2.0/gtk/gtkseparator.h
 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/gtksignal.h
 include/gtk-2.0/gtk/gtksizegroup.h
@@ -162,13 +182,18 @@ include/gtk-2.0/gtk/gtktexttag.h
 include/gtk-2.0/gtk/gtktexttagtable.h
 include/gtk-2.0/gtk/gtktextview.h
 include/gtk-2.0/gtk/gtktipsquery.h
+include/gtk-2.0/gtk/gtktoggleaction.h
 include/gtk-2.0/gtk/gtktogglebutton.h
+include/gtk-2.0/gtk/gtktoggletoolbutton.h
 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/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreednd.h
 include/gtk-2.0/gtk/gtktreeitem.h
 include/gtk-2.0/gtk/gtktreemodel.h
+include/gtk-2.0/gtk/gtktreemodelfilter.h
 include/gtk-2.0/gtk/gtktreemodelsort.h
 include/gtk-2.0/gtk/gtktreeselection.h
 include/gtk-2.0/gtk/gtktreesortable.h
@@ -177,6 +202,7 @@ include/gtk-2.0/gtk/gtktreeview.h
 include/gtk-2.0/gtk/gtktreeviewcolumn.h
 include/gtk-2.0/gtk/gtktypebuiltins.h
 include/gtk-2.0/gtk/gtktypeutils.h
+include/gtk-2.0/gtk/gtkuimanager.h
 include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
 include/gtk-2.0/gtk/gtkversion.h
@@ -193,6 +219,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
@@ -204,7 +231,6 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
@@ -214,16 +240,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.200
+lib/libgdk-x11-2.0.so.400
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.200
+lib/libgdk_pixbuf-2.0.so.400
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.200
+lib/libgdk_pixbuf_xlib-2.0.so.400
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.200
+lib/libgtk-x11-2.0.so.400
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -231,64 +257,172 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
+share/gtk-2.0/demo/alphatest.png
+share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/appwindow.c
+share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/changedisplay.c
+share/gtk-2.0/demo/colorsel.c
+share/gtk-2.0/demo/dialog.c
+share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_completion.c
+share/gtk-2.0/demo/floppybuddy.gif
+share/gtk-2.0/demo/gnome-applets.png
+share/gtk-2.0/demo/gnome-calendar.png
+share/gtk-2.0/demo/gnome-foot.png
+share/gtk-2.0/demo/gnome-gimp.png
+share/gtk-2.0/demo/gnome-gmush.png
+share/gtk-2.0/demo/gnome-gsame.png
+share/gtk-2.0/demo/gnu-keys.png
+share/gtk-2.0/demo/gtk-logo-rgb.gif
+share/gtk-2.0/demo/hypertext.c
+share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/list_store.c
+share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/panes.c
+share/gtk-2.0/demo/pixbufs.c
+share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/stock_browser.c
+share/gtk-2.0/demo/textview.c
+share/gtk-2.0/demo/tree_store.c
+share/gtk-2.0/demo/ui_manager.c
+share/locale/af/LC_MESSAGES/gtk20-properties.mo
+share/locale/af/LC_MESSAGES/gtk20.mo
+share/locale/am/LC_MESSAGES/gtk20-properties.mo
 share/locale/am/LC_MESSAGES/gtk20.mo
+share/locale/ar/LC_MESSAGES/gtk20-properties.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
+share/locale/az/LC_MESSAGES/gtk20-properties.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
+share/locale/be/LC_MESSAGES/gtk20-properties.mo
 share/locale/be/LC_MESSAGES/gtk20.mo
+share/locale/bg/LC_MESSAGES/gtk20-properties.mo
 share/locale/bg/LC_MESSAGES/gtk20.mo
+share/locale/bn/LC_MESSAGES/gtk20-properties.mo
+share/locale/bn/LC_MESSAGES/gtk20.mo
+share/locale/br/LC_MESSAGES/gtk20-properties.mo
+share/locale/br/LC_MESSAGES/gtk20.mo
+share/locale/ca/LC_MESSAGES/gtk20-properties.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
+share/locale/cs/LC_MESSAGES/gtk20-properties.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20-properties.mo
 share/locale/cy/LC_MESSAGES/gtk20.mo
+share/locale/da/LC_MESSAGES/gtk20-properties.mo
 share/locale/da/LC_MESSAGES/gtk20.mo
+share/locale/de/LC_MESSAGES/gtk20-properties.mo
 share/locale/de/LC_MESSAGES/gtk20.mo
+share/locale/el/LC_MESSAGES/gtk20-properties.mo
 share/locale/el/LC_MESSAGES/gtk20.mo
+share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
+share/locale/en_CA/LC_MESSAGES/gtk20.mo
+share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
 share/locale/en_GB/LC_MESSAGES/gtk20.mo
+share/locale/es/LC_MESSAGES/gtk20-properties.mo
 share/locale/es/LC_MESSAGES/gtk20.mo
+share/locale/et/LC_MESSAGES/gtk20-properties.mo
 share/locale/et/LC_MESSAGES/gtk20.mo
+share/locale/eu/LC_MESSAGES/gtk20-properties.mo
 share/locale/eu/LC_MESSAGES/gtk20.mo
+share/locale/fa/LC_MESSAGES/gtk20-properties.mo
 share/locale/fa/LC_MESSAGES/gtk20.mo
+share/locale/fi/LC_MESSAGES/gtk20-properties.mo
 share/locale/fi/LC_MESSAGES/gtk20.mo
+share/locale/fr/LC_MESSAGES/gtk20-properties.mo
 share/locale/fr/LC_MESSAGES/gtk20.mo
+share/locale/ga/LC_MESSAGES/gtk20-properties.mo
 share/locale/ga/LC_MESSAGES/gtk20.mo
+share/locale/gl/LC_MESSAGES/gtk20-properties.mo
 share/locale/gl/LC_MESSAGES/gtk20.mo
+share/locale/he/LC_MESSAGES/gtk20-properties.mo
 share/locale/he/LC_MESSAGES/gtk20.mo
+share/locale/hi/LC_MESSAGES/gtk20-properties.mo
 share/locale/hi/LC_MESSAGES/gtk20.mo
+share/locale/hr/LC_MESSAGES/gtk20-properties.mo
 share/locale/hr/LC_MESSAGES/gtk20.mo
+share/locale/hu/LC_MESSAGES/gtk20-properties.mo
 share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/ia/LC_MESSAGES/gtk20-properties.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
+share/locale/id/LC_MESSAGES/gtk20-properties.mo
 share/locale/id/LC_MESSAGES/gtk20.mo
-share/locale/is/LC_MESSAGES/gtk20.mo
+share/locale/it/LC_MESSAGES/gtk20-properties.mo
 share/locale/it/LC_MESSAGES/gtk20.mo
+share/locale/ja/LC_MESSAGES/gtk20-properties.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
+share/locale/ko/LC_MESSAGES/gtk20-properties.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
+share/locale/li/LC_MESSAGES/gtk20-properties.mo
+share/locale/li/LC_MESSAGES/gtk20.mo
+share/locale/lt/LC_MESSAGES/gtk20-properties.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/lv/LC_MESSAGES/gtk20-properties.mo
 share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mi/LC_MESSAGES/gtk20-properties.mo
+share/locale/mi/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20-properties.mo
 share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/ml/LC_MESSAGES/gtk20-properties.mo
 share/locale/ml/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20-properties.mo
 share/locale/mn/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20-properties.mo
 share/locale/ms/LC_MESSAGES/gtk20.mo
+share/locale/ne/LC_MESSAGES/gtk20-properties.mo
 share/locale/ne/LC_MESSAGES/gtk20.mo
+share/locale/nl/LC_MESSAGES/gtk20-properties.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/nn/LC_MESSAGES/gtk20-properties.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
+share/locale/no/LC_MESSAGES/gtk20-properties.mo
 share/locale/no/LC_MESSAGES/gtk20.mo
+share/locale/pl/LC_MESSAGES/gtk20-properties.mo
 share/locale/pl/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
 share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+share/locale/ro/LC_MESSAGES/gtk20-properties.mo
 share/locale/ro/LC_MESSAGES/gtk20.mo
+share/locale/ru/LC_MESSAGES/gtk20-properties.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
+share/locale/sk/LC_MESSAGES/gtk20-properties.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
+share/locale/sl/LC_MESSAGES/gtk20-properties.mo
 share/locale/sl/LC_MESSAGES/gtk20.mo
+share/locale/sq/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr/LC_MESSAGES/gtk20.mo
+share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr@Latn/LC_MESSAGES/gtk20.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20.mo
 share/locale/sq/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
 share/locale/ta/LC_MESSAGES/gtk20.mo
+share/locale/th/LC_MESSAGES/gtk20-properties.mo
+share/locale/th/LC_MESSAGES/gtk20.mo
+share/locale/tr/LC_MESSAGES/gtk20-properties.mo
 share/locale/tr/LC_MESSAGES/gtk20.mo
+share/locale/uk/LC_MESSAGES/gtk20-properties.mo
 share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/uz/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz/LC_MESSAGES/gtk20.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/vi/LC_MESSAGES/gtk20-properties.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo
+share/locale/wa/LC_MESSAGES/gtk20-properties.mo
 share/locale/wa/LC_MESSAGES/gtk20.mo
+share/locale/yi/LC_MESSAGES/gtk20-properties.mo
 share/locale/yi/LC_MESSAGES/gtk20.mo
+share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
 share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
 share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 share/themes/Default/gtk-2.0-key/gtkrc
 share/themes/Default/gtk-2.0/gtkrc
@@ -297,6 +431,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm share/themes/Emacs
 @dirrm share/themes/Default/gtk-2.0-key
 @dirrm share/themes/Default/gtk-2.0
+@dirrm share/gtk-2.0/demo
+@dirrm share/gtk-2.0
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%