From 85418bc4a9e01f410ec579e407a764cf4a7f1415 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 21 Apr 2023 14:57:18 +0100 Subject: [PATCH] Update to 44.1 (#2188642) --- .gitignore | 1 + 78.patch | 56 ----------------------------------- sources | 2 +- xdg-desktop-portal-gnome.spec | 6 +--- 4 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 78.patch diff --git a/.gitignore b/.gitignore index 5ccda1c..5a4099d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /xdg-desktop-portal-gnome-44.beta.tar.xz /xdg-desktop-portal-gnome-44.rc.tar.xz /xdg-desktop-portal-gnome-44.0.tar.xz +/xdg-desktop-portal-gnome-44.1.tar.xz diff --git a/78.patch b/78.patch deleted file mode 100644 index dadd5ad..0000000 --- a/78.patch +++ /dev/null @@ -1,56 +0,0 @@ -From deb46a4d5ce170e33a9a999def5457375eef122f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Thu, 9 Mar 2023 18:22:30 +0100 -Subject: [PATCH] systemd: Launch after gnome-session-initialized.target - -This means we can rely on various entities being there on the D-Bus thus -won't need to manually wait for them. ---- - data/xdg-desktop-portal-gnome.service.in | 1 + - src/externalwindow-wayland.c | 12 ------------ - 2 files changed, 1 insertion(+), 12 deletions(-) - -diff --git a/data/xdg-desktop-portal-gnome.service.in b/data/xdg-desktop-portal-gnome.service.in -index 62ff2f9..8fc2e1a 100644 ---- a/data/xdg-desktop-portal-gnome.service.in -+++ b/data/xdg-desktop-portal-gnome.service.in -@@ -1,5 +1,6 @@ - [Unit] - Description=Portal service (GNOME implementation) -+After=gnome-session-initialized.target - - [Service] - Type=dbus -diff --git a/src/externalwindow-wayland.c b/src/externalwindow-wayland.c -index b09d8a0..88be4c8 100644 ---- a/src/externalwindow-wayland.c -+++ b/src/externalwindow-wayland.c -@@ -263,7 +263,6 @@ on_service_channel_name_appeared (GDBusConnection *connection, - GdkDisplay * - init_external_window_wayland_display (GError **error) - { -- guint watch_name_id; - gboolean name_appeared = FALSE; - g_autoptr(OrgGnomeMutterServiceChannel) proxy = NULL; - g_autoptr(GVariant) fd_variant = NULL; -@@ -272,17 +271,6 @@ init_external_window_wayland_display (GError **error) - g_autofree char *fd_str = NULL; - GdkDisplay *display; - -- watch_name_id = -- g_bus_watch_name (G_BUS_TYPE_SESSION, -- "org.gnome.Mutter.ServiceChannel", -- G_BUS_NAME_WATCHER_FLAGS_NONE, -- on_service_channel_name_appeared, -- NULL, -- &name_appeared, NULL); -- while (!name_appeared) -- g_main_context_iteration (NULL, TRUE); -- g_bus_unwatch_name (watch_name_id); -- - proxy = org_gnome_mutter_service_channel_proxy_new_for_bus_sync ( - G_BUS_TYPE_SESSION, - (G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | --- -GitLab - diff --git a/sources b/sources index 6be5535..b39d4ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-desktop-portal-gnome-44.0.tar.xz) = 1aa8eae420f4bf00ea34b3ad665edad89f9444bd2d5baa84d1f96b303ab072c66c139eb760cfbfd796691bda745f3eb5455f8d805fb042c8037eb786a730eb95 +SHA512 (xdg-desktop-portal-gnome-44.1.tar.xz) = 58e165b06a7b8dd8dd87cd2874db87e1e6e608e9752334f6c1ae341acd28857dca2d02ef1659b174dd4041897e898455ee99cde1cdf4b28f9e3a88d4dba73989 diff --git a/xdg-desktop-portal-gnome.spec b/xdg-desktop-portal-gnome.spec index a3933f2..2134083 100644 --- a/xdg-desktop-portal-gnome.spec +++ b/xdg-desktop-portal-gnome.spec @@ -3,17 +3,13 @@ %global xdg_desktop_portal_version 1.15.0 Name: xdg-desktop-portal-gnome -Version: 44.0 +Version: 44.1 Release: %autorelease Summary: Backend implementation for xdg-desktop-portal using GNOME License: LGPL-2.1-or-later URL: https://gitlab.gnome.org/GNOME/%{name} Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{tarball_version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=2176759 -# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/merge_requests/78 -# Help fix apps hanging on start in KDE with GNOME portal installed -Patch0: 78.patch BuildRequires: desktop-file-utils BuildRequires: gcc