Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package budgie-screensaver for openSUSE:Factory checked in at 2022-01-08 23:23:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-screensaver (Old) and /work/SRC/openSUSE:Factory/.budgie-screensaver.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-screensaver" Sat Jan 8 23:23:37 2022 rev:9 rq:944789 version:4.0+2 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-screensaver/budgie-screensaver.changes 2021-05-15 23:17:14.740488162 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-screensaver.new.1892/budgie-screensaver.changes 2022-01-08 23:24:13.674261456 +0100 @@ -1,0 +2,10 @@ +Fri Jan 07 11:24:13 UTC 2022 - [email protected] + +- Update to version 4.0+2: + * Sort out renames + * Have a couple deferred re-attempts to kill gjs. + * Remove dbus service file as it results in a race condition with + gnome-settings-daemon that can cause double prompts. + * Fix Makefile for distcheck + dist + +------------------------------------------------------------------- Old: ---- budgie-screensaver-4.0+0.obscpio New: ---- budgie-screensaver-4.0+2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.UKSKrj/_old 2022-01-08 23:24:14.566262184 +0100 +++ /var/tmp/diff_new_pack.UKSKrj/_new 2022-01-08 23:24:14.570262187 +0100 @@ -1,7 +1,7 @@ # # spec file for package budgie-screensaver # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2021 Callum Farmer <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -23,12 +23,12 @@ %define chkpwd /sbin/unix2_chkpwd %endif Name: budgie-screensaver -Version: 4.0+0 +Version: 4.0+2 Release: 0 Summary: Fork of GNOME Screensaver for Budgie 10 License: GPL-2.0-or-later Group: System/GUI/Other -URL: https://github.com/getsolus/budgie-screensaver +URL: https://github.com/BuddiesOfBudgie/budgie-screensaver Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE remove-old-automake-macros.patch Patch0: remove-old-automake-macros.patch @@ -58,6 +58,7 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xxf86vm) Requires: pam +Requires: procps %if 0%{?suse_version} < 1550 BuildRequires: pkgconfig(xxf86misc) %endif @@ -71,14 +72,10 @@ %autosetup -p1 %build -export AUTOPOINT='intltoolize --copy --automake' -touch ./ABOUT-NLS mkdir m4 -mkdir build-aux -touch build-aux/config.rpath +intltoolize -c -f --automake autoreconf -fiv %configure\ - --libexecdir=%{_libexecdir}/budgie-screensaver\ --with-pam-prefix=%{_sysconfdir}\ --enable-authentication-scheme=helper\ --with-passwd-helper="%{chkpwd}"\ @@ -97,7 +94,7 @@ %license COPYING %config(noreplace) %{_sysconfdir}/pam.d/budgie-screensaver %{_bindir}/* -%{_libexecdir}/budgie-screensaver +%{_libexecdir}/* %{_datadir}/applications/budgie-screensaver.desktop %{_distconfdir}/xdg/autostart/budgie-desktop-screensaver.desktop %{_mandir}/man1/* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.UKSKrj/_old 2022-01-08 23:24:14.606262217 +0100 +++ /var/tmp/diff_new_pack.UKSKrj/_new 2022-01-08 23:24:14.610262220 +0100 @@ -1,8 +1,8 @@ <services> <service name="obs_scm" mode="manual"> <param name="scm">git</param> - <param name="url">https://github.com/getsolus/budgie-screensaver.git</param> - <param name="revision">52e04ed4a8d6589bedc5f3b6cf86157bb3084d5e</param> + <param name="url">https://github.com/BuddiesOfBudgie/budgie-screensaver.git</param> + <param name="revision">19b0852297f3b8a45e1e6773212adb1de0dd3216</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.UKSKrj/_old 2022-01-08 23:24:14.630262237 +0100 +++ /var/tmp/diff_new_pack.UKSKrj/_new 2022-01-08 23:24:14.634262240 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">https://github.com/getsolus/budgie-screensaver.git</param> - <param name="changesrevision">52e04ed4a8d6589bedc5f3b6cf86157bb3084d5e</param></service></servicedata> + <param name="url">https://github.com/BuddiesOfBudgie/budgie-screensaver.git</param> + <param name="changesrevision">19b0852297f3b8a45e1e6773212adb1de0dd3216</param></service></servicedata> (No newline at EOF) ++++++ budgie-screensaver-4.0+0.obscpio -> budgie-screensaver-4.0+2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-screensaver-4.0+0/README new/budgie-screensaver-4.0+2/README --- old/budgie-screensaver-4.0+0/README 2021-04-27 16:47:37.000000000 +0200 +++ new/budgie-screensaver-4.0+2/README 2022-01-02 17:57:54.000000000 +0100 @@ -1 +1 @@ -Look at https://github.com/getsolus/budgie-screensaver \ No newline at end of file +Look at https://github.com/BuddiesOfBudgie/budgie-screensaver \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-screensaver-4.0+0/configure.ac new/budgie-screensaver-4.0+2/configure.ac --- old/budgie-screensaver-4.0+0/configure.ac 2021-04-27 16:47:37.000000000 +0200 +++ new/budgie-screensaver-4.0+2/configure.ac 2022-01-02 17:57:54.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([budgie-screensaver], [4.0], - [https://github.com/getsolus/budgie-screensaver]) + [https://github.com/BuddiesOfBudgie/budgie-screensaver]) AC_CONFIG_SRCDIR(src/gnome-screensaver.c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-screensaver-4.0+0/src/gnome-screensaver.c new/budgie-screensaver-4.0+2/src/gnome-screensaver.c --- old/budgie-screensaver-4.0+0/src/gnome-screensaver.c 2021-04-27 16:47:37.000000000 +0200 +++ new/budgie-screensaver-4.0+2/src/gnome-screensaver.c 2022-01-02 17:57:54.000000000 +0100 @@ -37,6 +37,26 @@ #include "gs-monitor.h" #include "gs-debug.h" +gboolean attempt_gjs_screensaver_kill (gpointer data) { + (void) data; // Don't need the data + + char *argv[5]; + argv[0] = "pkill"; + argv[1] = "-9"; + argv[2] = "-f"; + argv[3] = "'/usr/bin/gjs /usr/share/gnome-shell/org.gnome.ScreenSaver'"; + argv[4] = NULL; + + g_autoptr(GError) error = NULL; + gboolean kill_ret = g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, NULL, &error); + + if (!kill_ret) { + g_warning("Failed to kill gjs: %s", error->message); + } + + return G_SOURCE_REMOVE; +} + void gnome_screensaver_quit (void) { @@ -100,9 +120,19 @@ monitor = gs_monitor_new (); if (monitor == NULL) { - exit (1); + exit (1); } + // While the logic might seem weird, this saves us from having to implement a reading of /proc looking for gjs running the org.gnome.ScreenSaver "service", killing it, then doing a defer and kill again in case it starts up again + // It also saves us from having to add any exponential backoff or logic for stopping the timer after N attempts. + // Mostly just a stopgap to deal with situations where gnome-session is changed to either autostart or not autostart dbus interfaces and weirdness where people use GDM with Budgie. + if (g_find_program_in_path("pkill") != NULL) { // Have pkill + attempt_gjs_screensaver_kill(NULL); // Attempt kill immediately + g_timeout_add_seconds_full(G_PRIORITY_LOW, 5, attempt_gjs_screensaver_kill, NULL, NULL); // Basically have a defer after 5s to attempt another kill of GJS + g_timeout_add_seconds_full(G_PRIORITY_LOW, 10, attempt_gjs_screensaver_kill, NULL, NULL); // Basically have a defer after 10s to attempt another kill of GJS + g_timeout_add_seconds_full(G_PRIORITY_LOW, 30, attempt_gjs_screensaver_kill, NULL, NULL); // In the event gjs is still going after 30s, kill again + } + error = NULL; if (! gs_monitor_start (monitor, &error)) { if (error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-screensaver-4.0+0/src/gnome-screensaver.h new/budgie-screensaver-4.0+2/src/gnome-screensaver.h --- old/budgie-screensaver-4.0+0/src/gnome-screensaver.h 2021-04-27 16:47:37.000000000 +0200 +++ new/budgie-screensaver-4.0+2/src/gnome-screensaver.h 2022-01-02 17:57:54.000000000 +0100 @@ -25,6 +25,7 @@ G_BEGIN_DECLS +gboolean attempt_gjs_screensaver_kill (gpointer data); void gnome_screensaver_quit (void); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-screensaver-4.0+0/src/gs-listener-dbus.c new/budgie-screensaver-4.0+2/src/gs-listener-dbus.c --- old/budgie-screensaver-4.0+0/src/gs-listener-dbus.c 2021-04-27 16:47:37.000000000 +0200 +++ new/budgie-screensaver-4.0+2/src/gs-listener-dbus.c 2022-01-02 17:57:54.000000000 +0100 @@ -1345,22 +1345,6 @@ return FALSE; } - if (g_find_program_in_path("pkill") != NULL) { // Have pkill - char *argv[5]; - argv[0] = "pkill"; - argv[1] = "-9"; - argv[2] = "-f"; - argv[3] = "'/usr/bin/gjs /usr/share/gnome-shell/org.gnome.ScreenSaver'"; - argv[4] = NULL; - - g_autoptr(GError) error = NULL; - gboolean kill_ret = g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, NULL, &error); - - if (!kill_ret) { - g_warning("Failed to kill gjs: %s", error->message); - } - } - res = dbus_bus_request_name (listener->priv->connection, GS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &buserror); if (dbus_error_is_set (&buserror)) { g_set_error (error, ++++++ budgie-screensaver.obsinfo ++++++ --- /var/tmp/diff_new_pack.UKSKrj/_old 2022-01-08 23:24:14.814262387 +0100 +++ /var/tmp/diff_new_pack.UKSKrj/_new 2022-01-08 23:24:14.818262390 +0100 @@ -1,6 +1,6 @@ name: budgie-screensaver -version: 4.0+0 -mtime: 1619534857 -commit: 52e04ed4a8d6589bedc5f3b6cf86157bb3084d5e +version: 4.0+2 +mtime: 1641142674 +commit: 19b0852297f3b8a45e1e6773212adb1de0dd3216 ++++++ gnome-screensaver-suse-pam.patch ++++++ --- /var/tmp/diff_new_pack.UKSKrj/_old 2022-01-08 23:24:14.830262400 +0100 +++ /var/tmp/diff_new_pack.UKSKrj/_new 2022-01-08 23:24:14.834262403 +0100 @@ -20,7 +20,8 @@ # SuSE/Novell -#auth include common-auth +auth include common-auth - #auth optional pam_gnome_keyring.so +-#auth optional pam_gnome_keyring.so ++auth optional pam_gnome_keyring.so -#account include common-account -#password include common-password -#session include common-session ++++++ remove-old-automake-macros.patch ++++++ --- /var/tmp/diff_new_pack.UKSKrj/_old 2022-01-08 23:24:14.846262413 +0100 +++ /var/tmp/diff_new_pack.UKSKrj/_new 2022-01-08 23:24:14.846262413 +0100 @@ -34,20 +34,18 @@ +++ b/configure.ac @@ -5,6 +5,8 @@ AC_INIT([budgie-screensaver], [4.0], - [https://github.com/getsolus/budgie-screensaver]) + [https://github.com/BuddiesOfBudgie/budgie-screensaver]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR(src/gnome-screensaver.c) AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar]) -@@ -33,7 +34,8 @@ GETTEXT_PACKAGE=budgie-screensaver +@@ -33,7 +34,6 @@ GETTEXT_PACKAGE=budgie-screensaver AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain]) -AM_GLIB_GNU_GETTEXT -+AM_GNU_GETTEXT([external]) -+AM_GNU_GETTEXT_VERSION([0.17]) GLIB_GSETTINGS # Dependencies
