Update to 2.99.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15150 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 56 insertions, 74 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c1038fafe..c9d08556c 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.19 2011/01/13 10:01:25 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.20 2011/01/18 00:43:53 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.99.2
+PORTVERSION=	2.99.3
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -45,6 +45,7 @@ USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-static --enable-xinput=yes
+CONFIGURE_ARGS+=--enable-gtk2-dependency
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 70cce7dbd..cee6e6831 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-2.99.2.tar.bz2) = fca4b39359e7ab9532aaf826518ef5d3f6ba5174799883f8b0975783f76db4ad
-SIZE (gnome3/gtk+-2.99.2.tar.bz2) = 17240205
+SHA256 (gnome3/gtk+-2.99.3.tar.bz2) = 03dd37fd89fe0f0cea688cb077192b5ff95325b66d53d724c7511d36b6e90496
+SIZE (gnome3/gtk+-2.99.3.tar.bz2) = 17179791
diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
index 16f9e6bd9..281bb69f5 100644
--- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
@@ -1,12 +1,11 @@
---- docs/reference/gtk//Makefile.in.orig	2011-01-06 20:58:59.000000000 +0000
-+++ docs/reference/gtk/Makefile.in	2011-01-06 20:59:14.000000000 +0000
-@@ -730,9 +730,7 @@
+--- docs/reference/gtk/Makefile.in.orig	2011-02-01 22:06:23.000000000 +0000
++++ docs/reference/gtk/Makefile.in	2011-02-01 22:07:12.000000000 +0000
+@@ -735,8 +735,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_F
  
  ########################################################################
  man_MANS = \
 -	gtk-query-immodules-3.0.1	\
--	gtk-update-icon-cache.1		\
--	gtk-builder-convert.1
+-	gtk-update-icon-cache.1
 +	gtk-query-immodules-3.0.1
  
  MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 24b24d8d2..ce2bde0f4 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,55 +1,6 @@
---- gtk/Makefile.in.orig	2011-01-13 10:58:39.000000000 +0000
-+++ gtk/Makefile.in	2011-01-13 10:58:39.000000000 +0000
-@@ -83,8 +83,7 @@ DIST_COMMON = $(am__gtkunixprintinclude_
- @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_16 = --add-include-path=$(top_builddir)/gdk/x11
- @HAVE_INTROSPECTION_TRUE@am__append_17 = Gtk-3.0.gir
- @HAVE_INTROSPECTION_TRUE@am__append_18 = $(gir_DATA) $(typelibs_DATA)
--bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT) \
--	gtk-update-icon-cache$(EXEEXT)
-+bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT)
- @OS_WIN32_TRUE@am__append_19 = \
- @OS_WIN32_TRUE@	$(GTK_UPDATE_ICON_CACHE_MANIFEST)
- 
-@@ -544,7 +543,7 @@ LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
- LIPO = @LIPO@
--LN_S = @LN_S@
-+LN_S = /bin/ln -sf
- LTLIBOBJS = @LTLIBOBJS@
- LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
- LT_VERSION_INFO = @LT_VERSION_INFO@
-@@ -710,7 +709,7 @@ SUBDIRS = theme-bits . tests
- DIST_SUBDIRS = theme-bits tests
- @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
- @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
--@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
-+@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,lpr
- @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
- INCLUDES = \
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
-@@ -1426,7 +1425,7 @@ LDADDS = \
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
- @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
--bin_SCRIPTS = gtk-builder-convert $(am__append_19)
-+bin_SCRIPTS = $(am__append_19)
- 
- # Workaround for UAC silliness: programs with "update" in their name
- # are believed to be installers and require elevated privileges to be
-@@ -1434,9 +1433,9 @@ bin_SCRIPTS = gtk-builder-convert $(am__
- # gtk-update-icon-cache.exe doesn't require any special privileges.
- @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
- gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
--gtk_query_immodules_3_0_LDADD = $(LDADDS)
-+gtk_query_immodules_3_0_LDADD = $(LDADDS) $(GLIB_LIBS)
- gtk_query_immodules_3_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
-+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
- gtk_update_icon_cache_SOURCES = updateiconcache.c
- STOCK_ICONS = \
- 	stock-icons/16/document-open-recent.png		\
-@@ -1677,7 +1676,171 @@ GENERATED_ICONS = \
+--- gtk/Makefile.in.orig	2011-02-01 22:21:00.000000000 +0000
++++ gtk/Makefile.in	2011-02-01 22:53:35.000000000 +0000
+@@ -1668,7 +1668,171 @@
  	stock-icons/24/folder-remote.png 		\
  	stock-icons/24/user-home.png 			\
  	stock-icons/24/user-desktop.png 		\
@@ -220,9 +171,9 @@
 +	stock-icons/24/gtk-zoom-100.png                 \
 +	stock-icons/24/gtk-zoom-out.png
  
- @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
- @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
-@@ -2916,6 +3079,88 @@ stamp-icons: $(STOCK_ICONS)
+ @USE_EXTERNAL_ICON_CACHE_FALSE@gtk_update_icon_cache_program = ./gtk-update-icon-cache
+ @USE_EXTERNAL_ICON_CACHE_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+@@ -2899,11 +3063,94 @@
  	   && $(LN_S) folder.png user-desktop.png 			\
  	   && $(RM) text-x-generic.png 					\
  	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
@@ -311,3 +262,10 @@
  	) done 								\
  	&& touch stamp-icons
  
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
++@USE_EXTERNAL_ICON_CACHE_FALSE@	$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
++@USE_EXTERNAL_ICON_CACHE_TRUE@	$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) $(GTK_UPDATE_ICON_CACHE) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ 	$(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index		\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkfixed.c b/x11-toolkits/gtk30/files/patch-gtk_gtkfixed.c
new file mode 100644
index 000000000..a35813c2d
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gtk_gtkfixed.c
@@ -0,0 +1,25 @@
+From 62d7593fc2961966c93912cacc8059158194949c Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Tue, 01 Feb 2011 19:01:49 +0000
+Subject: Fix crash in gtk_fixed_remove()
+
+b3f6f67c changed the loop from while() to for(), but the line to move to
+the next child was kept, so we could go past the end of the list.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=641176
+---
+diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
+index e61f03a..fd92cd7 100644
+--- gtk/gtkfixed.c
++++ gtk/gtkfixed.c
+@@ -526,8 +526,6 @@ gtk_fixed_remove (GtkContainer *container,
+ 
+           break;
+         }
+-
+-      children = children->next;
+     }
+ }
+ 
+--
+cgit v0.8.3.1
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 4a690c097..8eaa1e8f7 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -57,7 +57,6 @@ include/gtk-3.0/gdk/x11/gdkx11window.h
 include/gtk-3.0/gtk/gtkcellarea.h
 include/gtk-3.0/gtk/gtkcellareabox.h
 include/gtk-3.0/gtk/gtkcellareacontext.h
