Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfce4-screensaver for openSUSE:Factory checked in at 2023-03-28 17:49:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-screensaver (Old) and /work/SRC/openSUSE:Factory/.xfce4-screensaver.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-screensaver" Tue Mar 28 17:49:14 2023 rev:13 rq:1074775 version:4.18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-screensaver/xfce4-screensaver.changes 2023-03-24 15:21:00.931073906 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-screensaver.new.31432/xfce4-screensaver.changes 2023-03-28 17:49:20.898969932 +0200 @@ -1,0 +2,6 @@ +Mon Mar 27 08:05:55 UTC 2023 - Manfred Hollstein <[email protected]> + +- Update to version 4.18.1 + * Refactor spawn_make_environment_for_display() + +------------------------------------------------------------------- Old: ---- xfce4-screensaver-4.18.0.tar.bz2 New: ---- xfce4-screensaver-4.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.qScwnI/_old 2023-03-28 17:49:21.398972345 +0200 +++ /var/tmp/diff_new_pack.qScwnI/_new 2023-03-28 17:49:21.402972365 +0200 @@ -18,7 +18,7 @@ %bcond_with git Name: xfce4-screensaver -Version: 4.18.0 +Version: 4.18.1 Release: 0 Summary: Screensaver and locker for Xfce License: GPL-2.0-only ++++++ xfce4-screensaver-4.18.0.tar.bz2 -> xfce4-screensaver-4.18.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/ChangeLog new/xfce4-screensaver-4.18.1/ChangeLog --- old/xfce4-screensaver-4.18.0/ChangeLog 2023-03-18 11:39:26.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/ChangeLog 2023-03-26 22:30:37.000000000 +0200 @@ -1,3 +1,34 @@ +commit f02b83d20cef607a137341c9d88c7cd3f87870da +Author: Guido Falsi <[email protected]> +Date: Sat Mar 18 20:31:38 2023 +0100 + + Refactor spawn_make_environment_for_display() + + This function is duplicated in gs-window-x11.c and + xfce4-screensaver-preferences.c. + + Merge the two implementations in xfce-desktop-utils.c and use that + one. + + Also, instead of copying environ directly, use g_get_environ(). + + src/Makefile.am | 2 ++ + src/gs-window-x11.c | 37 +--------------------------------- + src/xfce-desktop-utils.c | 40 +++++++++++++++++++++++++++++++++++++ + src/xfce-desktop-utils.h | 3 +++ + src/xfce4-screensaver-preferences.c | 34 ------------------------------- + 5 files changed, 46 insertions(+), 70 deletions(-) + +commit 69e422460193712dfa6d14b2466682b9db885bcf +Author: Gaël Bonithon <[email protected]> +Date: Sat Mar 18 11:43:57 2023 +0100 + + Updates for release + + NEWS | 40 ++++++++++++++++++++++++++++++++++++++++ + configure.ac | 4 ++-- + 2 files changed, 42 insertions(+), 2 deletions(-) + commit cf92c284c9d0a21576fca228f00c34fb03e3c922 Author: Gaël Bonithon <[email protected]> Date: Sat Mar 18 11:26:02 2023 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/NEWS new/xfce4-screensaver-4.18.1/NEWS --- old/xfce4-screensaver-4.18.0/NEWS 2023-03-18 11:30:24.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/NEWS 2023-03-26 22:27:49.000000000 +0200 @@ -1,3 +1,7 @@ +4.18.1 (2023-03-26) +====== +- Refactor spawn_make_environment_for_display() + 4.18.0 (2023-03-18) ====== - Add copyright notice to configure.ac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/configure new/xfce4-screensaver-4.18.1/configure --- old/xfce4-screensaver-4.18.0/configure 2023-03-18 11:38:08.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/configure 2023-03-26 22:28:49.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xfce4-screensaver 4.18.0. +# Generated by GNU Autoconf 2.71 for xfce4-screensaver 4.18.1. # # Report bugs to <https://gitlab.xfce.org/apps/xfce4-screensaver>. # @@ -623,8 +623,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-screensaver' PACKAGE_TARNAME='xfce4-screensaver' -PACKAGE_VERSION='4.18.0' -PACKAGE_STRING='xfce4-screensaver 4.18.0' +PACKAGE_VERSION='4.18.1' +PACKAGE_STRING='xfce4-screensaver 4.18.1' PACKAGE_BUGREPORT='https://gitlab.xfce.org/apps/xfce4-screensaver' PACKAGE_URL='' @@ -1500,7 +1500,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfce4-screensaver 4.18.0 to adapt to many kinds of systems. +\`configure' configures xfce4-screensaver 4.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1576,7 +1576,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-screensaver 4.18.0:";; + short | recursive ) echo "Configuration of xfce4-screensaver 4.18.1:";; esac cat <<\_ACEOF @@ -1763,7 +1763,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-screensaver configure 4.18.0 +xfce4-screensaver configure 4.18.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2021,7 +2021,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-screensaver $as_me 4.18.0, which was +It was created by xfce4-screensaver $as_me 4.18.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3294,7 +3294,7 @@ # Define the identity of the package. PACKAGE='xfce4-screensaver' - VERSION='4.18.0' + VERSION='4.18.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -18782,7 +18782,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-screensaver $as_me 4.18.0, which was +This file was extended by xfce4-screensaver $as_me 4.18.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18850,7 +18850,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xfce4-screensaver config.status 4.18.0 +xfce4-screensaver config.status 4.18.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/configure.ac new/xfce4-screensaver-4.18.1/configure.ac --- old/xfce4-screensaver-4.18.0/configure.ac 2023-03-18 11:36:54.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/configure.ac 2023-03-26 22:27:15.000000000 +0200 @@ -3,7 +3,7 @@ AC_COPYRIGHT([Copyright (c) 2011-2023 The Xfce development team. All rights reserved.]) AC_PREREQ(2.60) AC_INIT([xfce4-screensaver], - [4.18.0], + [4.18.1], [https://gitlab.xfce.org/apps/xfce4-screensaver]) AC_CONFIG_SRCDIR(src/xfce4-screensaver.c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/doc/xfce4-screensaver.xml new/xfce4-screensaver-4.18.1/doc/xfce4-screensaver.xml --- old/xfce4-screensaver-4.18.0/doc/xfce4-screensaver.xml 2023-03-18 11:39:13.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/doc/xfce4-screensaver.xml 2023-03-26 22:30:23.000000000 +0200 @@ -3,8 +3,8 @@ <book id="index"> <bookinfo> - <title>Xfce Screensaver 4.18.0 Documentation</title> - <releaseinfo>Version 4.18.0</releaseinfo> + <title>Xfce Screensaver 4.18.1 Documentation</title> + <releaseinfo>Version 4.18.1</releaseinfo> <date>6 June, 2006</date> <authorgroup> <author> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/Makefile.am new/xfce4-screensaver-4.18.1/src/Makefile.am --- old/xfce4-screensaver-4.18.0/src/Makefile.am 2021-01-27 19:14:24.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/src/Makefile.am 2023-03-20 16:38:27.000000000 +0100 @@ -99,6 +99,8 @@ gs-prefs.h \ subprocs.c \ subprocs.h \ + xfce-desktop-utils.c \ + xfce-desktop-utils.h \ $(NULL) test_window_LDADD = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/Makefile.in new/xfce4-screensaver-4.18.1/src/Makefile.in --- old/xfce4-screensaver-4.18.0/src/Makefile.in 2023-03-18 11:38:15.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/src/Makefile.in 2023-03-26 22:29:03.000000000 +0200 @@ -132,7 +132,8 @@ am__v_lt_1 = am_test_window_OBJECTS = test-window.$(OBJEXT) gs-window-x11.$(OBJEXT) \ gs-grab-x11.$(OBJEXT) gs-marshal.$(OBJEXT) gs-debug.$(OBJEXT) \ - gs-prefs.$(OBJEXT) subprocs.$(OBJEXT) $(am__objects_1) + gs-prefs.$(OBJEXT) subprocs.$(OBJEXT) \ + xfce-desktop-utils.$(OBJEXT) $(am__objects_1) test_window_OBJECTS = $(am_test_window_OBJECTS) test_window_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -597,6 +598,8 @@ gs-prefs.h \ subprocs.c \ subprocs.h \ + xfce-desktop-utils.c \ + xfce-desktop-utils.h \ $(NULL) test_window_LDADD = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/gs-window-x11.c new/xfce4-screensaver-4.18.1/src/gs-window-x11.c --- old/xfce4-screensaver-4.18.0/src/gs-window-x11.c 2023-03-15 18:13:50.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/src/gs-window-x11.c 2023-03-20 16:38:27.000000000 +0100 @@ -42,6 +42,7 @@ #include "gs-prefs.h" #include "gs-window.h" #include "subprocs.h" +#include "xfce-desktop-utils.h" static void gs_window_finalize (GObject *object); @@ -361,42 +362,6 @@ } } -/* copied from gdk */ -extern char **environ; - -static gchar ** -spawn_make_environment_for_display (GdkDisplay *display, - gchar **envp) { - gchar **retval = NULL; - const gchar *display_name; - gint display_index = -1; - gint i, env_len; - - g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); - - if (envp == NULL) - envp = environ; - - for (env_len = 0; envp[env_len]; env_len++) - if (strncmp (envp[env_len], "DISPLAY", strlen ("DISPLAY")) == 0) - display_index = env_len; - - retval = g_new (char *, env_len + 1); - retval[env_len] = NULL; - - display_name = gdk_display_get_name (display); - - for (i = 0; i < env_len; i++) - if (i == display_index) - retval[i] = g_strconcat ("DISPLAY=", display_name, NULL); - else - retval[i] = g_strdup (envp[i]); - - g_assert (i == env_len); - - return retval; -} - static gboolean spawn_command_line_on_display_sync (GdkDisplay *display, const gchar *command_line, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/xfce-desktop-utils.c new/xfce4-screensaver-4.18.1/src/xfce-desktop-utils.c --- old/xfce4-screensaver-4.18.0/src/xfce-desktop-utils.c 2020-07-09 20:07:03.000000000 +0200 +++ new/xfce4-screensaver-4.18.1/src/xfce-desktop-utils.c 2023-03-20 16:38:27.000000000 +0100 @@ -25,6 +25,7 @@ #include <config.h> +#include <string.h> #include <gio/gio.h> #include <glib.h> #include <gdk/gdk.h> @@ -74,3 +75,42 @@ return res; } + +gchar ** +spawn_make_environment_for_display (GdkDisplay *display, + gchar **envp) { + gchar **retval = NULL; + const gchar *display_name; + gint display_index = -1; + gint i, env_len; + gboolean own_envp = FALSE; + + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + + if (envp == NULL) { + envp = g_get_environ (); + own_envp = TRUE; + } + + for (env_len = 0; envp[env_len]; env_len++) + if (strncmp (envp[env_len], "DISPLAY", strlen ("DISPLAY")) == 0) + display_index = env_len; + + retval = g_new (char *, env_len + 1); + retval[env_len] = NULL; + + display_name = gdk_display_get_name (display); + + for (i = 0; i < env_len; i++) + if (i == display_index) + retval[i] = g_strconcat ("DISPLAY=", display_name, NULL); + else + retval[i] = g_strdup (envp[i]); + + if (own_envp) + g_strfreev (envp); + + g_assert (i == env_len); + + return retval; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/xfce-desktop-utils.h new/xfce4-screensaver-4.18.1/src/xfce-desktop-utils.h --- old/xfce4-screensaver-4.18.0/src/xfce-desktop-utils.h 2020-07-09 20:07:03.000000000 +0200 +++ new/xfce4-screensaver-4.18.1/src/xfce-desktop-utils.h 2023-03-20 16:38:27.000000000 +0100 @@ -37,6 +37,9 @@ const gchar *command, GError **error); +gchar **spawn_make_environment_for_display (GdkDisplay *display, + gchar **envp); + G_END_DECLS #endif /* SRC_XFCE_DESKTOP_UTILS_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/xfce4-screensaver-preferences.c new/xfce4-screensaver-4.18.1/src/xfce4-screensaver-preferences.c --- old/xfce4-screensaver-4.18.0/src/xfce4-screensaver-preferences.c 2023-03-17 18:09:57.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/src/xfce4-screensaver-preferences.c 2023-03-20 16:38:27.000000000 +0100 @@ -1700,40 +1700,6 @@ } } -static gchar ** -spawn_make_environment_for_display (GdkDisplay *display, - gchar **envp) { - gchar **retval = NULL; - const gchar *display_name; - gint display_index = -1; - gint i, env_len; - - g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); - - /* environ is declared in gs-window-x11.c */ - if (envp == NULL) - envp = environ; - - for (env_len = 0; envp[env_len]; env_len++) - if (strncmp (envp[env_len], "DISPLAY", strlen ("DISPLAY")) == 0) - display_index = env_len; - - retval = g_new (char *, env_len + 1); - retval[env_len] = NULL; - - display_name = gdk_display_get_name (display); - - for (i = 0; i < env_len; i++) - if (i == display_index) - retval[i] = g_strconcat ("DISPLAY=", display_name, NULL); - else - retval[i] = g_strdup (envp[i]); - - g_assert (i == env_len); - - return retval; -} - static gboolean spawn_command_line_on_display_sync (GdkDisplay *display, const gchar *command_line, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-screensaver-4.18.0/src/xfce4-screensaver.desktop.in new/xfce4-screensaver-4.18.1/src/xfce4-screensaver.desktop.in --- old/xfce4-screensaver-4.18.0/src/xfce4-screensaver.desktop.in 2023-03-18 11:39:11.000000000 +0100 +++ new/xfce4-screensaver-4.18.1/src/xfce4-screensaver.desktop.in 2023-03-26 22:30:21.000000000 +0200 @@ -11,4 +11,4 @@ X-XFCE-Bugzilla-Bugzilla=XFCE X-XFCE-Bugzilla-Product=xfce4-screensaver X-XFCE-Bugzilla-Component=general -X-XFCE-Bugzilla-Version=4.18.0 +X-XFCE-Bugzilla-Version=4.18.1
