Update to 2.12.10.

8 files changed, 18 insertions, 44 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index c5ac26a85f45..dfb63691751b 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.12.9
-PORTREVISION?=	3
+PORTVERSION=	2.12.10
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index a378cb3ff046..4dcdd1e16f85 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.12.9.tar.bz2) = 33499772fdc3bea569c6d5673e5831b4
-SHA256 (gnome2/gtk+-2.12.9.tar.bz2) = 5bd9bf1fb331259f0c25056380cad405063df9ad655d5e07a679ee9f098d0ec8
-SIZE (gnome2/gtk+-2.12.9.tar.bz2) = 16027448
+MD5 (gnome2/gtk+-2.12.10.tar.bz2) = 5fcbdd2254eedb6b9ae828afc01d9eaa
+SHA256 (gnome2/gtk+-2.12.10.tar.bz2) = 6e4ca68a2e099418610eddd699012558cb704c441094228161966683ec8c2f18
+SIZE (gnome2/gtk+-2.12.10.tar.bz2) = 16230724
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
deleted file mode 100644
index ed81f9280fac..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- gtk/xdgmime/xdgmime.h.orig	Sat Oct  7 10:42:32 2006
-+++ gtk/xdgmime/xdgmime.h	Sat Oct  7 11:01:57 2006
-@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy)  (void *u
- #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
- #define xdg_mime_is_valid_mime_type           XDG_ENTRY(is_valid_mime_type)
- #define xdg_mime_mime_type_equal              XDG_ENTRY(mime_type_equal)
-+#define _xdg_mime_mime_type_equal             XDG_ENTRY(mime_type_equal_p)
- #define xdg_mime_media_type_equal             XDG_ENTRY(media_type_equal)
- #define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_type_subclass)
-+#define _xdg_mime_mime_type_subclass          XDG_ENTRY(mime_type_subclass_p)
- #define xdg_mime_get_mime_parents             XDG_ENTRY(get_mime_parents)
- #define xdg_mime_list_mime_parents            XDG_ENTRY(list_mime_parents)
- #define xdg_mime_unalias_mime_type            XDG_ENTRY(unalias_mime_type)
-+#define _xdg_mime_unalias_mime_type           XDG_ENTRY(unalias_mime_type_p)
- #define xdg_mime_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
- #define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
- #define xdg_mime_dump                         XDG_ENTRY(dump)
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 953d7c0cbe61..99b4f04150ac 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -444,6 +444,8 @@ share/locale/bs/LC_MESSAGES/gtk20-properties.mo
 share/locale/bs/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20-properties.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
+share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo
+share/locale/ca@valencia/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
@@ -675,6 +677,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c5ac26a85f45..dfb63691751b 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.12.9
-PORTREVISION?=	3
+PORTVERSION=	2.12.10
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index a378cb3ff046..4dcdd1e16f85 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.12.9.tar.bz2) = 33499772fdc3bea569c6d5673e5831b4
-SHA256 (gnome2/gtk+-2.12.9.tar.bz2) = 5bd9bf1fb331259f0c25056380cad405063df9ad655d5e07a679ee9f098d0ec8
-SIZE (gnome2/gtk+-2.12.9.tar.bz2) = 16027448
+MD5 (gnome2/gtk+-2.12.10.tar.bz2) = 5fcbdd2254eedb6b9ae828afc01d9eaa
+SHA256 (gnome2/gtk+-2.12.10.tar.bz2) = 6e4ca68a2e099418610eddd699012558cb704c441094228161966683ec8c2f18
+SIZE (gnome2/gtk+-2.12.10.tar.bz2) = 16230724
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h
deleted file mode 100644
index ed81f9280fac..000000000000
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- gtk/xdgmime/xdgmime.h.orig	Sat Oct  7 10:42:32 2006
-+++ gtk/xdgmime/xdgmime.h	Sat Oct  7 11:01:57 2006
-@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy)  (void *u
- #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
- #define xdg_mime_is_valid_mime_type           XDG_ENTRY(is_valid_mime_type)
- #define xdg_mime_mime_type_equal              XDG_ENTRY(mime_type_equal)
-+#define _xdg_mime_mime_type_equal             XDG_ENTRY(mime_type_equal_p)
- #define xdg_mime_media_type_equal             XDG_ENTRY(media_type_equal)
- #define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_type_subclass)
-+#define _xdg_mime_mime_type_subclass          XDG_ENTRY(mime_type_subclass_p)
- #define xdg_mime_get_mime_parents             XDG_ENTRY(get_mime_parents)
- #define xdg_mime_list_mime_parents            XDG_ENTRY(list_mime_parents)
- #define xdg_mime_unalias_mime_type            XDG_ENTRY(unalias_mime_type)
-+#define _xdg_mime_unalias_mime_type           XDG_ENTRY(unalias_mime_type_p)
- #define xdg_mime_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
- #define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
- #define xdg_mime_dump                         XDG_ENTRY(dump)
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 953d7c0cbe61..99b4f04150ac 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -444,6 +444,8 @@ share/locale/bs/LC_MESSAGES/gtk20-properties.mo
 share/locale/bs/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20-properties.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
+share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo
+share/locale/ca@valencia/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
@@ -675,6 +677,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES