Date: Saturday, September 8, 2018 @ 23:43:24 Author: heftig Revision: 334148
3.24.0+9+g4858f4b46e-1 Modified: gtk3/trunk/PKGBUILD Deleted: gtk3/trunk/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch -----------------------------------------------------------------+ 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch | 49 ---------- PKGBUILD | 12 -- 2 files changed, 3 insertions(+), 58 deletions(-) Deleted: 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch =================================================================== --- 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch 2018-09-08 20:56:18 UTC (rev 334147) +++ 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch 2018-09-08 23:43:24 UTC (rev 334148) @@ -1,49 +0,0 @@ -From 3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3 Mon Sep 17 00:00:00 2001 -Message-Id: <3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3.1536176847.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Wed, 5 Sep 2018 21:46:28 +0200 -Subject: [PATCH] GtkApplication: Fix CRITICAL on shutdown when - register_session=FALSE - ---- - gtk/gtkapplication-dbus.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c -index 25015eb68c..0946edf35c 100644 ---- a/gtk/gtkapplication-dbus.c -+++ b/gtk/gtkapplication-dbus.c -@@ -826,15 +826,22 @@ gtk_application_impl_dbus_finalize (GObject *object) - { - GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) object; - -- g_dbus_connection_call (dbus->session, -- "org.freedesktop.portal.Desktop", -- dbus->session_id, -- "org.freedesktop.portal.Session", -- "Close", -- NULL, NULL, 0, -1, NULL, NULL, NULL); -+ if (dbus->session_id) -+ { -+ g_dbus_connection_call (dbus->session, -+ "org.freedesktop.portal.Desktop", -+ dbus->session_id, -+ "org.freedesktop.portal.Session", -+ "Close", -+ NULL, NULL, 0, -1, NULL, NULL, NULL); -+ -+ g_free (dbus->session_id); -+ } -+ -+ if (dbus->state_changed_handler) -+ g_dbus_connection_signal_unsubscribe (dbus->session, -+ dbus->state_changed_handler); - -- g_free (dbus->session_id); -- g_dbus_connection_signal_unsubscribe (dbus->session, dbus->state_changed_handler); - g_clear_object (&dbus->inhibit_proxy); - g_slist_free_full (dbus->inhibit_handles, inhibit_handle_free); - g_free (dbus->app_menu_path); --- -2.18.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-08 20:56:18 UTC (rev 334147) +++ PKGBUILD 2018-09-08 23:43:24 UTC (rev 334148) @@ -4,8 +4,8 @@ pkgbase=gtk3 pkgname=(gtk3 gtk-update-icon-cache) -pkgver=3.24.0 -pkgrel=2 +pkgver=3.24.0+9+g4858f4b46e +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit" arch=(x86_64) url="https://www.gtk.org/" @@ -15,15 +15,13 @@ cantarell-fonts colord rest libcups libcanberra) makedepends=(gobject-introspection gtk-doc git glib2-docs sassc) license=(LGPL) -_commit=ef1a1b5cb1010977d631dc1131b0db45a1e1e15f # tags/3.24.0^0 +_commit=4858f4b46ef19db884afb71957fe1d6a67d88915 # gtk-3-24 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" - 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch settings.ini gtk-query-immodules-3.0.hook gtk-update-icon-cache.hook gtk-update-icon-cache.script) sha256sums=('SKIP' - '54ea494642c2498dc9f14c310744a4a9d43b6d1fd217bc8ca50f4a86ec56973f' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308' @@ -36,10 +34,6 @@ prepare() { cd gtk - - # Attempt to unbreak libdazzle test-application - patch -Np1 -i ../0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch - NOCONFIGURE=1 ./autogen.sh }