updpkgver

5 files changed, 19 insertions, 317 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2110afc6059f..62a49f006231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk3-ubuntu
 	pkgdesc = GObject-based multi-platform toolkit
-	pkgver = 3.22.30
+	pkgver = 3.24.11
 	pkgrel = 2
 	url = http://www.gtk.org/
 	arch = x86_64
@@ -39,18 +39,18 @@ pkgbase = gtk3-ubuntu
 	depends = wayland
 	depends = wayland-protocols
 	depends = gtk-update-icon-cache
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=2e7ac262be15fb402c4103d28533c6c6d955bf65
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=622111f1caf9104251de79bfa27ccfba9614cc90
 	source = settings.ini
 	source = gtk-query-immodules-3.0.hook
 	source = gtk-update-icon-cache.hook
 	source = gtk-update-icon-cache.script
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.22.30-1ubuntu1.debian.tar.xz
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.24.11-1ubuntu1.debian.tar.xz
 	sha512sums = SKIP
 	sha512sums = ad2c0b0388f4169592b9574f0b3db673a969b7c4721548c4ac7c438eddbcdc378fcaac04e2b6c858a1562cc23ddf4804e5f7be08068340b7c9365e2b11ddcfb8
 	sha512sums = f0ffd95544863f2e10fda81488b4727aa9a8a35a7d39fb96872db6664d03442db2b58af788b5990825c7b3a83681f7220ca481409cca5421dfb39b9a3bbac9ac
 	sha512sums = abfd73de4faa6f53784182800395aa3c39bb98e15a0eb300fb4142073ff7ce565a0836a2363393b2f132060b5293dbc0c30c380a023f38d5bd39c62cb58389c2
 	sha512sums = 5cd50d93bb6bc203438a2a0764bd717409658e124058b18a1da26a21f10ef7564a16f32fc0633a68b45b2e303fa63a5efefeadd6b0bf1d7f474556df8cdb6c58
-	sha512sums = 8baf8e62ed71cf1fc8d172725749b4f63d1d3c5f9303e1b1874a97df1250139e7aae777b3053ad5dd7c5af7267832af1e9559db6b6501af294c8159d1b1c6fd4
+	sha512sums = 191b4d4cb3c690a818c09ff36d42b6f58db63cc0e924d9900fce5b1715d227d7702b85caa3c721640fb18cd59a9c9af6e31b2d2387e14e89cf5516006e4c63e7
 
 pkgname = gtk3-ubuntu
 	install = gtk3.install
