From a81e7e5623436a1b4285c380c024539a2c5e51b1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 1 Mar 2022 05:06:36 -0500 Subject: [PATCH] import xdg-desktop-portal-1.12.1-1.el9 --- .gitignore | 2 +- .xdg-desktop-portal.metadata | 2 +- ...er-profiles-daemon-gnome-40-backport.patch | 296 +----------------- SPECS/xdg-desktop-portal.spec | 21 +- 4 files changed, 15 insertions(+), 306 deletions(-) diff --git a/.gitignore b/.gitignore index 1eaef7c..bedcbbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xdg-desktop-portal-1.8.1.tar.xz +SOURCES/xdg-desktop-portal-1.12.1.tar.xz diff --git a/.xdg-desktop-portal.metadata b/.xdg-desktop-portal.metadata index e78bc85..c4805d9 100644 --- a/.xdg-desktop-portal.metadata +++ b/.xdg-desktop-portal.metadata @@ -1 +1 @@ -308bb017c1306574b8bd62b19b250466bbd4785a SOURCES/xdg-desktop-portal-1.8.1.tar.xz +ca734243c27c3a5b76dc4df30b4a2cef5a578237 SOURCES/xdg-desktop-portal-1.12.1.tar.xz diff --git a/SOURCES/power-profiles-daemon-gnome-40-backport.patch b/SOURCES/power-profiles-daemon-gnome-40-backport.patch index 808b1ad..4c25258 100644 --- a/SOURCES/power-profiles-daemon-gnome-40-backport.patch +++ b/SOURCES/power-profiles-daemon-gnome-40-backport.patch @@ -1,302 +1,14 @@ -From 9e5e5ae969a96ab8ef6de7c28a0ebc1deae08b86 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 9 Aug 2021 16:41:29 +0200 -Subject: [PATCH 1/3] data: add PowerProfileMonitor interface definition - ---- - data/Makefile.am.inc | 1 + - ...freedesktop.portal.PowerProfileMonitor.xml | 43 +++++++++++++++++++ - 2 files changed, 44 insertions(+) - create mode 100644 data/org.freedesktop.portal.PowerProfileMonitor.xml - -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index aacba2a..3aabe16 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -15,6 +15,7 @@ dist_introspection_DATA = \ - data/org.freedesktop.portal.NetworkMonitor.xml \ - data/org.freedesktop.portal.Notification.xml \ - data/org.freedesktop.portal.OpenURI.xml \ -+ data/org.freedesktop.portal.PowerProfileMonitor.xml \ - data/org.freedesktop.portal.Print.xml \ - data/org.freedesktop.portal.ProxyResolver.xml \ - data/org.freedesktop.portal.RemoteDesktop.xml \ -diff --git a/data/org.freedesktop.portal.PowerProfileMonitor.xml b/data/org.freedesktop.portal.PowerProfileMonitor.xml -new file mode 100644 -index 0000000..daf487a ---- /dev/null -+++ b/data/org.freedesktop.portal.PowerProfileMonitor.xml -@@ -0,0 +1,43 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.31.1 - - -From 9a5ab798e345063eecaf6ef049cfab1ee3d52925 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 9 Aug 2021 17:11:25 +0200 -Subject: [PATCH 2/3] power-profile-monitor: Add portal implementation for - GPowerProfileMonitor - -See glib references: -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2194 ---- - src/Makefile.am.inc | 3 + - src/power-profile-monitor.c | 113 ++++++++++++++++++++++++++++++++++++ - src/power-profile-monitor.h | 25 ++++++++ - src/xdg-desktop-portal.c | 2 + - 4 files changed, 143 insertions(+) - create mode 100644 src/power-profile-monitor.c - create mode 100644 src/power-profile-monitor.h - -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index 961a722..7e803dd 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -41,6 +41,7 @@ PORTAL_IFACE_FILES =\ - data/org.freedesktop.portal.Camera.xml \ - data/org.freedesktop.portal.Secret.xml \ - data/org.freedesktop.portal.Wallpaper.xml \ -+ data/org.freedesktop.portal.PowerProfileMonitor.xml \ - $(NULL) - - PORTAL_IMPL_IFACE_FILES =\ -@@ -126,6 +127,8 @@ xdg_desktop_portal_SOURCES = \ - src/memory-monitor.h \ - src/network-monitor.c \ - src/network-monitor.h \ -+ src/power-profile-monitor.c \ -+ src/power-profile-monitor.h \ - src/proxy-resolver.c \ - src/proxy-resolver.h \ - src/screenshot.c \ -diff --git a/src/power-profile-monitor.c b/src/power-profile-monitor.c -new file mode 100644 -index 0000000..9ffa87a ---- /dev/null -+++ b/src/power-profile-monitor.c -@@ -0,0 +1,113 @@ -+/* -+ * Copyright © 2021 Red Hat, Inc -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see . -+ * -+ * Authors: -+ * Bastien Nocera -+ */ -+ -+#include "config.h" -+ -+#include -+#include -+ -+#include "power-profile-monitor.h" -+#include "request.h" -+#include "xdp-dbus.h" -+#include "xdp-utils.h" -+ -+#if GLIB_CHECK_VERSION(2, 69, 1) -+#define HAS_POWER_PROFILE_MONITOR 1 -+#endif -+ -+typedef struct _PowerProfileMonitor PowerProfileMonitor; -+typedef struct _PowerProfileMonitorClass PowerProfileMonitorClass; -+ -+struct _PowerProfileMonitor -+{ -+ XdpPowerProfileMonitorSkeleton parent_instance; -+ -+#ifdef HAS_POWER_PROFILE_MONITOR -+ GPowerProfileMonitor *monitor; -+#endif /* HAS_POWER_PROFILE_MONITOR */ -+}; -+ -+struct _PowerProfileMonitorClass -+{ -+ XdpPowerProfileMonitorSkeletonClass parent_class; -+}; -+ -+static PowerProfileMonitor *power_profile_monitor; -+ -+GType power_profile_monitor_get_type (void) G_GNUC_CONST; -+static void power_profile_monitor_iface_init (XdpPowerProfileMonitorIface *iface); -+ -+G_DEFINE_TYPE_WITH_CODE (PowerProfileMonitor, power_profile_monitor, XDP_TYPE_POWER_PROFILE_MONITOR_SKELETON, -+ G_IMPLEMENT_INTERFACE (XDP_TYPE_POWER_PROFILE_MONITOR, power_profile_monitor_iface_init)); -+ -+static void -+power_profile_monitor_iface_init (XdpPowerProfileMonitorIface *iface) -+{ -+} -+ -+#ifdef HAS_POWER_PROFILE_MONITOR -+static void -+power_saver_enabled_changed_cb (GObject *gobject, -+ GParamSpec *pspec, -+ PowerProfileMonitor *ppm) -+{ -+ xdp_power_profile_monitor_set_power_saver_enabled (XDP_POWER_PROFILE_MONITOR (ppm), -+ g_power_profile_monitor_get_power_saver_enabled (ppm->monitor)); -+} -+#endif /* HAS_POWER_PROFILE_MONITOR */ -+ -+static void -+power_profile_monitor_init (PowerProfileMonitor *ppm) -+{ -+#ifdef HAS_POWER_PROFILE_MONITOR -+ ppm->monitor = g_power_profile_monitor_dup_default (); -+ g_signal_connect (ppm->monitor, "notify::power-saver-enabled", G_CALLBACK (power_saver_enabled_changed_cb), ppm); -+#endif /* HAS_POWER_PROFILE_MONITOR */ -+ -+ xdp_power_profile_monitor_set_version (XDP_POWER_PROFILE_MONITOR (ppm), 1); -+} -+ -+static void -+power_profile_monitor_finalize (GObject *object) -+{ -+#ifdef HAS_POWER_PROFILE_MONITOR -+ PowerProfileMonitor *ppm = (PowerProfileMonitor *) object; -+ -+ g_clear_object (&ppm->monitor); -+#endif /* HAS_POWER_PROFILE_MONITOR */ -+ -+ G_OBJECT_CLASS (power_profile_monitor_parent_class)->finalize (object); -+} -+ -+static void -+power_profile_monitor_class_init (PowerProfileMonitorClass *klass) -+{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ -+ object_class->finalize = power_profile_monitor_finalize; -+} -+ -+GDBusInterfaceSkeleton * -+power_profile_monitor_create (GDBusConnection *connection) -+{ -+ power_profile_monitor = g_object_new (power_profile_monitor_get_type (), NULL); -+ -+ return G_DBUS_INTERFACE_SKELETON (power_profile_monitor); -+} -diff --git a/src/power-profile-monitor.h b/src/power-profile-monitor.h -new file mode 100644 -index 0000000..b23ea8b ---- /dev/null -+++ b/src/power-profile-monitor.h -@@ -0,0 +1,25 @@ -+/* -+ * Copyright © 2021 Red Hat, Inc -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see . -+ * -+ * Authors: -+ * Bastien Nocera -+ */ -+ -+#pragma once -+ -+#include -+ -+GDBusInterfaceSkeleton * power_profile_monitor_create (GDBusConnection *connection); -diff --git a/src/xdg-desktop-portal.c b/src/xdg-desktop-portal.c -index 88a6c5e..e5f3002 100644 ---- a/src/xdg-desktop-portal.c -+++ b/src/xdg-desktop-portal.c -@@ -40,6 +40,7 @@ - #include "print.h" - #include "memory-monitor.h" - #include "network-monitor.h" -+#include "power-profile-monitor.h" - #include "proxy-resolver.h" - #include "screenshot.h" - #include "notification.h" -@@ -227,6 +228,7 @@ on_bus_acquired (GDBusConnection *connection, - lockdown = xdp_impl_lockdown_skeleton_new (); - - export_portal_implementation (connection, memory_monitor_create (connection)); -+ export_portal_implementation (connection, power_profile_monitor_create (connection)); - export_portal_implementation (connection, network_monitor_create (connection)); - export_portal_implementation (connection, proxy_resolver_create (connection)); - export_portal_implementation (connection, trash_create (connection)); --- -2.31.1 - - -From ba7413f52dfd2c933a261509e511ce724dd5042a Mon Sep 17 00:00:00 2001 +From 5b065233a76c642d0316d8f3143b0e63ca3b2d40 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 24 Aug 2021 16:38:18 +0200 -Subject: [PATCH 3/3] Force power-profiles-daemon support in +Subject: [PATCH] Force power-profiles-daemon support in --- src/power-profile-monitor.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/power-profile-monitor.c b/src/power-profile-monitor.c -index 9ffa87a..d033fed 100644 +index 9ffa87a51296..d033feded5e0 100644 --- a/src/power-profile-monitor.c +++ b/src/power-profile-monitor.c @@ -28,9 +28,7 @@ @@ -310,5 +22,5 @@ index 9ffa87a..d033fed 100644 typedef struct _PowerProfileMonitor PowerProfileMonitor; typedef struct _PowerProfileMonitorClass PowerProfileMonitorClass; -- -2.31.1 +2.34.1 diff --git a/SPECS/xdg-desktop-portal.spec b/SPECS/xdg-desktop-portal.spec index 811720d..85acc44 100644 --- a/SPECS/xdg-desktop-portal.spec +++ b/SPECS/xdg-desktop-portal.spec @@ -4,16 +4,17 @@ %global low_memory_monitor_version 2.0 Name: xdg-desktop-portal -Version: 1.8.1 -Release: 6%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Portal frontend service to flatpak License: LGPLv2+ URL: https://github.com/flatpak/xdg-desktop-portal/ Source0: https://github.com/flatpak/xdg-desktop-portal/releases/download/%{version}/%{name}-%{version}.tar.xz -BuildRequires: make BuildRequires: gcc +BuildRequires: make +BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(flatpak) BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib_version} @@ -21,13 +22,6 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version} BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version} BuildRequires: /usr/bin/xmlto -%{?systemd_requires} -BuildRequires: systemd -BuildRequires: git -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: libtool -BuildRequires: gettext-devel Requires: dbus # Required version for icon validator. @@ -59,8 +53,7 @@ The pkg-config file for %{name}. %prep -%autosetup -S git -p1 -autoreconf -f -i +%autosetup -p1 %build @@ -111,6 +104,10 @@ install -dm 755 %{buildroot}/%{_datadir}/%{name}/portals %changelog +* Tue Feb 08 2022 Debarshi Ray - 1.12.1-1 +- Rebase to 1.12.1 +Resolves: #2051488 + * Tue Aug 24 2021 Bastien Nocera - 1.8.1-6 + xdg-desktop-portal-1.8.1-6 - Add PowerProfileMonitor portal