aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-09-08 10:51:19 +0200
committerRasmus Thomsen <oss@cogitri.dev>2021-09-08 09:30:19 +0000
commit9c0dd8d5fa224dfd710b9e0e4ef5a9a7a8065775 (patch)
treef7afbf22de8d2bbe8f588d4fc379ff99dee8478f
parent6a8d01bbbe87b6a5c48081be9368bdfb8a2dda8d (diff)
downloadaports-9c0dd8d5fa224dfd710b9e0e4ef5a9a7a8065775.tar.gz
aports-9c0dd8d5fa224dfd710b9e0e4ef5a9a7a8065775.tar.bz2
aports-9c0dd8d5fa224dfd710b9e0e4ef5a9a7a8065775.tar.xz
main/gtk+3.0: upgrade to 3.24.30
-rw-r--r--main/gtk+3.0/3614.patch91
-rw-r--r--main/gtk+3.0/APKBUILD10
2 files changed, 4 insertions, 97 deletions
diff --git a/main/gtk+3.0/3614.patch b/main/gtk+3.0/3614.patch
deleted file mode 100644
index 6dbac10c50..0000000000
--- a/main/gtk+3.0/3614.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 72ab4c46edbcbbf8985f42f5f0cee1b799ce5a91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Wed, 26 May 2021 17:08:03 +0200
-Subject: [PATCH] gtkapplication-dbus: Fetch inital screen saver state async
-
-Avoid a sync call that can make the application block for no good
-reason.
-
-Fixes 6f6b5faaa216feed666b659d1cdfacd0c5c393d9
----
- gtk/gtkapplication-dbus.c | 54 +++++++++++++++++++++++----------------
- 1 file changed, 32 insertions(+), 22 deletions(-)
-
-diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
-index a270354119..4951b1f558 100644
---- a/gtk/gtkapplication-dbus.c
-+++ b/gtk/gtkapplication-dbus.c
-@@ -227,6 +227,30 @@ screensaver_signal_portal (GDBusConnection *connection,
- }
- }
-
-+static void
-+ss_get_active_cb (GObject *source,
-+ GAsyncResult *result,
-+ gpointer data)
-+{
-+ GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) data;
-+ GDBusProxy *proxy = G_DBUS_PROXY (source);
-+ GError *error = NULL;
-+ GVariant *ret;
-+ gboolean active;
-+
-+ ret = g_dbus_proxy_call_finish (proxy, result, &error);
-+ if (ret == NULL)
-+ {
-+ g_warning ("Getting screensaver status failed: %s", error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ g_variant_get (ret, "(b)", &active);
-+ g_variant_unref (ret);
-+ gtk_application_set_screensaver_active (dbus->impl.application, active);
-+}
-+
- static void
- create_monitor_cb (GObject *source,
- GAsyncResult *result,
-@@ -329,31 +353,17 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,
-
- if (dbus->ss_proxy)
- {
-- GVariant *active_var;
-- gboolean active;
--
- g_signal_connect (dbus->ss_proxy, "g-signal",
- G_CALLBACK (screensaver_signal_session), impl->application);
-
-- active_var = g_dbus_proxy_call_sync (dbus->ss_proxy,
-- "GetActive",
-- NULL,
-- G_DBUS_CALL_FLAGS_NONE,
-- G_MAXINT,
-- NULL,
-- &error);
-- if (!active_var)
-- {
-- g_debug ("Error calling GetActive on GNOME screensaver: %s",
-- error->message);
-- g_clear_error (&error);
-- }
-- else
-- {
-- g_variant_get (active_var, "(b)", &active);
-- g_variant_unref (active_var);
-- gtk_application_set_screensaver_active (dbus->impl.application, active);
-- }
-+ g_dbus_proxy_call (dbus->ss_proxy,
-+ "GetActive",
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ G_MAXINT,
-+ NULL,
-+ ss_get_active_cb,
-+ dbus);
- }
-
- g_debug ("Registering client '%s' '%s'", dbus->application_id, client_id);
---
-GitLab
-
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index a2d68c22b4..b58e324279 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtk+3.0
-pkgver=3.24.28
-pkgrel=1
+pkgver=3.24.30
+pkgrel=0
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -59,8 +59,7 @@ checkdepends="
gdk-pixbuf
"
source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
- 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
- 3614.patch
+ 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
check-version.py
"
@@ -120,8 +119,7 @@ doc() {
}
sha512sums="
-65856ae06e4a863c56b3718c0cc3d0ca9f61a62a02ddef30904432300cd455851efee3fa1e5661659eaacbdfca45650ee7c8a2d4eca004ad2936c1e26c720c15 gtk+-3.24.28.tar.xz
+4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9 gtk+-3.24.30.tar.xz
e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
-0f166e3db57d4abbf6c540f09ca32c9f52fe02634c32b0808cd863824cfd1607877fcaff54299605b834c43ecb4bc4a02c0ccfaed02ed728b728523fe385d054 3614.patch
b97ccd8fb78d7c32fe91607befd6a7c0dd969fbfc9c242948fc88085133e3461583a0b18ade199b73f9659cae5f5525b940e66535a6ced4b916af9a88b3cc578 check-version.py
"