git: b64b73fd938d - main - x11/gnome-flashback: Update to 3.58.0

From: Don Lewis <truckman_at_FreeBSD.org>
Date: Tue, 30 Sep 2025 00:14:40 UTC
The branch main has been updated by truckman:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b64b73fd938d5b2788547d16ed6a76493acc9142

commit b64b73fd938d5b2788547d16ed6a76493acc9142
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2025-09-29 09:37:03 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2025-09-30 00:13:34 +0000

    x11/gnome-flashback: Update to 3.58.0
    
    Update to 3.58.0
    
    Adjust dependencies in RUN_DEPENDS:
      x11-fm/sushi is not necessary with Nautilus >= 47.0
      replace x11/gnome-terminal by x11/gnome-console
    
    Re-add XDG autostart files and adjust patches, because now GNOME Flashback depends heavily on systemd
    
    PR:             289887
---
 x11/gnome-flashback/Makefile                       | 25 ++++----
 x11/gnome-flashback/distinfo                       |  6 +-
 .../files/gnome-flashback-clipboard.desktop.in.in  | 10 ++++
 .../gnome-flashback-idle-monitor.desktop.in.in     | 10 ++++
 .../files/gnome-flashback-media-keys.desktop.in.in |  9 +++
 .../files/gnome-flashback-polkit.desktop.in.in     | 10 ++++
 x11/gnome-flashback/files/patch-configure          | 68 +++++++---------------
 .../files/patch-data_autostart_Makefile.in         | 45 ++++++++------
 ...a_schemas_org.gnome.gnome-flashback.gschema.xml | 53 +++++++++++++++++
 .../files/patch-data_sessions_Makefile.am          | 54 +++++++++++++++++
 .../files/patch-data_sessions_Makefile.in          | 57 ++++++++++++++++++
 .../patch-data_sessions_gnome-flashback.session.in |  6 ++
 12 files changed, 275 insertions(+), 78 deletions(-)

diff --git a/x11/gnome-flashback/Makefile b/x11/gnome-flashback/Makefile
index d33dcd5dd7c3..529e6fe64d9a 100644
--- a/x11/gnome-flashback/Makefile
+++ b/x11/gnome-flashback/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gnome-flashback
-PORTVERSION=	3.56.0
-PORTREVISION=	1
+PORTVERSION=	3.58.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -27,15 +26,13 @@ LIB_DEPENDS=	libgnome-panel.so:x11/gnome-panel \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	xkeyboard-config>0:x11/xkeyboard-config \
 		gnome-session>0:x11/gnome-session \
-		metacity>0:x11-wm/metacity \
+		metacity:x11-wm/metacity \
 		gnome-applets>0:x11/gnome-applets \
-		tecla>0:x11/tecla \
-		alacarte>0:x11/alacarte \
-		gedit>0:editors/gedit \
-		sushi>0:x11-fm/sushi \
-		nautilus>0:x11-fm/nautilus \
-		gnome-terminal>0:x11/gnome-terminal \
-		xdg-user-dirs-gtk>0:x11/xdg-user-dirs-gtk \
+		tecla:x11/tecla \
+		alacarte:x11/alacarte \
+		nautilus:x11-fm/nautilus \
+		gnome-terminal:x11/gnome-terminal \
+		xdg-user-dirs-gtk-update:x11/xdg-user-dirs-gtk \
 		cantarell-fonts>0:x11-fonts/cantarell-fonts \
 		source-code-pro-ttf>0:x11-fonts/source-code-pro-ttf
 
@@ -65,10 +62,14 @@ GLIB_SCHEMAS=	00_gnome-flashback.gschema.override \
 		org.gnome.gnome-flashback.system-indicators.input-sources.gschema.xml
 
 post-extract:
-	${CP} ${FILESDIR}/gf-consolekit-* \
+# Add support for ConsoleKit
+	@${CP} ${FILESDIR}/gf-consolekit-* \
 		${WRKSRC}/dbus/
