Update to 3.10.5.

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

4 files changed, 43 insertions, 42 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index b5f336e66..1af000681 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk
-PORTVERSION=	3.8.4
+PORTVERSION=	3.10.5
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -19,19 +19,20 @@ LICENSE=	LGPL20
 
 USE_XZ=		yes
 
-.if !defined(REFERENCE_PORT)
+.if defined(REFERENCE_PORT)
+PORTSCOUT=	ignore:1
+.else
+PORTSCOUT=	limit:1,even
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
-# something goes wrong with USE_GNOME=introspection so do it manualy for now
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 
 USE_PERL5=	build
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-#		introspection:build
+GNU_CONFIGURE=	yes
+USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache \
+		introspection:build
 USES=		gettext gmake pathfix perl5 pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
@@ -39,10 +40,12 @@ CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit
 CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
+ltverhack_PATCH_FILES=build-aux/ltmain.sh
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.ColorChooser.gschema.xml \
-		org.gtk.Settings.FileChooser.gschema.xml
+		org.gtk.Settings.FileChooser.gschema.xml \
+		org.gtk.exampleapp.gschema.xml
 
 OPTIONS_DEFINE=	CUPS COLORD DEBUG
 OPTIONS_DEFAULT=CUPS COLORD
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index d5ac844d6..231b4c93e 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.8.4.tar.xz) = b08360167702299e91b3435a4ce6bae41dd26d2794e898632f12dd091b0692e2
-SIZE (gnome3/gtk+-3.8.4.tar.xz) = 13716408
+SHA256 (gnome3/gtk+-3.10.5.tar.xz) = 3191f6d8e8cdf0bac1a8ed6388acc67a15acf5e276161c9b93a305938d29ccc7
+SIZE (gnome3/gtk+-3.10.5.tar.xz) = 14378384
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 610efe8e5..ce24b9df6 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2011-09-15 18:04:34.000000000 +0200
-+++ Makefile.in	2011-09-15 18:05:12.000000000 +0200
-@@ -422,7 +422,7 @@
+--- Makefile.in.orig	2013-12-02 23:31:49.000000000 +0100
++++ Makefile.in	2013-12-02 23:32:00.000000000 +0100
+@@ -533,7 +533,7 @@
  	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
--SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
-+SRC_SUBDIRS = gdk gtk libgail-util modules demos perf examples
+-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
++SRC_SUBDIRS = gdk gtk libgail-util modules demos examples
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  MAINTAINERCLEANFILES = \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 825806637..169b41539 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -77,6 +77,8 @@ include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h
 include/gtk-3.0/gtk/a11y/gtklabelaccessible.h
 include/gtk-3.0/gtk/a11y/gtklevelbaraccessible.h
 include/gtk-3.0/gtk/a11y/gtklinkbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtklistboxaccessible.h
+include/gtk-3.0/gtk/a11y/gtklistboxrowaccessible.h
 include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenuaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenuitemaccessible.h
@@ -103,6 +105,9 @@ include/gtk-3.0/gtk/a11y/gtktoplevelaccessible.h
 include/gtk-3.0/gtk/a11y/gtktreeviewaccessible.h
 include/gtk-3.0/gtk/a11y/gtkwidgetaccessible.h
 include/gtk-3.0/gtk/a11y/gtkwindowaccessible.h
+include/gtk-3.0/gtk/deprecated/gtkaction.h
+include/gtk-3.0/gtk/deprecated/gtkactiongroup.h
+include/gtk-3.0/gtk/deprecated/gtkactivatable.h
 include/gtk-3.0/gtk/deprecated/gtkcolorsel.h
 include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h
 include/gtk-3.0/gtk/deprecated/gtkfontsel.h
@@ -115,11 +120,18 @@ include/gtk-3.0/gtk/deprecated/gtkhscale.h
 include/gtk-3.0/gtk/deprecated/gtkhscrollbar.h
 include/gtk-3.0/gtk/deprecated/gtkhseparator.h
 include/gtk-3.0/gtk/deprecated/gtkhsv.h
+include/gtk-3.0/gtk/deprecated/gtkiconfactory.h
+include/gtk-3.0/gtk/deprecated/gtkimagemenuitem.h
+include/gtk-3.0/gtk/deprecated/gtkradioaction.h
 include/gtk-3.0/gtk/deprecated/gtkrc.h
