Version bump. Include patch to fix firefox print preview crash for bug #195644

(Portage version: 2.1.3.15)

4 files changed, 32 insertions, 6 deletions

diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.0 b/x11-libs/gtk+/files/digest-gtk+-2.12.0
deleted file mode 100644
index f17cb4db830f..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.12.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2 15732170
-RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 gtk+-2.12.0.tar.bz2 15732170
-SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd gtk+-2.12.0.tar.bz2 15732170
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1
deleted file mode 100644
index f17cb4db830f..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2 15732170
-RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 gtk+-2.12.0.tar.bz2 15732170
-SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd gtk+-2.12.0.tar.bz2 15732170
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.1 b/x11-libs/gtk+/files/digest-gtk+-2.12.1
new file mode 100644
index 000000000000..c6d1447e5e6e
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.12.1
@@ -0,0 +1,3 @@
+MD5 c46f34addc2fe3ea6756055d59fb8856 gtk+-2.12.1.tar.bz2 15856678
+RMD160 3c3facd971a20178060c7e7cfe9d4cefd651250b gtk+-2.12.1.tar.bz2 15856678
+SHA256 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6 gtk+-2.12.1.tar.bz2 15856678
diff --git a/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch b/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch
new file mode 100644
index 000000000000..f474c2af3e59
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch
@@ -0,0 +1,29 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=482531 - firefox crashed on print preview [@IA__gdk_window_get_toplevel] [@gdk_window_is_toplevel_frozen]
+
+Index: gtk+/gdk/gdkwindow.c
+===================================================================
+--- gtk+/gdk/gdkwindow.c	(revision 18802)
++++ gtk+/gdk/gdkwindow.c	(working copy)
+@@ -615,7 +615,11 @@ gdk_window_get_toplevel (GdkWindow *wind
+ 
+   obj = (GdkWindowObject *)window;
+   while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
+-    obj = (GdkWindowObject *)obj->parent;
++    {
++      obj = (GdkWindowObject *)obj->parent;
++      if (!obj)
++	return NULL;
++    }
+   
+   return GDK_WINDOW (obj);
+ }
+@@ -2297,6 +2301,9 @@ gdk_window_is_toplevel_frozen (GdkWindow
+ 
+   toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
+ 
++  if (!toplevel)
++    return FALSE;
++
+   return toplevel->update_and_descendants_freeze_count > 0;
+ }
+