-	${CP} ${FILESDIR}/org.freedesktop.ConsoleKit* \
+	@${CP} ${FILESDIR}/org.freedesktop.ConsoleKit* \
 		${WRKSRC}/dbus/
+# Re-add XDG autostart .desktop files removed for systemd service
+	@${CP} ${FILESDIR}/*.desktop.in.in \
+		${WRKSRC}/data/autostart/
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${LOCALBASE}|" \
diff --git a/x11/gnome-flashback/distinfo b/x11/gnome-flashback/distinfo
index b1455e262c45..16b06a1e2024 100644
--- a/x11/gnome-flashback/distinfo
+++ b/x11/gnome-flashback/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745754419
-SHA256 (gnome/gnome-flashback-3.56.0.tar.xz) = 2d0fa22f373db080eaef0e5693b9628cde844f25633d5a90313b049dd9529260
-SIZE (gnome/gnome-flashback-3.56.0.tar.xz) = 912964
+TIMESTAMP = 1759067196
+SHA256 (gnome/gnome-flashback-3.58.0.tar.xz) = aaa23e7042477e741f24279b468b9d20af4ec195ee43b3d312cdaaf84d98c321
+SIZE (gnome/gnome-flashback-3.58.0.tar.xz) = 911468
diff --git a/x11/gnome-flashback/files/gnome-flashback-clipboard.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-clipboard.desktop.in.in
new file mode 100644
index 000000000000..90a8b63b48ee
--- /dev/null
+++ b/x11/gnome-flashback/files/gnome-flashback-clipboard.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Clipboard (GNOME Flashback)
+Exec=@libexecdir@/gnome-flashback-clipboard
+AutostartCondition=GSettings org.gnome.gnome-flashback clipboard
+OnlyShowIn=GNOME-Flashback;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/x11/gnome-flashback/files/gnome-flashback-idle-monitor.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-idle-monitor.desktop.in.in
new file mode 100644
index 000000000000..5ef9f67458f3
--- /dev/null
+++ b/x11/gnome-flashback/files/gnome-flashback-idle-monitor.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Idle Monitor (GNOME Flashback)
+Exec=@libexecdir@/gnome-flashback-idle-monitor
+AutostartCondition=GSettings org.gnome.gnome-flashback idle-monitor
+OnlyShowIn=GNOME-Flashback;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/x11/gnome-flashback/files/gnome-flashback-media-keys.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-media-keys.desktop.in.in
new file mode 100644
index 000000000000..495de16ecea7
--- /dev/null
+++ b/x11/gnome-flashback/files/gnome-flashback-media-keys.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=MediaKeys (GNOME Flashback)
+Exec=@libexecdir@/gnome-flashback-media-keys
+OnlyShowIn=GNOME-Flashback;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/x11/gnome-flashback/files/gnome-flashback-polkit.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-polkit.desktop.in.in
new file mode 100644
index 000000000000..f3592d358f19
--- /dev/null
+++ b/x11/gnome-flashback/files/gnome-flashback-polkit.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Polkit (GNOME Flashback)
+Exec=@libexecdir@/gnome-flashback-polkit
+AutostartCondition=GSettings org.gnome.gnome-flashback polkit
+OnlyShowIn=GNOME-Flashback;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/x11/gnome-flashback/files/patch-configure b/x11/gnome-flashback/files/patch-configure
index b85f90c525e5..c6183cc45ba7 100644
--- a/x11/gnome-flashback/files/patch-configure
+++ b/x11/gnome-flashback/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2023-08-12 06:58:51 UTC
+--- configure.orig	2025-09-28 09:53:08 UTC
 +++ configure
-@@ -19785,7 +19785,7 @@ pkg_failed=no
+@@ -21416,7 +21416,7 @@ pkg_failed=no
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -9,7 +9,7 @@
    x11
  " >&5
  printf %s "checking for
-@@ -19794,7 +19794,7 @@ printf %s "checking for
+@@ -21425,7 +21425,7 @@ printf %s "checking for
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -18,7 +18,7 @@
    x11
  ... " >&6; }
  
-@@ -19808,7 +19808,7 @@ if test -n "$DESKTOP_CFLAGS"; then
+@@ -21439,7 +21439,7 @@ if test -n "$DESKTOP_CFLAGS"; then
    gio-unix-2.0 >= \$GLIB_REQUIRED
    gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= \$GTK_REQUIRED
@@ -27,7 +27,7 @@
    x11
  \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
-@@ -19817,7 +19817,7 @@ if test -n "$DESKTOP_CFLAGS"; then
+@@ -21448,7 +21448,7 @@ if test -n "$DESKTOP_CFLAGS"; then
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -36,7 +36,7 @@
    x11
  ") 2>&5
    ac_status=$?
-@@ -19829,7 +19829,7 @@ if test -n "$DESKTOP_CFLAGS"; then
+@@ -21460,7 +21460,7 @@ if test -n "$DESKTOP_CFLAGS"; then
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -45,7 +45,7 @@
    x11
  " 2>/dev/null`
  		      test "x$?" != "x0" && pkg_failed=yes
-@@ -19849,7 +19849,7 @@ if test -n "$DESKTOP_LIBS"; then
+@@ -21480,7 +21480,7 @@ if test -n "$DESKTOP_LIBS"; then
    gio-unix-2.0 >= \$GLIB_REQUIRED
    gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= \$GTK_REQUIRED
@@ -54,7 +54,7 @@
    x11
  \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
-@@ -19858,7 +19858,7 @@ if test -n "$DESKTOP_LIBS"; then
+@@ -21489,7 +21489,7 @@ if test -n "$DESKTOP_LIBS"; then
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -63,7 +63,7 @@
    x11
  ") 2>&5
    ac_status=$?
-@@ -19870,7 +19870,7 @@ if test -n "$DESKTOP_LIBS"; then
+@@ -21501,7 +21501,7 @@ if test -n "$DESKTOP_LIBS"; then
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -72,7 +72,7 @@
    x11
  " 2>/dev/null`
  		      test "x$?" != "x0" && pkg_failed=yes
-@@ -19899,7 +19899,7 @@ fi
+@@ -21530,7 +21530,7 @@ fi
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -81,7 +81,7 @@
    x11
  " 2>&1`
          else
-@@ -19909,7 +19909,7 @@ fi
+@@ -21540,7 +21540,7 @@ fi
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -90,7 +90,7 @@
    x11
  " 2>&1`
          fi
-@@ -19922,7 +19922,7 @@ fi
+@@ -21553,7 +21553,7 @@ fi
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -99,7 +99,7 @@
    x11
  ) were not met:
  
-@@ -21277,7 +21277,7 @@ pkg_failed=no
+@@ -22908,7 +22908,7 @@ pkg_failed=no
    glib-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -108,7 +108,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  " >&5
  printf %s "checking for
-@@ -21286,7 +21286,7 @@ printf %s "checking for
+@@ -22917,7 +22917,7 @@ printf %s "checking for
    glib-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -117,7 +117,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  ... " >&6; }
  
-@@ -21296,20 +21296,22 @@ if test -n "$SCREENSAVER_CFLAGS"; then
+@@ -22927,11 +22927,12 @@ if test -n "$SCREENSAVER_CFLAGS"; then
      if test -n "$PKG_CONFIG" && \
      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    gdm
@@ -131,9 +131,7 @@
    xxf86vm >= \$XXF86VM_REQUIRED
  \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
-   gdm
-+  gio-2.0 >= $GLIB_REQUIRED
-   gio-unix-2.0 >= $GLIB_REQUIRED
+@@ -22940,7 +22941,7 @@ if test -n "$SCREENSAVER_CFLAGS"; then
    glib-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -142,7 +140,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  ") 2>&5
    ac_status=$?
-@@ -21317,11 +21319,12 @@ if test -n "$SCREENSAVER_CFLAGS"; then
+@@ -22948,11 +22949,12 @@ if test -n "$SCREENSAVER_CFLAGS"; then
    test $ac_status = 0; }; then
    pkg_cv_SCREENSAVER_CFLAGS=`$PKG_CONFIG --cflags "
    gdm
@@ -156,7 +154,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  " 2>/dev/null`
  		      test "x$?" != "x0" && pkg_failed=yes
-@@ -21337,20 +21340,22 @@ if test -n "$SCREENSAVER_LIBS"; then
+@@ -22968,11 +22970,12 @@ if test -n "$SCREENSAVER_LIBS"; then
      if test -n "$PKG_CONFIG" && \
      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    gdm
@@ -170,9 +168,7 @@
    xxf86vm >= \$XXF86VM_REQUIRED
  \""; } >&5
    ($PKG_CONFIG --exists --print-errors "
-   gdm
-+  gio-2.0 >= $GLIB_REQUIRED
-   gio-unix-2.0 >= $GLIB_REQUIRED
+@@ -22981,7 +22984,7 @@ if test -n "$SCREENSAVER_LIBS"; then
    glib-2.0 >= $GLIB_REQUIRED
    gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
    gtk+-3.0 >= $GTK_REQUIRED
@@ -181,7 +177,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  ") 2>&5
    ac_status=$?
-@@ -21358,11 +21363,12 @@ if test -n "$SCREENSAVER_LIBS"; then
+@@ -22989,11 +22992,12 @@ if test -n "$SCREENSAVER_LIBS"; then
    test $ac_status = 0; }; then
    pkg_cv_SCREENSAVER_LIBS=`$PKG_CONFIG --libs "
    gdm
@@ -195,7 +191,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  " 2>/dev/null`
  		      test "x$?" != "x0" && pkg_failed=yes
-@@ -21387,21 +21393,23 @@ fi
+@@ -23018,21 +23022,23 @@ fi
          if test $_pkg_short_errors_supported = yes; then
                  SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
    gdm
@@ -221,7 +217,7 @@
    xxf86vm >= $XXF86VM_REQUIRED
  " 2>&1`
          fi
-@@ -21410,11 +21418,12 @@ fi
+@@ -23041,11 +23047,12 @@ fi
  
          as_fn_error $? "Package requirements (
    gdm
@@ -235,23 +231,3 @@
    xxf86vm >= $XXF86VM_REQUIRED
  ) were not met:
  
-@@ -22631,19 +22640,15 @@ fi
- REQUIRED_COMPNENTS_GSD=" \
-   org.gnome.SettingsDaemon.A11ySettings \
-   org.gnome.SettingsDaemon.Color \
--  org.gnome.SettingsDaemon.Datetime \
-   org.gnome.SettingsDaemon.Housekeeping \
-   org.gnome.SettingsDaemon.Keyboard \
-   org.gnome.SettingsDaemon.MediaKeys \
-   org.gnome.SettingsDaemon.Power \
-   org.gnome.SettingsDaemon.PrintNotifications \
--  org.gnome.SettingsDaemon.Rfkill \
-   org.gnome.SettingsDaemon.ScreensaverProxy \
-   org.gnome.SettingsDaemon.Sharing \
-   org.gnome.SettingsDaemon.Smartcard \
-   org.gnome.SettingsDaemon.Sound \
--  org.gnome.SettingsDaemon.UsbProtection \
--  org.gnome.SettingsDaemon.Wacom \
-   org.gnome.SettingsDaemon.XSettings \
- "
- 
diff --git a/x11/gnome-flashback/files/patch-data_autostart_Makefile.in b/x11/gnome-flashback/files/patch-data_autostart_Makefile.in
index 38dc99041736..5e643e7180d1 100644
--- a/x11/gnome-flashback/files/patch-data_autostart_Makefile.in
+++ b/x11/gnome-flashback/files/patch-data_autostart_Makefile.in
@@ -1,26 +1,37 @@
---- data/autostart/Makefile.in.orig	2023-08-12 06:58:52 UTC
+--- data/autostart/Makefile.in.orig	2025-09-28 09:53:09 UTC
 +++ data/autostart/Makefile.in
-@@ -386,7 +386,6 @@ autostart_DATA = \
- 	gnome-flashback-clipboard.desktop \
- 	gnome-flashback-idle-monitor.desktop \
- 	gnome-flashback-media-keys.desktop \
+@@ -388,18 +388,31 @@ autostart_DATA = \
+ autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_DATA = \
+ 	gnome-flashback-geoclue-demo-agent.desktop \
 -	gnome-flashback-nm-applet.desktop \
- 	gnome-flashback-polkit.desktop \
++	gnome-flashback-clipboard.desktop \
++	gnome-flashback-idle-monitor.desktop \
++	gnome-flashback-media-keys.desktop \
++	gnome-flashback-polkit.desktop \
  	$(NULL)
  
-@@ -394,7 +393,6 @@ EXTRA_DIST = \
- 	gnome-flashback-clipboard.desktop.in.in \
- 	gnome-flashback-idle-monitor.desktop.in.in \
- 	gnome-flashback-media-keys.desktop.in.in \
+ EXTRA_DIST = \
+ 	gnome-flashback-geoclue-demo-agent.desktop.in.in \
 -	gnome-flashback-nm-applet.desktop.in \
- 	gnome-flashback-polkit.desktop.in.in \
++	gnome-flashback-clipboard.desktop.in.in \
++	gnome-flashback-idle-monitor.desktop.in.in \
++	gnome-flashback-media.desktop.in.in \
++	gnome-flashback-polkit.desktop.in.in \
  	$(NULL)
  
-@@ -405,7 +403,6 @@ CLEANFILES = \
- 	gnome-flashback-idle-monitor.desktop \
- 	gnome-flashback-media-keys.desktop.in \
- 	gnome-flashback-media-keys.desktop \
+ CLEANFILES = \
+ 	gnome-flashback-geoclue-demo-agent.desktop.in \
+ 	gnome-flashback-geoclue-demo-agent.desktop \
 -	gnome-flashback-nm-applet.desktop \
- 	gnome-flashback-polkit.desktop.in \
- 	gnome-flashback-polkit.desktop \
++	gnome-flashback-clipboard.desktop.in \
++	gnome-flashback-clipboard.desktop \
++	gnome-flashback-idle-monitor.desktop.in \
++	gnome-flashback-idle-monitor.desktop \
++	gnome-flashback-media-keys.desktop.in \
++	gnome-flashback-media-keys.desktop \
++	gnome-flashback-polkit.desktop.in \
++	gnome-flashback-polkit.desktop \
  	$(NULL)
+ 
+ all: all-am
diff --git a/x11/gnome-flashback/files/patch-data_schemas_org.gnome.gnome-flashback.gschema.xml b/x11/gnome-flashback/files/patch-data_schemas_org.gnome.gnome-flashback.gschema.xml
new file mode 100644
index 000000000000..52afd4c4f1c3
--- /dev/null
+++ b/x11/gnome-flashback/files/patch-data_schemas_org.gnome.gnome-flashback.gschema.xml
@@ -0,0 +1,53 @@
+Revert: https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/5f4aa0d8
+
+From 5f4aa0d89e1f2022ebc9c59d9a2171b00643f847 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
+Date: Sun, 28 Sep 2025 11:45:53 +0300
+Subject: [PATCH] schemas: remove no longer needed settings
+
+These was used to start/stop services by GNOME Session. Related
+services now are started by systemd and these settings are no
+longer used.
+
+https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/103
+
+--- data/schemas/org.gnome.gnome-flashback.gschema.xml.orig	2025-09-28 09:52:06 UTC
++++ data/schemas/org.gnome.gnome-flashback.gschema.xml
+@@ -17,6 +17,11 @@
+       <description>If set to true, then GNOME Flashback application will be used to automount removable media.</description>
+     </key>
+ 
++    <key name="clipboard" type="b">
++      <default>true</default>
++      <summary>Clipboard</summary>
++    </key>
++
+     <key name="desktop" type="b">
+       <default>true</default>
+       <summary>Desktop</summary>
+@@ -28,6 +33,12 @@
+       <description>If set to true, then GNOME Flashback application will be used to show the end session dialog.</description>
+     </key>
+ 
++    <key name="idle-monitor" type="b">
++      <default>true</default>
++      <summary>Idle monitor</summary>
++      <description>If set to true, then GNOME Flashback application will be used for user activity monitoring.</description>
++    </key>
++
+     <key name="input-settings" type="b">
+       <default>true</default>
+       <summary>Input settings</summary>
+@@ -43,6 +54,12 @@
+       <default>true</default>
+       <summary>Notification daemon</summary>
+       <description>If set to true, then GNOME Flashback application will be used to manage notifications.</description>
++    </key>
++
++    <key name="polkit" type="b">
++      <default>true</default>
++      <summary>Authentication agent for polkit</summary>
++      <description>This is the same authentication agent that was provided by PolicyKit-gnome.</description>
+     </key>
+ 
+     <key name="root-background" type="b">
diff --git a/x11/gnome-flashback/files/patch-data_sessions_Makefile.am b/x11/gnome-flashback/files/patch-data_sessions_Makefile.am
new file mode 100644
index 000000000000..f27d522d357c
--- /dev/null
+++ b/x11/gnome-flashback/files/patch-data_sessions_Makefile.am
@@ -0,0 +1,54 @@
+--- data/sessions/Makefile.am.orig	2025-09-28 09:52:06 UTC
++++ data/sessions/Makefile.am
+@@ -1,8 +1,43 @@ NULL =
+ NULL =
+ 
++required_components_gsd = \
++	org.gnome.SettingsDaemon.A11ySettings \
++	org.gnome.SettingsDaemon.Color \
++	org.gnome.SettingsDaemon.Keyboard \
++	org.gnome.SettingsDaemon.MediaKeys \
++	org.gnome.SettingsDaemon.Power \
++	org.gnome.SettingsDaemon.PrintNotifications \
++	org.gnome.SettingsDaemon.ScreensaverProxy \
++	org.gnome.SettingsDaemon.Sharing \
++	org.gnome.SettingsDaemon.Smartcard \
++	org.gnome.SettingsDaemon.Sound \
++	org.gnome.SettingsDaemon.XSettings \
++	$(NULL)
++
++required_components_common = \
++	gnome-flashback \
++	gnome-panel \
++	$(NULL)
++
++required_components_compiz = \
++	compiz \
++	$(required_components_common) \
++	$(required_components_gsd) \
++	$(NULL)
++
++required_components_metacity = \
++	metacity \
++	$(required_components_common) \
++	$(required_components_gsd) \
++	$(NULL)
++
++space = $(NULL) $(NULL)
++compiz = $(subst $(space),;,$(strip $(required_components_compiz)))
++metacity = $(subst $(space),;,$(strip $(required_components_metacity)))
+ gnome-flashback-metacity.session: Makefile.am gnome-flashback.session.in
+ 	$(AM_V_GEN) sed \
+ 		-e 's,[@]NAME[@],Metacity,g' \
++		-e 's,[@]REQUIRED_COMPONENTS[@],$(metacity),g' \
+ 		< $(srcdir)/gnome-flashback.session.in > $@
+ 
+ sessions = \
+@@ -13,6 +48,7 @@ gnome-flashback-compiz.session: Makefile.am gnome-flas
+ gnome-flashback-compiz.session: Makefile.am gnome-flashback.session.in
+ 	$(AM_V_GEN) sed \
+ 		-e 's,[@]NAME[@],Compiz,g' \
++		-e 's,[@]REQUIRED_COMPONENTS[@],$(compiz),g' \
+ 		< $(srcdir)/gnome-flashback.session.in > $@
+ 
+ sessions += \
diff --git a/x11/gnome-flashback/files/patch-data_sessions_Makefile.in b/x11/gnome-flashback/files/patch-data_sessions_Makefile.in
new file mode 100644
index 000000000000..7bf1e6d68ad2
--- /dev/null
+++ b/x11/gnome-flashback/files/patch-data_sessions_Makefile.in
@@ -0,0 +1,57 @@
+--- data/sessions/Makefile.in.orig	2025-09-28 09:53:09 UTC
++++ data/sessions/Makefile.in
+@@ -389,6 +389,40 @@ NULL = 
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL = 
++required_components_gsd = \
++	org.gnome.SettingsDaemon.A11ySettings \
++	org.gnome.SettingsDaemon.Color \
++	org.gnome.SettingsDaemon.Keyboard \
++	org.gnome.SettingsDaemon.MediaKeys \
++	org.gnome.SettingsDaemon.Power \
++	org.gnome.SettingsDaemon.PrintNotifications \
++	org.gnome.SettingsDaemon.ScreensaverProxy \
++	org.gnome.SettingsDaemon.Sharing \
++	org.gnome.SettingsDaemon.Smartcard \
++	org.gnome.SettingsDaemon.Sound \
++	org.gnome.SettingsDaemon.XSettings \
++	$(NULL)
++
++required_components_common = \
++	gnome-flashback \
++	gnome-panel \
++	$(NULL)
++
++required_components_compiz = \
++	compiz \
++	$(required_components_common) \
++	$(required_components_gsd) \
++	$(NULL)
++
++required_components_metacity = \
++	metacity \
++	$(required_components_common) \
++	$(required_components_gsd) \
++	$(NULL)
++
++space = $(NULL) $(NULL)
++compiz = $(subst $(space),;,$(strip $(required_components_compiz)))
++metacity = $(subst $(space),;,$(strip $(required_components_metacity)))
+ sessions = gnome-flashback-metacity.session $(NULL) $(am__append_1)
+ sessiondir = $(datadir)/gnome-session/sessions
+ session_DATA = $(sessions)
+@@ -622,11 +656,13 @@ gnome-flashback-metacity.session: Makefile.am gnome-fl
+ gnome-flashback-metacity.session: Makefile.am gnome-flashback.session.in
+ 	$(AM_V_GEN) sed \
+ 		-e 's,[@]NAME[@],Metacity,g' \
++		-e 's,[@]REQUIRED_COMPONENTS[@],$(metacity),g' \
+ 		< $(srcdir)/gnome-flashback.session.in > $@
+ 
+ @WITH_COMPIZ_SESSION_TRUE@gnome-flashback-compiz.session: Makefile.am gnome-flashback.session.in
+ @WITH_COMPIZ_SESSION_TRUE@	$(AM_V_GEN) sed \
+ @WITH_COMPIZ_SESSION_TRUE@		-e 's,[@]NAME[@],Compiz,g' \
++@WITH_COMPIZ_SESSION_TRUE@		-e 's,[@]REQUIRED_COMPONENTS[@],$(compiz),g' \
+ @WITH_COMPIZ_SESSION_TRUE@		< $(srcdir)/gnome-flashback.session.in > $@
+ 
+ -include $(top_srcdir)/git.mk
diff --git a/x11/gnome-flashback/files/patch-data_sessions_gnome-flashback.session.in b/x11/gnome-flashback/files/patch-data_sessions_gnome-flashback.session.in
new file mode 100644
index 000000000000..2652defb3dd8
--- /dev/null
+++ b/x11/gnome-flashback/files/patch-data_sessions_gnome-flashback.session.in
@@ -0,0 +1,6 @@
+--- data/sessions/gnome-flashback.session.in.orig	2025-09-28 09:52:06 UTC
++++ data/sessions/gnome-flashback.session.in
+@@ -1,2 +1,3 @@ Name=GNOME Flashback (@NAME@)
+ [GNOME Session]
+ Name=GNOME Flashback (@NAME@)
++RequiredComponents=@REQUIRED_COMPONENTS@;