diff --git a/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch b/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch
deleted file mode 100644
index 7b7a9e0f70e1..000000000000
--- a/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9577618e2ae679988231cfa2162eb48cdb6ce5a0 Mon Sep 17 00:00:00 2001
-Message-Id: <9577618e2ae679988231cfa2162eb48cdb6ce5a0.1511732020.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 26 Nov 2017 22:32:36 +0100
-Subject: [PATCH] entry: Undo ABI breakage from addition of insert_emoji
-
----
- gtk/gtkentry.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
-index 073e703d0deea6a6..0372752f2963c940 100644
---- a/gtk/gtkentry.h
-+++ b/gtk/gtkentry.h
-@@ -146,19 +146,19 @@ struct _GtkEntryClass
-   void (* copy_clipboard)     (GtkEntry             *entry);
-   void (* paste_clipboard)    (GtkEntry             *entry);
-   void (* toggle_overwrite)   (GtkEntry             *entry);
--  void (* insert_emoji)       (GtkEntry             *entry);
- 
-   /* hooks to add other objects beside the entry (like in GtkSpinButton) */
-   void (* get_text_area_size) (GtkEntry       *entry,
- 			       gint           *x,
- 			       gint           *y,
- 			       gint           *width,
- 			       gint           *height);
-   void (* get_frame_size)     (GtkEntry       *entry,
-                                gint           *x,
-                                gint           *y,
- 			       gint           *width,
- 			       gint           *height);
-+  void (* insert_emoji)       (GtkEntry             *entry);
- 
-   /*< private >*/
- 
--- 
-2.15.0
diff --git a/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch b/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
deleted file mode 100644
index 5d6210e54529..000000000000
--- a/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 0d945f06faee49788191e3e28f797f72959b3583 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 10 Oct 2016 16:34:28 +0200
-Subject: [PATCH] gdkscreen-x11: Fix screen and monitor size calculation
-
-The monitors are already in scaled pixels, so scaling again when retrieving
-the screen size is wrong.
-
-With GDK_SCALE unset, the initial monitor sizes are unscaled, and when the
-xsettings client sets a scale > 1, the monitor sizes should be updated.
-
-The end result is that the monitor sizes start out wrong, and get
-corrected on the first xrandr event, while the screen size starts out
-right and becomes wrong after the event.
-
-This patch fixes Firefox misplacing menus and popovers when the xrandr
-configuration changes while it is running.
-
-Fix for the X11 side of
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772202
----
- gdk/x11/gdkscreen-x11.c | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index 7738a47adfed1484..28a43a69bedbe955 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -49,6 +49,7 @@
- static void         gdk_x11_screen_dispose     (GObject		  *object);
- static void         gdk_x11_screen_finalize    (GObject		  *object);
- static void	    init_randr_support	       (GdkScreen	  *screen);
-+static void         process_monitors_change    (GdkScreen         *screen);
- 
- enum
- {
-@@ -82,13 +83,13 @@ gdk_x11_screen_get_display (GdkScreen *screen)
- gint
- gdk_x11_screen_get_width (GdkScreen *screen)
- {
--  return GDK_X11_SCREEN (screen)->width / GDK_X11_SCREEN (screen)->window_scale;
-+  return GDK_X11_SCREEN (screen)->width;
- }
- 
- gint
- gdk_x11_screen_get_height (GdkScreen *screen)
- {
--  return GDK_X11_SCREEN (screen)->height / GDK_X11_SCREEN (screen)->window_scale;
-+  return GDK_X11_SCREEN (screen)->height;
- }
- 
- static gint
-@@ -906,10 +907,8 @@ void
- _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen,
- 				  gint          scale)
- {
--  GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display);
-   GList *toplevels, *l;
-   GdkWindow *root;
--  int i;
- 
-   if (x11_screen->window_scale == scale)
-     return;
-@@ -928,14 +927,7 @@ _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen,
-       _gdk_x11_window_set_window_scale (window, scale);
-     }
- 
--  for (i = 0; i < x11_display->monitors->len; i++)
--    {
--      GdkMonitor *monitor = GDK_MONITOR (x11_display->monitors->pdata[i]);
--
--      gdk_monitor_set_scale_factor (monitor, scale);
--    }
--
--  g_signal_emit_by_name (GDK_SCREEN (x11_screen), "monitors-changed");
-+  process_monitors_change (GDK_SCREEN (x11_screen));
- }
- 
- /*
--- 
-2.10.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 9c380e07b00a..c12e6bef7ece 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,9 +15,9 @@ _use_ppa=true
 
 pkgbase=gtk3-ubuntu
 pkgname=(gtk3-ubuntu gtk-update-icon-cache-ubuntu)
-_ubuntu_ver=3.22.30
+_ubuntu_ver=3.24.11
 _ubuntu_rel=1ubuntu1
-pkgver=3.22.30
+pkgver=3.24.11
 pkgrel=2
 pkgdesc="GObject-based multi-platform toolkit"
 arch=(x86_64)
@@ -25,7 +25,7 @@ url="http://www.gtk.org/"
 depends=(adwaita-icon-theme at-spi2-atk atk cairo cantarell-fonts colord dconf desktop-file-utils gdk-pixbuf2 gtk-update-icon-cache json-glib libcanberra libcups libepoxy librsvg libxcomposite libxcursor libxdamage libxi libxinerama libxkbcommon libxrandr mesa pango rest shared-mime-info wayland wayland-protocols gtk-update-icon-cache)
 makedepends=(gobject-introspection git gtk-doc glib2-docs sassc)
 license=(LGPL)
-_commit=2e7ac262be15fb402c4103d28533c6c6d955bf65  # tags/3.22.30^0
+_commit=622111f1caf9104251de79bfa27ccfba9614cc90  # tags/3.24.11^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
 	settings.ini
 	gtk-query-immodules-3.0.hook
@@ -39,7 +39,7 @@ sha512sums=('SKIP'
             'f0ffd95544863f2e10fda81488b4727aa9a8a35a7d39fb96872db6664d03442db2b58af788b5990825c7b3a83681f7220ca481409cca5421dfb39b9a3bbac9ac'
             'abfd73de4faa6f53784182800395aa3c39bb98e15a0eb300fb4142073ff7ce565a0836a2363393b2f132060b5293dbc0c30c380a023f38d5bd39c62cb58389c2'
             '5cd50d93bb6bc203438a2a0764bd717409658e124058b18a1da26a21f10ef7564a16f32fc0633a68b45b2e303fa63a5efefeadd6b0bf1d7f474556df8cdb6c58'
-            '8baf8e62ed71cf1fc8d172725749b4f63d1d3c5f9303e1b1874a97df1250139e7aae777b3053ad5dd7c5af7267832af1e9559db6b6501af294c8159d1b1c6fd4')
+            '191b4d4cb3c690a818c09ff36d42b6f58db63cc0e924d9900fce5b1715d227d7702b85caa3c721640fb18cd59a9c9af6e31b2d2387e14e89cf5516006e4c63e7')
 
 pkgver() {
   cd gtk
@@ -50,20 +50,27 @@ prepare() {
     cd gtk
 
     local patches=(
+        gdk-Don-t-distribute-generated-files-in-tarballs.patch
+        gtk-Really-don-t-distribute-built-files.patch
+        demos-examples-tests-Don-t-distribute-built-files.patch
         016_no_offscreen_widgets_grabbing.patch
         017_no_offscreen_device_grabbing.patch
+        022_disable-viqr-im-for-vi-locale.patch
         060_ignore-random-icons.patch
+        reftest-known-fail.patch
+        Don-t-test-default-constructed-GdkPixbuf-properties.patch
+        Disable-accessibility-dump-aka-a11ytests-test.patch
         073_treeview_almost_fixed.patch
-        no-accessibility-dump.patch
         bzg_gtkcellrenderer_grabbing_modifier.patch
+        ubuntu_gtk_custom_menu_items.patch
         print-dialog-show-options-of-remote-dnssd-printers.patch
-	uimanager-guard-against-nested-node-updates.patch
+        uimanager-guard-against-nested-node-updates.patch
         x-canonical-accel.patch
         message-dialog-restore-traditional-look-on-unity.patch
+        0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch
         0001-calendar-always-emit-day-selected-once.patch
         0001-gtkwindow-set-transparent-background-color.patch
-	ubuntu_gtk_custom_menu_items.patch
-	unity-border-radius.patch
+        unity-border-radius.patch
         unity-headerbar-maximized-mode.patch
     )
 
diff --git a/ubuntu_gtk_custom_menu_items.patch b/ubuntu_gtk_custom_menu_items.patch
deleted file mode 100644
index 70d9d0326b6a..000000000000
--- a/ubuntu_gtk_custom_menu_items.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 59168f3c1a72f610b693cd1ed4cfa5fac281079a Mon Sep 17 00:00:00 2001
-From: Lars Uebernickel <lars.uebernickel@canonical.com>
-Date: Wed, 6 Nov 2013 14:48:19 +0100
-Subject: [PATCH] Add UbuntuMenuItemFactory
-
-UbuntuMenuItemFactory is an interface for creating widgets for menu
-items in a GMenuModel that have an 'x-canonical-type' attribute.
-
-It is needed by unity and should not be considered public API.
----
- gtk/Makefile.am             |  3 ++
- gtk/gtkmenushell.c          | 69 ++++++++++++++++++++++++++++++++++++++++++++
- gtk/gtkmenutrackeritem.c    | 16 +++++++++++
- gtk/gtkmenutrackeritem.h    |  4 +++
- gtk/ubuntu-private.h        | 32 +++++++++++++++++++++
- gtk/ubuntumenuitemfactory.c | 70 +++++++++++++++++++++++++++++++++++++++++++++
- gtk/ubuntumenuitemfactory.h | 61 +++++++++++++++++++++++++++++++++++++++
- 7 files changed, 255 insertions(+)
- create mode 100644 gtk/ubuntu-private.h
- create mode 100644 gtk/ubuntumenuitemfactory.c
- create mode 100644 gtk/ubuntumenuitemfactory.h
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 51153e6..3c01638 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -108,6 +108,8 @@ include $(srcdir)/inspector/Makefile.inc
- gtk_public_h_sources = 		\
- 	gtk.h			\
- 	gtk-autocleanups.h	\
-+	ubuntu-private.h	\
-+	ubuntumenuitemfactory.h	\
- 	gtkx.h			\
- 	gtkx-autocleanups.h	\
- 	gtk-a11y.h		\
-@@ -528,6 +530,7 @@ gtk_base_c_sources = 		\
- 	$(a11y_c_sources)	\
- 	$(deprecated_c_sources)	\
- 	$(inspector_c_sources)	\
-+	ubuntumenuitemfactory.c \
- 	gtkactionmuxer.c	\
- 	gtkactionobserver.c	\
- 	gtkactionobservable.c	\
-diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
-index e1ba138..6d7a2f6 100644
---- a/gtk/gtkmenushell.c
-+++ b/gtk/gtkmenushell.c
-@@ -80,6 +80,8 @@
- 
- #include "a11y/gtkmenushellaccessible.h"
- 
-+#include "ubuntu-private.h"
-+
- 
- #define MENU_SHELL_TIMEOUT   500
- #define MENU_POPUP_DELAY     225
-@@ -2044,6 +2046,58 @@ gtk_menu_shell_tracker_remove_func (gint     position,
-   gtk_widget_destroy (child);
- }
- 
-+static GtkWidget *
-+create_custom_menu_item (GMenuItem   *item,
-+                         GtkWidget   *parent,
-+                         const gchar *action_namespace)
-+{
-+  gchar *type;
-+  GActionGroup *actions;
-+  GtkMenuItem *widget = NULL;
-+  GList *it;
-+
-+  g_menu_item_get_attribute (item, "x-canonical-type", "s", &type);
-+
-+  if (action_namespace)
-+    {
-+      gchar *action;
-+
-+      /* Rewrite the menu item to include the fully qualified action
-+       * name to make writing widgets easier. This won't break, as
-+       * we don't use the tracker item for custom items.
-+       */
-+      if (g_menu_item_get_attribute (item, "action", "s", &action))
-+        {
-+          gchar *fullname;
-+
-+          fullname = g_strconcat (action_namespace, ".", action, NULL);
-+          g_menu_item_set_attribute (item, "action", "s", fullname);
-+
-+          g_free (fullname);
-+          g_free (action);
-+        }
-+    }
-+
-+  /* Passing the parent muxer is wrong, but we'll only have access
-+   * to the menuitem's muxer after the widget has been created.
-+   * Thus we'd need some other form of passing the action group to
-+   * the widget, which would complicate things for no practical
-+   * reason: the panel service is the only consumer of this API and
-+   * it will never call gtk_widget_insert_action_group() on the
-+   * returned menu item.
-+   */
-+  actions = G_ACTION_GROUP (_gtk_widget_get_action_muxer (parent, TRUE));
-+
-+  for (it = ubuntu_menu_item_factory_get_all (); it != NULL && widget == NULL; it = it->next)
-+    widget = ubuntu_menu_item_factory_create_menu_item (it->data, type, item, actions);
-+
-+  if (widget == NULL)
-+    g_warning ("Cannot create custom menu item of type '%s'", type);
-+
-+  g_free (type);
-+  return GTK_WIDGET (widget);
-+}
-+
- static void
- gtk_menu_shell_tracker_insert_func (GtkMenuTrackerItem *item,
-                                     gint                position,
-@@ -2051,6 +2105,9 @@ gtk_menu_shell_tracker_insert_func (GtkMenuTrackerItem *item,
- {
-   GtkMenuShell *menu_shell = user_data;
-   GtkWidget *widget;
-+  GMenuItem *menuitem;
-+
-+  menuitem = gtk_menu_tracker_item_get_menu_item (item);
- 
-   if (gtk_menu_tracker_item_get_is_separator (item))
-     {
-@@ -2112,6 +2169,18 @@ gtk_menu_shell_tracker_insert_func (GtkMenuTrackerItem *item,
- 
-       gtk_widget_show (widget);
-     }
-+  else if (g_menu_item_get_attribute (menuitem, "x-canonical-type", "s", NULL))
-+    {
-+      const gchar *namespace;
-+
-+      namespace = gtk_menu_tracker_item_get_action_namespace (item);
-+      widget = create_custom_menu_item (menuitem, GTK_WIDGET (menu_shell), namespace);
-+
-+      if (widget == NULL)
-+        return;
-+
-+      gtk_widget_show (widget);
-+    }
-   else
-     {
-       widget = gtk_model_menu_item_new ();
-diff --git a/gtk/gtkmenutrackeritem.c b/gtk/gtkmenutrackeritem.c
-index c304b66..cd0c796 100644
---- a/gtk/gtkmenutrackeritem.c
-+++ b/gtk/gtkmenutrackeritem.c
-@@ -979,3 +979,19 @@ gtk_menu_tracker_item_may_disappear (GtkMenuTrackerItem *self)
- {
-   return self->hidden_when != HIDDEN_NEVER;
- }
-+
-+GMenuItem *
-+gtk_menu_tracker_item_get_menu_item (GtkMenuTrackerItem *self)
-+{
-+  g_return_val_if_fail (GTK_IS_MENU_TRACKER_ITEM (self), NULL);
-+
-+  return self->item;
-+}
-+
-+const gchar *
-+gtk_menu_tracker_item_get_action_namespace (GtkMenuTrackerItem *self)
-+{
-+  g_return_val_if_fail (GTK_IS_MENU_TRACKER_ITEM (self), NULL);
-+
-+  return self->action_namespace;
-+}
-diff --git a/gtk/gtkmenutrackeritem.h b/gtk/gtkmenutrackeritem.h
-index 6b4fcb5..d74fe92 100644
---- a/gtk/gtkmenutrackeritem.h
-+++ b/gtk/gtkmenutrackeritem.h
-@@ -92,4 +92,8 @@ void                    gtk_menu_tracker_item_request_submenu_shown     (GtkMenu
- 
- gboolean                gtk_menu_tracker_item_get_submenu_shown         (GtkMenuTrackerItem *self);
- 
-+GMenuItem *             gtk_menu_tracker_item_get_menu_item             (GtkMenuTrackerItem *self);
-+
-+const gchar *           gtk_menu_tracker_item_get_action_namespace      (GtkMenuTrackerItem *self);
-+
- #endif
-
--- 
-2.1.4
-