From dc245b55ca785b7aad1a00c67ecc233895f2d320 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 12 Aug 2019 19:27:55 +0200 Subject: [PATCH] Update to 1.4.0 --- .gitignore | 1 + bump-compatible-gnome-screen-cast-api.patch | 82 --------------------- sources | 2 +- xdg-desktop-portal-gtk.spec | 10 +-- 4 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 bump-compatible-gnome-screen-cast-api.patch diff --git a/.gitignore b/.gitignore index b556640..f90866e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xdg-desktop-portal-gtk-1.0.2.tar.xz /xdg-desktop-portal-gtk-1.1.1.tar.xz /xdg-desktop-portal-gtk-1.2.0.tar.xz +/xdg-desktop-portal-gtk-1.4.0.tar.xz diff --git a/bump-compatible-gnome-screen-cast-api.patch b/bump-compatible-gnome-screen-cast-api.patch deleted file mode 100644 index ec08db0..0000000 --- a/bump-compatible-gnome-screen-cast-api.patch +++ /dev/null @@ -1,82 +0,0 @@ -From f559afd237ea9779461b19ed706dda79c4587d5c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Wed, 27 Feb 2019 16:42:24 +0100 -Subject: [PATCH 1/2] gnomescreencast: Make signals array static - ---- - src/gnomescreencast.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gnomescreencast.c b/src/gnomescreencast.c -index fa8548b..3b3e8e4 100644 ---- a/src/gnomescreencast.c -+++ b/src/gnomescreencast.c -@@ -51,7 +51,7 @@ enum - N_SIGNALS - }; - --guint signals[N_SIGNALS]; -+static guint signals[N_SIGNALS]; - - typedef struct _GnomeScreenCastStream - { --- -2.20.1 - - -From 7bee9d8d2b591773ed2d61d3087080f38f53330e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Wed, 27 Feb 2019 16:47:21 +0100 -Subject: [PATCH 2/2] gnomescreencast: Bump supported API version - -Mutter bumped the version when it added the window recording and cursor -modes, so we need to bump the version we support to be compatible. ---- - src/gnomescreencast.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/gnomescreencast.c b/src/gnomescreencast.c -index 3b3e8e4..f5ed486 100644 ---- a/src/gnomescreencast.c -+++ b/src/gnomescreencast.c -@@ -22,7 +22,7 @@ - - #include - --#define SUPPORTED_MUTTER_SCREEN_CAST_API_VERSION 1 -+#define SUPPORTED_MUTTER_SCREEN_CAST_API_VERSION 2 - - enum - { -@@ -99,6 +99,8 @@ typedef struct _GnomeScreenCast - { - GObject parent; - -+ int api_version; -+ - guint screen_cast_name_watch; - OrgGnomeMutterScreenCast *proxy; - } GnomeScreenCast; -@@ -487,7 +489,6 @@ gnome_screen_cast_name_appeared (GDBusConnection *connection, - { - GnomeScreenCast *gnome_screen_cast = user_data; - g_autoptr(GError) error = NULL; -- int api_version; - - gnome_screen_cast->proxy = - org_gnome_mutter_screen_cast_proxy_new_sync (connection, -@@ -503,9 +504,9 @@ gnome_screen_cast_name_appeared (GDBusConnection *connection, - return; - } - -- api_version = -+ gnome_screen_cast->api_version = - org_gnome_mutter_screen_cast_get_version (gnome_screen_cast->proxy); -- if (api_version != SUPPORTED_MUTTER_SCREEN_CAST_API_VERSION) -+ if (gnome_screen_cast->api_version > SUPPORTED_MUTTER_SCREEN_CAST_API_VERSION) - { - g_warning ("org.gnome.Mutter.ScreenCast API version not compatible"); - g_clear_object (&gnome_screen_cast->proxy); --- -2.20.1 - diff --git a/sources b/sources index 435c7ea..0e6701c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-desktop-portal-gtk-1.2.0.tar.xz) = 7f43b9fe1d255360177300e7a673fce1a9237aaa1dc1f70659f1ef00995d657d00f53e428b3d7ae2f746670d1c8443f87c4f6052b6b5a27f0201876c0ea6ea3e +SHA512 (xdg-desktop-portal-gtk-1.4.0.tar.xz) = 200fa490c486fbd61279cd6786b55b7ae85d88026d13b3d2d337d69d5d0c0f56babc9c0a8217b26e4771cd8d77c05871b9689e42b170a413083c4004d62db9ed diff --git a/xdg-desktop-portal-gtk.spec b/xdg-desktop-portal-gtk.spec index 9d91d59..eaf7413 100644 --- a/xdg-desktop-portal-gtk.spec +++ b/xdg-desktop-portal-gtk.spec @@ -1,16 +1,14 @@ %global xdg_desktop_portal_version 1.1.1 Name: xdg-desktop-portal-gtk -Version: 1.2.0 -Release: 4%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Backend implementation for xdg-desktop-portal using GTK+ License: LGPLv2+ URL: https://github.com/flatpak/%{name} Source0: https://github.com/flatpak/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz -Patch0: bump-compatible-gnome-screen-cast-api.patch - BuildRequires: gcc BuildRequires: gettext BuildRequires: pkgconfig(gtk+-unix-print-3.0) @@ -32,7 +30,6 @@ org.gnome.SessionManager D-Bus interfaces. %prep %setup -q -%patch0 -p1 %build @@ -64,6 +61,9 @@ org.gnome.SessionManager D-Bus interfaces. %changelog +* Mon Aug 12 2019 Kalev Lember - 1.4.0-1 +- Update to 1.4.0 + * Sat Jul 27 2019 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild