Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2018-11-20 22:23:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscreensaver" Tue Nov 20 22:23:43 2018 rev:58 rq:649518 version:5.40 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2018-03-24 16:08:03.627329208 +0100 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new.19453/xscreensaver.changes 2018-11-20 22:23:56.254896863 +0100 @@ -1,0 +2,18 @@ +Thu Nov 15 23:22:37 CET 2018 - [email protected] + +- Update do version 5.40: + * New hacks filmleader vfeedback glitchpeg, razzledazzle, + peepers, crumbler, maze3d and esper. + * webcollagenow works with ImageMagick. + * Improvemenrs of GLPlanet, DymaxionMap, Tessellimage, XAnalogTV. + * More heuristics for using RSS feeds as image sources. + * Built-in image assets are now PNG instead of XPM or XBM. + * Better font-loading fallback. +- Refresh xscreensaver-disable-upgrade-nagging-message.patch. +- Remove obsolete --with-xpm. +- When we are disabling nagging message then reports sent be to us + (bnc#890595, xscreensaver-bug-reports.patch). +- Lock after completing fade + (boo#1101393, xscreensaver-lock-after-fade.patch). + +------------------------------------------------------------------- Old: ---- xscreensaver-5.37.tar.gz New: ---- xscreensaver-5.40.tar.gz xscreensaver-bug-reports.patch xscreensaver-lock-after-fade.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.IfZbKz/_old 2018-11-20 22:23:57.186896340 +0100 +++ /var/tmp/diff_new_pack.IfZbKz/_new 2018-11-20 22:23:57.190896339 +0100 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xscreensaver -Version: 5.37 +Version: 5.40 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause AND GPL-2.0-or-later @@ -42,12 +42,18 @@ Patch42: xscreensaver-webcollage-dictpath.patch # PATCH-FEATURE-OPENSUSE xscreensaver-disable-upgrade-nagging.patch boo#890595 [email protected] -- Disable nagging messages about upgrading to a newer version. Patch43: xscreensaver-disable-upgrade-nagging-message.patch +# PATCH-FEATURE-OPENSUSE xscreensaver-bug-reports.patch bnc890595 [email protected] -- Ask reporters to upgrade before reporting bugs. +Patch45: xscreensaver-bug-reports.patch +# PATCH-FEATURE-OPENSUSE xscreensaver-lock-after-fade.patch boo1101393 [email protected] -- Lock after completing fade. +Patch46: xscreensaver-lock-after-fade.patch BuildRequires: automake BuildRequires: bc BuildRequires: gdmflexiserver +BuildRequires: gtkdoc BuildRequires: intltool BuildRequires: libgle-devel BuildRequires: libjpeg-devel +BuildRequires: libxslt-tools BuildRequires: pam-devel BuildRequires: perl-XML-Parser BuildRequires: update-desktop-files @@ -152,6 +158,8 @@ %patch32 %patch42 %patch43 -p1 +%patch45 -p1 +%patch46 -p1 # KDE, GNOME and MATE have there own screensavers: echo 'NotShowIn=KDE;GNOME;MATE;' >> driver/screensaver-properties.desktop.in cp -f %{SOURCE4} xscreensaver-desktops-generate @@ -184,7 +192,6 @@ --with-gl \ --with-gle \ --with-pixbuf \ - --with-xpm \ --with-jpeg \ --with-xshm-ext \ --with-xdbe-ext \ ++++++ xscreensaver-5.37.tar.gz -> xscreensaver-5.40.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.37.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new.19453/xscreensaver-5.40.tar.gz differ: char 5, line 1 ++++++ xscreensaver-bug-reports.patch ++++++ Index: xscreensaver-5.40/driver/windows.c =================================================================== --- xscreensaver-5.40.orig/driver/windows.c +++ xscreensaver-5.40/driver/windows.c @@ -898,7 +898,11 @@ saver_exit (saver_info *si, int status, if (bugp) fprintf(real_stderr, "%s: see https://www.jwz.org/xscreensaver/bugs.html\n"; - "\t\t\tfor bug reporting information.\n\n", + "\t\t\tfor bug reporting information.\n\n" + "Before reporting any bugs to the upstream,\n" + "please check it in the latest version.\n" + "If it is fixed there, please report it to\n" + "https://bugzilla.opensuse.org/.\n\n";, blurb()); # if defined(HAVE_GETCWD) Index: xscreensaver-5.40/driver/xscreensaver.c =================================================================== --- xscreensaver-5.40.orig/driver/xscreensaver.c +++ xscreensaver-5.40/driver/xscreensaver.c @@ -431,6 +431,10 @@ saver_ehandler (Display *dpy, XErrorEven " The more information you can provide, the better. But please\n" " report this bug, regardless!\n" "\n" + " Before reporting any bugs to the upstream, please check it in the\n" + " latest version. If it is fixed there, please report it to\n" + " https://bugzilla.opensuse.org/.\n"; + "\n" "#######################################################################\n" "\n" "\n"); Index: xscreensaver-5.40/driver/xscreensaver.man =================================================================== --- xscreensaver-5.40.orig/driver/xscreensaver.man +++ xscreensaver-5.40/driver/xscreensaver.man @@ -373,6 +373,9 @@ and Bugs? There are no bugs. Ok, well, maybe. If you find one, please let me know. https://www.jwz.org/xscreensaver/bugs.html explains how to construct the most useful bug reports. + +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/. .PP .TP 4 .B Locking and root logins ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.IfZbKz/_old 2018-11-20 22:23:57.226896318 +0100 +++ /var/tmp/diff_new_pack.IfZbKz/_new 2018-11-20 22:23:57.230896317 +0100 @@ -36,6 +36,7 @@ compass coral crackberg +crumbler crystal cube21 cubenetic @@ -50,8 +51,8 @@ deco deluxe demon -discrete discoball +discrete distort drift dymaxionmap @@ -60,10 +61,12 @@ engine epicycle eruption +esper euler2d extrusion fadeplot fiberlamp +filmleader flame flipflop flipscreen3d @@ -81,6 +84,7 @@ glcells gleidescope glhanoi +glitchpeg glknots glplanet glschool @@ -120,6 +124,7 @@ loop m6502 maze +maze3d memscroller menger mirrorblob @@ -135,6 +140,7 @@ noof noseguy pedal +peepers penetrate penrose petri @@ -155,9 +161,11 @@ quasicrystal queens raverhoop +razzledazzle rd-bomb ripples rocks +romanboy rorschach rotzoomer rubik @@ -172,6 +180,7 @@ sonar speedmine spheremonics +splitflap splodesic spotlight sproingies @@ -193,17 +202,18 @@ tronbit truchet twang -unknownpleasures unicrud +unknownpleasures vermiculate +vfeedback vidwhacker vigilance voronoi wander webcollage webcollage-helper -winduprobot whirlwindwarp +winduprobot wormhole xanalogtv xflame @@ -213,5 +223,3 @@ xrayswarm xspirograph zoom -romanboy -splitflap ++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++ --- /var/tmp/diff_new_pack.IfZbKz/_old 2018-11-20 22:23:57.266896296 +0100 +++ /var/tmp/diff_new_pack.IfZbKz/_new 2018-11-20 22:23:57.266896296 +0100 @@ -1,42 +1,42 @@ -Index: xscreensaver-5.36/driver/prefs.c +Index: xscreensaver-5.40/driver/prefs.c =================================================================== ---- xscreensaver-5.36.orig/driver/prefs.c -+++ xscreensaver-5.36/driver/prefs.c -@@ -1735,36 +1735,5 @@ decrepit_p (void) +--- xscreensaver-5.40.orig/driver/prefs.c ++++ xscreensaver-5.40/driver/prefs.c +@@ -1735,36 +1735,5 @@ senesculent_p (void) upgrading it again -- which would be the worst possible outcome for everyone involved, most especially the users. */ - -- time_t now = time ((time_t *) 0); /* */ -- struct tm *tm = localtime (&now); /* d */ -- const char *s = screensaver_id; /* o */ -- char mon[4], year[5]; /* n */ -- int m, y, months; /* ' */ -- s = strchr (s, ' '); if (!s) abort(); s++; /* t */ -- s = strchr (s, '('); if (!s) abort(); s++; /* */ -- s = strchr (s, '-'); if (!s) abort(); s++; /* d */ +- time_t now = time ((time_t *) 0); /* d */ +- struct tm *tm = localtime (&now); /* o */ +- const char *s = screensaver_id; /* n */ +- char mon[4], year[5]; /* ' */ +- int m, y, mrnths; /* t */ +- s = strchr (s, ' '); if (!s) abort(); s++; /* */ +- s = strchr (s, '('); if (!s) abort(); s++; /* d */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* o */ - strncpy (mon, s, 3); /* o */ - mon[3] = 0; /* */ -- s = strchr (s, '-'); if (!s) abort(); s++; /* i */ -- strncpy (year, s, 4); /* t */ -- year[4] = 0; /* , */ -- y = atoi (year); /* */ -- if (!strcmp(mon, "Jan")) m = 0; /* s */ -- else if (!strcmp(mon, "Feb")) m = 1; /* t */ -- else if (!strcmp(mon, "Mar")) m = 2; /* o */ -- else if (!strcmp(mon, "Apr")) m = 3; /* p */ -- else if (!strcmp(mon, "May")) m = 4; /* , */ -- else if (!strcmp(mon, "Jun")) m = 5; /* */ -- else if (!strcmp(mon, "Jul")) m = 6; /* s */ -- else if (!strcmp(mon, "Aug")) m = 7; /* t */ -- else if (!strcmp(mon, "Sep")) m = 8; /* a */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* e */ +- strncpy (year, s, 4); /* e */ +- year[4] = 0; /* t */ +- y = atoi (year); /* , */ +- if (!strcmp(mon, "Jan")) m = 0; /* */ +- else if (!strcmp(mon, "Feb")) m = 1; /* s */ +- else if (!strcmp(mon, "Mar")) m = 2; /* t */ +- else if (!strcmp(mon, "Apr")) m = 3; /* o */ +- else if (!strcmp(mon, "May")) m = 4; /* p */ +- else if (!strcmp(mon, "Jun")) m = 5; /* , */ +- else if (!strcmp(mon, "Jul")) m = 6; /* */ +- else if (!strcmp(mon, "Aug")) m = 7; /* s */ +- else if (!strcmp(mon, "Sep")) m = 8; /* t */ - else if (!strcmp(mon, "Oct")) m = 9; /* a */ - else if (!strcmp(mon, "Nov")) m = 10; /* a */ -- else if (!strcmp(mon, "Dec")) m = 11; /* h */ +- else if (!strcmp(mon, "Dec")) m = 11; /* a */ - else abort(); /* h */ -- months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ -- (y * 12 + m)); /* p */ -- /* . */ -- return (months >= 17); /* */ +- mrnths = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ +- (y * 12 + m)); /* h */ +- /* p */ +- return (mrnths >= 17); /* . */ +return False; } ++++++ xscreensaver-lock-after-fade.patch ++++++ Index: xscreensaver-5.40/driver/xscreensaver.c =================================================================== --- xscreensaver-5.40.orig/driver/xscreensaver.c +++ xscreensaver-5.40/driver/xscreensaver.c @@ -1331,6 +1331,8 @@ main_loop (saver_info *si) */ { Time lock_timeout = p->lock_timeout; + if (si->fading_possible_p && p->fade_p) + lock_timeout += p->fade_seconds / 1000; if (si->emergency_lock_p && p->lock_p && lock_timeout) {
