[gtk-osx] Patch 3.14 to remove bogus assert from gtkstylecontext.c.

[John Ralls <jralls src gnome org>]

commit e1b7470bc87da616bd5e1e1d8c4cfbb963d5aec2
Author: John Ralls <jralls ceridwen us>
Date:   Sat May 26 11:00:45 2018 -0700

    Patch 3.14 to remove bogus assert from gtkstylecontext.c.
    
    The assert checked for pointers that aren't used in the function.

 modulesets-stable/gtk-osx.modules                      |  8 ++++----
 patches/gtk-3.14-stylecontext-unnecessary-assert.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 45cbbbe..9af0643 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -204,8 +204,8 @@
       <!-- https://bugzilla.gnome.org/show_bug.cgi?id=763779 -->
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk-quartz-fix-pixelated-image-surfaces-in-retina-hidpi-.patch";
 strip="1"/>
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk3-14-get-scale-factor.patch"; 
strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk3-14-gtkdesktop.patch"; strip="1"/>  
    
-    </branch>
+      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk-3.14-stylecontext-unnecessary-assert.patch"; 
strip="1"/>       
+   </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
@@ -221,8 +221,8 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.22/gtk+-3.22.20.tar.xz" version="3.22.20"
-            hash="sha256:70c90998a7809f60dc0a7439a68c34e59077dadb631657a6f9cab6a5539c02d9">
+    <branch module="gtk+/3.22/gtk+-3.22.30.tar.xz" version="3.22.20"
+            hash="sha256:a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567">
     </branch>
     <dependencies>
       <dep package="glib"/>
diff --git a/patches/gtk-3.14-stylecontext-unnecessary-assert.patch 
b/patches/gtk-3.14-stylecontext-unnecessary-assert.patch
new file mode 100644
index 0000000..3e900c2
--- /dev/null
+++ b/patches/gtk-3.14-stylecontext-unnecessary-assert.patch
@@ -0,0 +1,11 @@
+--- a/gtk/gtkstylecontext.c    2015-07-21 07:22:36.000000000 -0700
++++ b/gtk/gtkstylecontext.c    2018-05-26 10:35:57.000000000 -0700
+@@ -795,8 +795,6 @@
+   if (info->values)
+     return info->values;
+ 
+-  g_assert (priv->widget != NULL || priv->widget_path != NULL);
+-
+   values = g_hash_table_lookup (priv->style_values, info);
+   if (values)
+     {