+include/gtk-3.0/gtk/deprecated/gtkrecentaction.h
+include/gtk-3.0/gtk/deprecated/gtkstock.h
 include/gtk-3.0/gtk/deprecated/gtkstyle.h
 include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h
 include/gtk-3.0/gtk/deprecated/gtktable.h
 include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h
+include/gtk-3.0/gtk/deprecated/gtktoggleaction.h
+include/gtk-3.0/gtk/deprecated/gtkuimanager.h
 include/gtk-3.0/gtk/deprecated/gtkvbbox.h
 include/gtk-3.0/gtk/deprecated/gtkvbox.h
 include/gtk-3.0/gtk/deprecated/gtkvpaned.h
@@ -133,10 +145,7 @@ include/gtk-3.0/gtk/gtkaccelgroup.h
 include/gtk-3.0/gtk/gtkaccellabel.h
 include/gtk-3.0/gtk/gtkaccelmap.h
 include/gtk-3.0/gtk/gtkaccessible.h
-include/gtk-3.0/gtk/gtkaction.h
 include/gtk-3.0/gtk/gtkactionable.h
-include/gtk-3.0/gtk/gtkactiongroup.h
-include/gtk-3.0/gtk/gtkactivatable.h
 include/gtk-3.0/gtk/gtkadjustment.h
 include/gtk-3.0/gtk/gtkalignment.h
 include/gtk-3.0/gtk/gtkappchooser.h
@@ -208,11 +217,10 @@ include/gtk-3.0/gtk/gtkfontchooserdialog.h
 include/gtk-3.0/gtk/gtkfontchooserwidget.h
 include/gtk-3.0/gtk/gtkframe.h
 include/gtk-3.0/gtk/gtkgrid.h
-include/gtk-3.0/gtk/gtkiconfactory.h
+include/gtk-3.0/gtk/gtkheaderbar.h
 include/gtk-3.0/gtk/gtkicontheme.h
 include/gtk-3.0/gtk/gtkiconview.h
 include/gtk-3.0/gtk/gtkimage.h
-include/gtk-3.0/gtk/gtkimagemenuitem.h
 include/gtk-3.0/gtk/gtkimcontext.h
 include/gtk-3.0/gtk/gtkimcontextinfo.h
 include/gtk-3.0/gtk/gtkimcontextsimple.h
@@ -224,6 +232,7 @@ include/gtk-3.0/gtk/gtklabel.h
 include/gtk-3.0/gtk/gtklayout.h
 include/gtk-3.0/gtk/gtklevelbar.h
 include/gtk-3.0/gtk/gtklinkbutton.h
+include/gtk-3.0/gtk/gtklistbox.h
 include/gtk-3.0/gtk/gtkliststore.h
 include/gtk-3.0/gtk/gtklockbutton.h
 include/gtk-3.0/gtk/gtkmain.h
@@ -245,29 +254,30 @@ include/gtk-3.0/gtk/gtkoverlay.h
 include/gtk-3.0/gtk/gtkpagesetup.h
 include/gtk-3.0/gtk/gtkpaned.h
 include/gtk-3.0/gtk/gtkpapersize.h
+include/gtk-3.0/gtk/gtkplacessidebar.h
 include/gtk-3.0/gtk/gtkplug.h
 include/gtk-3.0/gtk/gtkprintcontext.h
 include/gtk-3.0/gtk/gtkprintoperation.h
 include/gtk-3.0/gtk/gtkprintoperationpreview.h
 include/gtk-3.0/gtk/gtkprintsettings.h
 include/gtk-3.0/gtk/gtkprogressbar.h
-include/gtk-3.0/gtk/gtkradioaction.h
 include/gtk-3.0/gtk/gtkradiobutton.h
 include/gtk-3.0/gtk/gtkradiomenuitem.h
 include/gtk-3.0/gtk/gtkradiotoolbutton.h
 include/gtk-3.0/gtk/gtkrange.h
-include/gtk-3.0/gtk/gtkrecentaction.h
 include/gtk-3.0/gtk/gtkrecentchooser.h
 include/gtk-3.0/gtk/gtkrecentchooserdialog.h
 include/gtk-3.0/gtk/gtkrecentchoosermenu.h
 include/gtk-3.0/gtk/gtkrecentchooserwidget.h
 include/gtk-3.0/gtk/gtkrecentfilter.h
 include/gtk-3.0/gtk/gtkrecentmanager.h