-include/gtk-3.0/gtk/gtkcellareaboxcontextprivate.h
 include/gtk-3.0/gtk/gtk.h
 include/gtk-3.0/gtk/gtkaboutdialog.h
 include/gtk-3.0/gtk/gtkaccelgroup.h
@@ -262,6 +261,7 @@ include/gtk-3.0/gtk/gtkvseparator.h
 include/gtk-3.0/gtk/gtkwidget.h
 include/gtk-3.0/gtk/gtkwidgetpath.h
 include/gtk-3.0/gtk/gtkwindow.h
+include/gtk-3.0/gtk/gtkx.h
 include/gtk-3.0/unix-print/gtk/gtkpagesetupunixdialog.h
 include/gtk-3.0/unix-print/gtk/gtkprinter.h
 include/gtk-3.0/unix-print/gtk/gtkprintjob.h
@@ -270,10 +270,9 @@ include/gtk-3.0/unix-print/gtk/gtkunixprint.h
 lib/girepository-1.0/Gdk-3.0.typelib
 lib/girepository-1.0/GdkX11-3.0.typelib
 lib/girepository-1.0/Gtk-3.0.typelib
-@comment plugin needs to be ported to new API
-@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.a
-@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.la
-@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.so
+lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.a
+lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.la
+lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.so
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so
@@ -612,16 +611,16 @@ share/locale/zh_HK/LC_MESSAGES/gtk30-properties.mo
 share/locale/zh_HK/LC_MESSAGES/gtk30.mo
 share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo
 share/locale/zh_TW/LC_MESSAGES/gtk30.mo
-share/themes/Default/gtk-3.0-key/gtkrc
-share/themes/Emacs/gtk-3.0-key/gtkrc
-share/themes/Raleigh/gtk-3.0/gtkrc
+share/themes/Default/gtk-3.0/gtk-keys.css
+share/themes/Emacs/gtk-3.0/gtk-keys.css
+share/themes/Raleigh/gtk-3.0/gtk.css
 @exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache-3.0 -q -f {} \; 2>/dev/null || /usr/bin/true
 @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
 @dirrm share/themes/Raleigh/gtk-3.0
 @dirrm share/themes/Raleigh
-@dirrm share/themes/Emacs/gtk-3.0-key
+@dirrm share/themes/Emacs/gtk-3.0
 @dirrm share/themes/Emacs
-@dirrm share/themes/Default/gtk-3.0-key
+@dirrm share/themes/Default/gtk-3.0
 @dirrm share/gtk-3.0/demo
 @dirrm share/gtk-3.0
 @dirrm include/gtk-3.0/unix-print/gtk