gtk: version bump 3.2.2 -> 3.22.30

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 106 insertions, 0 deletions

diff --git a/patches/gtk+-3.22.30/0001-configure-make-atk-bridge-optional.patch b/patches/gtk+-3.22.30/0001-configure-make-atk-bridge-optional.patch
new file mode 100644
index 000000000..c6cb24fcb
--- /dev/null
+++ b/patches/gtk+-3.22.30/0001-configure-make-atk-bridge-optional.patch
@@ -0,0 +1,60 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 14 Jun 2018 11:41:00 +0200
+Subject: [PATCH] configure: make atk-bridge optional
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac                | 12 +++++++++---
+ gtk/a11y/gtkaccessibility.c |  4 ++--
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fef0ecebf3e2..bae5d7f5cbae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1393,14 +1393,20 @@ AC_SUBST(GDK_DEP_CFLAGS)
+ # Check for Accessibility Toolkit flags
+ ########################################
+ 
++ATK_PACKAGES="atk"
++
+ if test x$enable_x11_backend = xyes; then
+-   ATK_PACKAGES="atk atk-bridge-2.0"
+-else
+-   ATK_PACKAGES="atk"
++  PKG_CHECK_MODULES(ATK_BRIDGE, "atk-bridge-2.0", have_atk_bridge=yes, have_atk_bridge=no)
++  if test "x$have_atk_bridge" = "xyes"; then
++    ATK_PACKAGES="$ATK_PACKAGES atk-bridge-2.0"
++    GDK_WINDOWING="$GDK_WINDOWING
++#define GDK_WINDOWING_ATK_BRIDGE"
++  fi
+ fi
+ 
+ PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
+ 
++
+ GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
+ GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
+ if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
+diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
+index 7f0e5207d915..81b2ed0d55b3 100644
+--- a/gtk/a11y/gtkaccessibility.c
++++ b/gtk/a11y/gtkaccessibility.c
+@@ -37,7 +37,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtkaccessible.h>
+ 
+-#ifdef GDK_WINDOWING_X11
++#ifdef GDK_WINDOWING_ATK_BRIDGE
+ #include <atk-bridge.h>
+ #endif
+ 
+@@ -988,7 +988,7 @@ _gtk_accessibility_init (void)
+   _gtk_accessibility_override_atk_util ();
+   do_window_event_initialization ();
+ 
+-#ifdef GDK_WINDOWING_X11
++#ifdef GDK_WINDOWING_ATK_BRIDGE
+   atk_bridge_adaptor_init (NULL, NULL);
+ #endif
+ 
diff --git a/patches/gtk+-3.22.30/0002-HACK-touch-gtkmarshalers.list-to-force-regenerating-.patch b/patches/gtk+-3.22.30/0002-HACK-touch-gtkmarshalers.list-to-force-regenerating-.patch
new file mode 100644
index 000000000..18a17a965
--- /dev/null
+++ b/patches/gtk+-3.22.30/0002-HACK-touch-gtkmarshalers.list-to-force-regenerating-.patch
@@ -0,0 +1,23 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 14 Jun 2018 15:57:33 +0200
+Subject: [PATCH] HACK: touch gtkmarshalers.list to force regenerating
+ gtkmarshalers.c
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ gtk/gtkmarshalers.list | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
+index cb6f4fa86149..b23fbb8181c4 100644
+--- a/gtk/gtkmarshalers.list
++++ b/gtk/gtkmarshalers.list
+@@ -21,6 +21,8 @@
+ #   NONE        deprecated alias for VOID
+ #   BOOL        deprecated alias for BOOLEAN
+ 
++# HACK: touch this file to regenerate broken distributed gtkmarshalers.c
++
+ BOOLEAN:BOXED
+ BOOLEAN:BOXED,BOXED
+ BOOLEAN:ENUM
diff --git a/patches/gtk+-3.22.30/autogen.sh b/patches/gtk+-3.22.30/autogen.sh
new file mode 100755
index 000000000..df78c388b
--- /dev/null
+++ b/patches/gtk+-3.22.30/autogen.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+aclocal $ACLOCAL_FLAGS
+
+libtoolize \
+	--force \
+	--copy
+
+autoreconf \
+	--force \
+	--install \
+	--warnings=cross \
+	--warnings=syntax \
+	--warnings=obsolete \
+	--warnings=unsupported
+
diff --git a/patches/gtk+-3.22.30/series b/patches/gtk+-3.22.30/series
new file mode 100644
index 000000000..e0cbd7489
--- /dev/null
+++ b/patches/gtk+-3.22.30/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-configure-make-atk-bridge-optional.patch
+0002-HACK-touch-gtkmarshalers.list-to-force-regenerating-.patch
+# ae8f6239bfb6e409cdb19eb27a9b426d  - git-ptx-patches magic