+include/gtk-3.0/gtk/gtkrevealer.h
 include/gtk-3.0/gtk/gtkscale.h
 include/gtk-3.0/gtk/gtkscalebutton.h
 include/gtk-3.0/gtk/gtkscrollable.h
 include/gtk-3.0/gtk/gtkscrollbar.h
 include/gtk-3.0/gtk/gtkscrolledwindow.h
+include/gtk-3.0/gtk/gtksearchbar.h
 include/gtk-3.0/gtk/gtksearchentry.h
 include/gtk-3.0/gtk/gtkselection.h
 include/gtk-3.0/gtk/gtkseparator.h
@@ -282,7 +292,8 @@ include/gtk-3.0/gtk/gtkspinbutton.h
 include/gtk-3.0/gtk/gtkspinner.h
 include/gtk-3.0/gtk/gtkstatusbar.h
 include/gtk-3.0/gtk/gtkstatusicon.h
-include/gtk-3.0/gtk/gtkstock.h
+include/gtk-3.0/gtk/gtkstack.h
+include/gtk-3.0/gtk/gtkstackswitcher.h
 include/gtk-3.0/gtk/gtkstylecontext.h
 include/gtk-3.0/gtk/gtkstyleproperties.h
 include/gtk-3.0/gtk/gtkstyleprovider.h
@@ -300,7 +311,6 @@ include/gtk-3.0/gtk/gtktexttag.h
 include/gtk-3.0/gtk/gtktexttagtable.h
 include/gtk-3.0/gtk/gtktextview.h
 include/gtk-3.0/gtk/gtkthemingengine.h
-include/gtk-3.0/gtk/gtktoggleaction.h
 include/gtk-3.0/gtk/gtktogglebutton.h
 include/gtk-3.0/gtk/gtktoggletoolbutton.h
 include/gtk-3.0/gtk/gtktoolbar.h
@@ -321,7 +331,6 @@ include/gtk-3.0/gtk/gtktreeview.h
 include/gtk-3.0/gtk/gtktreeviewcolumn.h
 include/gtk-3.0/gtk/gtktypebuiltins.h
 include/gtk-3.0/gtk/gtktypes.h
-include/gtk-3.0/gtk/gtkuimanager.h
 include/gtk-3.0/gtk/gtkversion.h
 include/gtk-3.0/gtk/gtkviewport.h
 include/gtk-3.0/gtk/gtkvolumebutton.h
@@ -337,57 +346,40 @@ 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
-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
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
-%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.a
 %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.la
 %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.a
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.a
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so
-lib/libgailutil-3.a
 lib/libgailutil-3.la
 lib/libgailutil-3.so
 lib/libgailutil-3.so.0
-lib/libgdk-3.a
 lib/libgdk-3.la
 lib/libgdk-3.so
 lib/libgdk-3.so.0
-lib/libgtk-3.a
 lib/libgtk-3.la
 lib/libgtk-3.so
 lib/libgtk-3.so.0
@@ -477,6 +469,8 @@ share/locale/fr/LC_MESSAGES/gtk30-properties.mo
 share/locale/fr/LC_MESSAGES/gtk30.mo
 share/locale/ga/LC_MESSAGES/gtk30-properties.mo
 share/locale/ga/LC_MESSAGES/gtk30.mo
+share/locale/gd/LC_MESSAGES/gtk30-properties.mo
+share/locale/gd/LC_MESSAGES/gtk30.mo
 share/locale/gl/LC_MESSAGES/gtk30-properties.mo
 share/locale/gl/LC_MESSAGES/gtk30.mo
 share/locale/gu/LC_MESSAGES/gtk30-properties.mo
@@ -595,6 +589,8 @@ share/locale/ta/LC_MESSAGES/gtk30-properties.mo
 share/locale/ta/LC_MESSAGES/gtk30.mo
 share/locale/te/LC_MESSAGES/gtk30-properties.mo
 share/locale/te/LC_MESSAGES/gtk30.mo
+share/locale/tg/LC_MESSAGES/gtk30-properties.mo
+share/locale/tg/LC_MESSAGES/gtk30.mo
 share/locale/th/LC_MESSAGES/gtk30-properties.mo
 share/locale/th/LC_MESSAGES/gtk30.mo
 share/locale/tk/LC_MESSAGES/gtk30-properties.mo
@@ -694,6 +690,8 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css
 @dirrmtry share/locale/ia
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES