Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2022-10-14 15:40:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscreensaver" Fri Oct 14 15:40:34 2022 rev:70 rq:1010194 version:6.05.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2022-05-26 18:43:53.249165886 +0200 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new.2275/xscreensaver.changes 2022-10-14 15:41:17.599793565 +0200 @@ -1,0 +2,29 @@ +Tue Oct 11 19:50:12 UTC 2022 - Stanislav Brabec <sbra...@suse.com> + +- update to version 6.05.1: + * Cope with dumb DPMS settings that existed pre-startup. + * Silence new Perl warnings from xscreensaver-getimage-file. + * Fix sonar pthreads crash on recent Pi systems. + * Removed dependence on gdk-pixbuf-xlib-2.0. + * GTK 3 is now required. + * New hacks, nakagin and chompytower. + * Settings dialog shows diagnostics for bad image folders and + feeds. + * URLs for imageDirectory can now point at archive.org + collections. + * Sliders for various "Speed" preferences are easier to use. + * Settings dialog shows saver description below embedded preview. + * Better behavior when zero monitors are attached. + * Improvements to inhibiting blanking while videos are playing: + No longer necessary to hack GNOME and KDE to get them to not + usurp the org.freedesktop.ScreenSaver endpoint. + * unicrud displays character names. + * Updated webcollage. +- Ignore selected unbrecognized options generated by %%configure + (xscreensaver-unrecognized-opts.patch). +- Properly find gtk3 directories (xscreensaver-gtk3.patch). +- Refresh xscreensaver-bug-reports.patch, + xscreensaver-default-screensaver.patch, + xscreensaver-fireworkx-man.patch. + +------------------------------------------------------------------- Old: ---- xscreensaver-6.03.tar.gz New: ---- xscreensaver-6.05.1.tar.gz xscreensaver-gtk3.patch xscreensaver-unrecognized-opts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.x9Y4EZ/_old 2022-10-14 15:41:18.663795342 +0200 +++ /var/tmp/diff_new_pack.x9Y4EZ/_new 2022-10-14 15:41:18.667795349 +0200 @@ -17,7 +17,7 @@ Name: xscreensaver -Version: 6.03 +Version: 6.05.1 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause AND GPL-2.0-or-later @@ -44,6 +44,10 @@ Patch43: xscreensaver-disable-upgrade-nagging-message.patch # PATCH-FEATURE-OPENSUSE xscreensaver-bug-reports.patch bnc890595 sbra...@suse.cz -- Ask reporters to upgrade before reporting bugs. Patch45: xscreensaver-bug-reports.patch +# PATCH-FIX-OPENSUSE xscreensaver-unrecognized-opts.patch sbra...@suse.com -- Ignore selected unbrecognized options generated by %%configure. +Patch46: xscreensaver-unrecognized-opts.patch +# PATCH-FIX-OPENSUSE xscreensaver-gtk3.patch sbra...@suse.com -- Properly find gtk3 directories. +Patch47: xscreensaver-gtk3.patch BuildRequires: automake BuildRequires: bc BuildRequires: gdmflexiserver @@ -56,16 +60,16 @@ BuildRequires: perl-XML-Parser BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(atk) +#BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) -BuildRequires: pkgconfig(gdk-x11-2.0) +#BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) +#BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gtk+-x11-2.0) -BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pango) @@ -148,7 +152,7 @@ %lang_package %prep -%setup -q +%setup -q -n %{name}-6.05 %patch5 %patch20 %patch21 @@ -159,8 +163,10 @@ %patch42 %patch43 -p1 %patch45 -p1 +%patch46 -p1 +%patch47 -p1 # KDE, GNOME and MATE have there own screensavers: -echo 'NotShowIn=KDE;GNOME;MATE;' >> driver/screensaver-properties.desktop.in +#echo 'NotShowIn=KDE;GNOME;MATE;' >> driver/screensaver-properties.desktop.in cp -f %{SOURCE4} xscreensaver-desktops-generate chmod a+x xscreensaver-desktops-generate @@ -179,11 +185,14 @@ chmod +x install-sh cp /usr/share/gettext/config.rpath . autoreconf -fi +# Regarding options checking: %%configure includes --disable-dependency-tracking, which causes fatal error. +# Please try to comment out during the upgrade. You should see exactly this single error. +export enable_option_checking=no sed -i "s|@install_sh@|../install-sh -c|" po/Makefile.in.in #lie to configure so the default C standard is used export ac_cv_gcc_accepts_std=no # Disable direct PAM use and shadow (both needs suid). -%configure \ +bash -x %configure \ --with-configdir=%{_sysconfdir}/xscreensaver \ --with-app-defaults=%{_datadir}/X11/app-defaults \ --without-kerberos \ @@ -222,7 +231,7 @@ %find_lang %{name} # # Desktop files. -%suse_update_desktop_file -G "Screensaver properties" xscreensaver-properties DesktopSettings +#%%suse_update_desktop_file -G "Screensaver properties" xscreensaver-properties DesktopSettings # # Generate .desktop files for mate-screensaver usage. mkdir -p %{buildroot}%{_datadir}/applications/screensavers/ @@ -251,11 +260,13 @@ %{_bindir}/xscreensaver-command %{_bindir}/xscreensaver-demo %{_bindir}/xscreensaver-settings -%{_datadir}/applications/xscreensaver-properties.desktop +%{_datadir}/applications/xscreensaver.desktop +%{_datadir}/applications/xscreensaver-settings.desktop %{_datadir}/fonts/xscreensaver -%{_datadir}/pixmaps/xscreensaver.xpm +%{_datadir}/pixmaps/xscreensaver.png %dir %{_datadir}/xscreensaver -%{_datadir}/xscreensaver/ui +#%{_datadir}/xscreensaver/ui +%{_datadir}/xscreensaver/xscreensaver.service %{_libexecdir}/xscreensaver/xscreensaver-auth %{_libexecdir}/xscreensaver/xscreensaver-gfx %{_libexecdir}/xscreensaver/xscreensaver-gl-visual ++++++ xscreensaver-6.03.tar.gz -> xscreensaver-6.05.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-6.03.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new.2275/xscreensaver-6.05.1.tar.gz differ: char 5, line 1 ++++++ xscreensaver-bug-reports.patch ++++++ --- /var/tmp/diff_new_pack.x9Y4EZ/_old 2022-10-14 15:41:18.711795422 +0200 +++ /var/tmp/diff_new_pack.x9Y4EZ/_new 2022-10-14 15:41:18.715795429 +0200 @@ -1,8 +1,8 @@ -Index: xscreensaver-6.01/driver/xscreensaver.c +Index: xscreensaver-6.05/driver/xscreensaver.c =================================================================== ---- xscreensaver-6.01.orig/driver/xscreensaver.c -+++ xscreensaver-6.01/driver/xscreensaver.c -@@ -811,6 +811,10 @@ error_handler (Display *dpy, XErrorEvent +--- xscreensaver-6.05.orig/driver/xscreensaver.c ++++ xscreensaver-6.05/driver/xscreensaver.c +@@ -909,6 +909,10 @@ error_handler (Display *dpy, XErrorEvent " The more information you can provide, the better. But please\n" " report this bug, regardless!\n" "\n" @@ -13,14 +13,15 @@ "#######################################################################\n" "\n" "\n"); -Index: xscreensaver-6.01/driver/xscreensaver.man +Index: xscreensaver-6.05/driver/xscreensaver.man =================================================================== ---- xscreensaver-6.01.orig/driver/xscreensaver.man -+++ xscreensaver-6.01/driver/xscreensaver.man -@@ -985,6 +985,9 @@ power-management-related activity detect +--- xscreensaver-6.05.orig/driver/xscreensaver.man ++++ xscreensaver-6.05/driver/xscreensaver.man +@@ -805,6 +805,10 @@ power-management-related activity detect + .SH BUGS https://www.jwz.org/xscreensaver/bugs.html explains how to write the most useful bug reports. If you find a bug, please let me know! - ++ +Before reporting any bugs to the upstream, please check it in the latest +version. If it is fixed there, please report it to https://bugzilla.opensuse.org/. + ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.x9Y4EZ/_old 2022-10-14 15:41:18.735795462 +0200 +++ /var/tmp/diff_new_pack.x9Y4EZ/_new 2022-10-14 15:41:18.739795469 +0200 @@ -31,6 +31,7 @@ carousel ccurve celtic +chompytower circuit cityflow cloudlife @@ -146,6 +147,7 @@ morph3d mountain munch +nakagin nerverot noof noseguy ++++++ xscreensaver-default-screensaver.patch ++++++ --- /var/tmp/diff_new_pack.x9Y4EZ/_old 2022-10-14 15:41:18.763795509 +0200 +++ /var/tmp/diff_new_pack.x9Y4EZ/_new 2022-10-14 15:41:18.763795509 +0200 @@ -45,7 +45,7 @@ -"*ignoreUninstalledPrograms: False", +"*ignoreUninstalledPrograms: True", "*authWarningSlack: 20", --"*textMode: file", +-"*textMode: url", +"*textMode: date", "*textLiteral: XScreenSaver", "*textFile: ", @@ -101,7 +101,7 @@ +*ignoreUninstalledPrograms: True *authWarningSlack: 20 --*textMode: file +-*textMode: url +*textMode: date *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ ++++++ xscreensaver-fireworkx-man.patch ++++++ --- /var/tmp/diff_new_pack.x9Y4EZ/_old 2022-10-14 15:41:18.783795542 +0200 +++ /var/tmp/diff_new_pack.x9Y4EZ/_new 2022-10-14 15:41:18.787795549 +0200 @@ -2,22 +2,22 @@ =================================================================== --- hacks/fireworkx.man.orig +++ hacks/fireworkx.man -@@ -8,7 +8,7 @@ fireworkx - pyrotechnic explosions eye-c - [\-window] - [\-root] - [\-verbose] --[\-noflash] -+[\-no-flash] - [\-shoot] - [\-delay \fInumber\fP] - [\-maxlife \fInumber\fP] -@@ -27,7 +27,7 @@ Draw on a newly-created window. This is - .B \-root - Draw on the root window. +@@ -9,7 +9,7 @@ fireworkx \- pyrotechnic explosions eye- + [\-\-root] + [\-\-window\-id \fInumber\fP] + [\-\-verbose] +-[\-\-noflash] ++[\-\-no-flash] + [\-\-shoot] + [\-\-delay \fInumber\fP] + [\-\-maxlife \fInumber\fP] +@@ -31,7 +31,7 @@ Draw on the root window. + .B \-\-window\-id \fInumber\fP + Draw on the specified window. .TP 8 --.B \-noflash -+.B \-no-flash +-.B \-\-noflash ++.B \-\-no-flash Turn off light flash effect. (Runs faster) .TP 8 - .B \-shoot + .B \-\-shoot ++++++ xscreensaver-gtk3.patch ++++++ Index: xscreensaver-6.05/configure.ac =================================================================== --- xscreensaver-6.05.orig/configure.ac +++ xscreensaver-6.05/configure.ac @@ -2817,7 +2817,7 @@ if test "$with_gtk" = yes; then GTK_DATADIR="" if test "$have_gtk" = yes; then - GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` GTK_DATADIR="$GTK_DATADIR/share" fi ++++++ xscreensaver-unrecognized-opts.patch ++++++ Index: xscreensaver-6.05/configure.ac =================================================================== --- xscreensaver-6.05.orig/configure.ac +++ xscreensaver-6.05/configure.ac @@ -20,11 +20,6 @@ AC_CONFIG_HEADERS([config.h]) echo "current directory: `pwd`" echo "command line was: $0 $@" -if ! test -z "$ac_unrecognized_opts" ; then - echo "" >&2 - exit 2 -fi - ############################################################################### # # Autoheader stuff