Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2015-01-05 04:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xscreensaver" Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2014-09-01 16:58:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver.changes 2015-01-05 04:42:58.000000000 +0100 @@ -1,0 +2,51 @@ +Fri Jan 2 15:48:36 UTC 2015 - chris@computersalat.de + +- update to 5.32 + * Fixed some X11 compilation problems. + * Fixed display size and shake gestures on iOS. +- 5.31 15-Nov-2014 + * New hacks, geodesicgears, binaryring and cityflow. + * UTF-8 text support (instead of only Latin1) and antialiased text + on X11 with Xft (instead of only on OSX/iOS) in fontglide, + noseguy, fliptext, starwars, and winduprobot. The other + text-displaying hacks (apple2, phosphor, xmatrix, and gltext) + also now accept UTF-8 input, though they convert it to Latin1 or + ASCII. + * glplanet now has both day and night maps, and a sharp terminator. + * Fixed webcollage on OSX. + * Fixed a transparency glitch in winduprobot. + * lockward works on iOS. + * Text and image loading work on OSX 10.10. + * Rotation works properly on iOS 8. + * Added a search field on iOS. + * Preliminary, unfinished support for Android. +- 5.30 11-Sep-2014 + * New hack, winduprobot. + * Many improvements to lament, including Leviathan. + * Fixed the normals in flyingtoasters: shading is correct now. + * Implemented TEXTURE_GEN in GLES: flying toast is now toasted on iOS. + * Make cel-shading sort-of work in skytentacles on iOS. + * Fixed dragging-to-rotate on rotated iOS devices, I think. + * Dragging has inertia now. + * Most hacks respond to mouse-clicks, double-taps and swipes as + meaning “do something different now”. + * Reworked OpenGL fonts. + * The OSX auto-update installer wasn't working. This time for sure? + * Various minor fixes. +- rebase patches (and to be p0) +- add new savers to data-extra.list + * binaryring + * cityflow + * geodesicgears + * winduprobot +- add configure option + * with-x-app-defaults=%{_datadir}/X11/app-defaults + default changed to /usr/lib/X11/app-defaults +- removed unknown configure option + * with-icondir=%{_datadir}/xscreensaver/pixmaps +- add rpmlintrc + * addFilter('binary-or-shlib-calls-gethostbyname') +- some rpmlint fixes + * obsoletes and provides + +------------------------------------------------------------------- Old: ---- xscreensaver-5.29.tar.gz New: ---- xscreensaver-5.32.tar.gz xscreensaver-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xscreensaver # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,7 @@ Name: xscreensaver -BuildRequires: Mesa-devel -BuildRequires: automake -BuildRequires: bc -BuildRequires: gdm -BuildRequires: intltool -BuildRequires: libglade2-devel -BuildRequires: libgle-devel -BuildRequires: libgnome-devel -BuildRequires: libjpeg-devel -BuildRequires: pam-devel -BuildRequires: perl-XML-Parser -BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -BuildRequires: pkgconfig(glu) -Provides: xscreensaver-gnome -Provides: xscrns -Obsoletes: xscreensaver-gnome -Obsoletes: xscrns -Requires: %{name}-data -Requires: desktop-data -Requires: pam-modules -Suggests: %{name}-data-extra -Version: 5.29 +Version: 5.32 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause and GPL-2.0+ @@ -49,6 +27,9 @@ Source1: xscreensaver.pamd Source2: xscreensaver-data.list Source3: xscreensaver-data-extra.list +# do not show some rpmlint warnings +Source99: xscreensaver-rpmlintrc +# Patch5: xscreensaver-background.patch Patch20: xscreensaver-mansuffix.patch Patch21: xscreensaver-default-screensaver.patch @@ -60,6 +41,31 @@ # PATCH-FEATURE-OPENSUSE xscreensaver-disable-upgrade-nagging.patch bnc#890595 gber@opensuse.org -- Disable nagging messages about upgrading to a newer version Patch43: xscreensaver-disable-upgrade-nagging-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: Mesa-devel +BuildRequires: automake +BuildRequires: bc +BuildRequires: gdm +BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libgle-devel +BuildRequires: libgnome-devel +BuildRequires: libjpeg-devel +BuildRequires: pam-devel +BuildRequires: perl-XML-Parser +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(glu) +# +Requires: %{name}-data +Requires: desktop-data +Requires: pam-modules +# +Provides: xscreensaver-gnome = %{version} +Provides: xscrns = %{version} +Obsoletes: xscreensaver-gnome < %{version} +Obsoletes: xscrns < %{version} +# +Suggests: %{name}-data-extra %description The xscreensaver program waits until the keyboard and mouse have been @@ -115,13 +121,13 @@ %setup -q %patch5 %patch20 -%patch21 -p1 +%patch21 # FIXME: Test, whether this patch is still needed: %patch24 %patch29 %patch32 -%patch42 -p1 -%patch43 -p1 +%patch42 +%patch43 # KDE and GNOME have its own screensavers: echo 'NotShowIn=KDE;GNOME;' >>driver/screensaver-properties.desktop.in @@ -143,7 +149,7 @@ # Disable direct PAM use and shadow (both needs suid). %configure\ --with-hackdir=%{_libdir}/xscreensaver\ - --with-icondir=%{_datadir}/xscreensaver/pixmaps\ + --with-x-app-defaults=%{_datadir}/X11/app-defaults\ --with-configdir=%{_sysconfdir}/xscreensaver\ --without-kerberos\ --with-passwd-helper=/sbin/unix2_chkpwd\ ++++++ xscreensaver-5.29.tar.gz -> xscreensaver-5.32.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.29.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver-5.32.tar.gz differ: char 5, line 1 ++++++ xscreensaver-background.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -3,9 +3,9 @@ ================================================================================ Index: utils/resources.c =================================================================== ---- utils/resources.c.orig 2006-07-04 02:25:18.000000000 +0200 -+++ utils/resources.c 2012-02-20 20:20:41.070048934 +0100 -@@ -177,7 +177,7 @@ get_pixel_resource (Display *dpy, Colorm +--- utils/resources.c.orig ++++ utils/resources.c +@@ -176,7 +176,7 @@ get_pixel_resource (Display *dpy, Colorm if (s) free (s); { ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -11,6 +11,7 @@ attraction atunnel barcode +binaryring blaster blinkbox blitspin @@ -29,6 +30,7 @@ ccurve celtic circuit +cityflow cloudlife companioncube compass @@ -68,6 +70,7 @@ galaxy gears geodesic +geodesicgears gflux glblur glcells @@ -188,6 +191,7 @@ wander webcollage webcollage-helper +winduprobot whirlwindwarp wormhole xanalogtv ++++++ xscreensaver-default-screensaver.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -1,13 +1,14 @@ -diff -uNr old-xscreensaver-5.20/driver/XScreenSaver_ad.h xscreensaver-5.20/driver/XScreenSaver_ad.h ---- old-xscreensaver-5.20/driver/XScreenSaver_ad.h 2012-10-06 22:20:04.000000000 +0200 -+++ xscreensaver-5.20/driver/XScreenSaver_ad.h 2012-12-26 05:39:10.446124543 +0100 -@@ -1,35 +1,36 @@ +Index: driver/XScreenSaver_ad.h +=================================================================== +--- driver/XScreenSaver_ad.h.orig ++++ driver/XScreenSaver_ad.h +@@ -1,38 +1,39 @@ "#error Do not run app-defaults files through xrdb!", "#error That does not do what you might expect.", "#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.", -"*mode: random", +"*mode: blank", -+"*selected: 150", ++"*selected: 150", "*timeout: 0:10:00", "*cycle: 0:10:00", "*lockTimeout: 0:00:00", @@ -41,16 +42,21 @@ -"*splash: True", +"*splash: False", "*splashDuration: 0:00:05", - "*visualID: default", +-"*visualID: default", ++"*visualID: default", "*captureStderr: True", -"*ignoreUninstalledPrograms: False", --"*textMode: file", +"*ignoreUninstalledPrograms: True", + "*authWarningSlack: 20", +-"*textMode: file", +"*textMode: date", "*textLiteral: XScreenSaver", - "*textFile: ", +-"*textFile: ", ++"*textFile: ", "*textProgram: fortune", -@@ -195,7 +196,7 @@ + "*textURL: http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss", + "*overlayTextForeground: #FFFF00", +@@ -196,7 +197,7 @@ GL: gleidescope -root \\n\ GL: glknots -root \\n\ GL: glmatrix -root \\n\ @@ -59,10 +65,11 @@ GL: hypertorus -root \\n\ - GL: jigglypuff -root \\n\ metaballs -root \\n\ -diff -uNr old-xscreensaver-5.20/driver/XScreenSaver.ad.in xscreensaver-5.20/driver/XScreenSaver.ad.in ---- old-xscreensaver-5.20/driver/XScreenSaver.ad.in 2012-10-06 22:04:17.000000000 +0200 -+++ xscreensaver-5.20/driver/XScreenSaver.ad.in 2012-12-26 05:39:10.446124543 +0100 -@@ -28,37 +28,37 @@ +Index: driver/XScreenSaver.ad.in +=================================================================== +--- driver/XScreenSaver.ad.in.orig ++++ driver/XScreenSaver.ad.in +@@ -28,38 +28,38 @@ ! /* (xrdb prevention kludge: whole file) @@ -103,18 +110,19 @@ -*ignoreUninstalledPrograms: False +*captureStderr: False +*ignoreUninstalledPrograms: True + *authWarningSlack: 20 -*textMode: file +*textMode: date *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ *textProgram: fortune -@@ -300,7 +300,7 @@ +@@ -300,7 +300,7 @@ GetViewPortIsFullOfLies: False @GL_KLUDGE@ GL: gleidescope -root \n\ @GL_KLUDGE@ GL: glknots -root \n\ @GL_KLUDGE@ GL: glmatrix -root \n\ -- GL: glslideshow -root \n\ -+- GL: glslideshow -root -duration 30 -zoom 60 -pan 30 -fade 5 \n\ ++- GL: glslideshow -root -duration 30 -zoom 60 -pan 30 -fade 5 \n\ @GL_KLUDGE@ GL: hypertorus -root \n\ - GL: jigglypuff -root \n\ metaballs -root \n\ ++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -1,41 +1,41 @@ -Index: xscreensaver-5.29/driver/prefs.c +Index: driver/prefs.c =================================================================== ---- xscreensaver-5.29.orig/driver/prefs.c -+++ xscreensaver-5.29/driver/prefs.c -@@ -1659,35 +1659,5 @@ stop_the_insanity (saver_preferences *p) - Bool - senescent_p (void) - { -- time_t now = time ((time_t *) 0); -- struct tm *tm = localtime (&now); -- const char *s = screensaver_id; -- char mon[4], year[5]; -- int m, y, months; -- s = strchr (s, ' '); if (!s) abort(); s++; -- s = strchr (s, '('); if (!s) abort(); s++; -- s = strchr (s, '-'); if (!s) abort(); s++; -- strncpy (mon, s, 3); -- mon[3] = 0; -- s = strchr (s, '-'); if (!s) abort(); s++; -- strncpy (year, s, 4); -- year[4] = 0; -- y = atoi (year); -- if (!strcmp(mon, "Jan")) m = 0; -- else if (!strcmp(mon, "Feb")) m = 1; -- else if (!strcmp(mon, "Mar")) m = 2; -- else if (!strcmp(mon, "Apr")) m = 3; -- else if (!strcmp(mon, "May")) m = 4; -- else if (!strcmp(mon, "Jun")) m = 5; -- else if (!strcmp(mon, "Jul")) m = 6; -- else if (!strcmp(mon, "Aug")) m = 7; -- else if (!strcmp(mon, "Sep")) m = 8; -- else if (!strcmp(mon, "Oct")) m = 9; -- else if (!strcmp(mon, "Nov")) m = 10; -- else if (!strcmp(mon, "Dec")) m = 11; -- else abort(); -- months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - -- (y * 12 + m)); -- -- return (months > 12); +--- driver/prefs.c.orig ++++ driver/prefs.c +@@ -1706,35 +1706,5 @@ senescent_p (void) + + jwz, 2014 + */ +- time_t now = time ((time_t *) 0); /* N */ +- struct tm *tm = localtime (&now); /* o */ +- const char *s = screensaver_id; /* */ +- char mon[4], year[5]; /* d */ +- int m, y, months; /* o */ +- s = strchr (s, ' '); if (!s) abort(); s++; /* n */ +- s = strchr (s, '('); if (!s) abort(); s++; /* ' */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* t */ +- strncpy (mon, s, 3); /* */ +- mon[3] = 0; /* d */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* o */ +- strncpy (year, s, 4); /* */ +- year[4] = 0; /* i */ +- y = atoi (year); /* t */ +- if (!strcmp(mon, "Jan")) m = 0; /* , */ +- else if (!strcmp(mon, "Feb")) m = 1; /* */ +- else if (!strcmp(mon, "Mar")) m = 2; /* s */ +- else if (!strcmp(mon, "Apr")) m = 3; /* t */ +- else if (!strcmp(mon, "May")) m = 4; /* o */ +- else if (!strcmp(mon, "Jun")) m = 5; /* p */ +- else if (!strcmp(mon, "Jul")) m = 6; /* , */ +- else if (!strcmp(mon, "Aug")) m = 7; /* */ +- else if (!strcmp(mon, "Sep")) m = 8; /* s */ +- else if (!strcmp(mon, "Oct")) m = 9; /* t */ +- else if (!strcmp(mon, "Nov")) m = 10; /* a */ +- else if (!strcmp(mon, "Dec")) m = 11; /* a */ +- else abort(); /* a */ +- months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ +- (y * 12 + m)); /* h */ +- /* h */ +- return (months > 18); /* p */ + return False; } ++++++ xscreensaver-fireworkx-man.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -16,7 +16,7 @@ Draw on the root window. .TP 8 -.B \-noflash -+.B \-no-flash ++.B \-no-flash Turn off light flash effect. (Runs faster) .TP 8 .B \-shoot ++++++ xscreensaver-ignore-no-pwent-password.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -4,8 +4,8 @@ ================================================================================ Index: driver/passwd-pwent.c =================================================================== ---- driver/passwd-pwent.c.orig 2008-12-27 11:17:26.000000000 +0100 -+++ driver/passwd-pwent.c 2012-02-20 20:20:41.159044728 +0100 +--- driver/passwd-pwent.c.orig ++++ driver/passwd-pwent.c @@ -200,7 +200,7 @@ get_encrypted_passwd(const char *user) *s = 0; } ++++++ xscreensaver-mansuffix.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -1,7 +1,7 @@ Index: hacks/Makefile.in =================================================================== ---- hacks/Makefile.in.orig 2011-09-29 06:16:35.000000000 +0200 -+++ hacks/Makefile.in 2012-02-20 20:20:41.085048224 +0100 +--- hacks/Makefile.in.orig ++++ hacks/Makefile.in @@ -18,8 +18,8 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ @@ -15,8 +15,8 @@ HACK_CONF_DIR = @HACK_CONF_DIR@ Index: hacks/glx/Makefile.in =================================================================== ---- hacks/glx/Makefile.in.orig 2011-09-29 06:16:37.000000000 +0200 -+++ hacks/glx/Makefile.in 2012-02-20 20:20:41.086048176 +0100 +--- hacks/glx/Makefile.in.orig ++++ hacks/glx/Makefile.in @@ -19,8 +19,8 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ ++++++ xscreensaver-rpmlintrc ++++++ addFilter('binary-or-shlib-calls-gethostbyname') ++++++ xscreensaver-slideshow-dri-detect.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -1,8 +1,8 @@ Index: hacks/glx/glslideshow.c =================================================================== ---- hacks/glx/glslideshow.c.orig 2011-09-28 22:34:41.000000000 +0200 -+++ hacks/glx/glslideshow.c 2012-02-20 20:20:41.130046097 +0100 -@@ -994,6 +994,29 @@ sanity_check (ModeInfo *mi) +--- hacks/glx/glslideshow.c.orig ++++ hacks/glx/glslideshow.c +@@ -989,6 +989,29 @@ sanity_check (ModeInfo *mi) else if (fps_cutoff > 30) fps_cutoff = 30; } @@ -32,7 +32,7 @@ static void check_fps (ModeInfo *mi) -@@ -1003,7 +1026,6 @@ check_fps (ModeInfo *mi) +@@ -998,7 +1021,6 @@ check_fps (ModeInfo *mi) slideshow_state *ss = &sss[MI_SCREEN(mi)]; double start_time, end_time, wall_elapsed, frame_duration, fps; @@ -40,7 +40,7 @@ start_time = ss->now; end_time = double_time(); -@@ -1034,22 +1056,7 @@ check_fps (ModeInfo *mi) +@@ -1029,22 +1051,7 @@ check_fps (ModeInfo *mi) fprintf (stderr, "%s: only %.1f fps! Turning off pan/fade to compensate...\n", blurb(), fps); @@ -64,7 +64,7 @@ #endif /* HAVE_COCOA */ } -@@ -1089,7 +1096,13 @@ init_slideshow (ModeInfo *mi) +@@ -1084,7 +1091,13 @@ init_slideshow (ModeInfo *mi) ss = &sss[screen]; if ((ss->glx_context = init_GL(mi)) != NULL) { ++++++ xscreensaver-webcollage-dictpath.patch ++++++ --- /var/tmp/diff_new_pack.tsCi1E/_old 2015-01-05 04:42:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tsCi1E/_new 2015-01-05 04:42:59.000000000 +0100 @@ -1,8 +1,8 @@ -Index: b/hacks/webcollage +Index: hacks/webcollage =================================================================== ---- a/hacks/webcollage -+++ b/hacks/webcollage -@@ -824,6 +824,7 @@ sub pick_image_from_rss($$) { +--- hacks/webcollage.orig ++++ hacks/webcollage +@@ -827,6 +827,7 @@ sub pick_image_from_rss($$) { sub pick_dictionary() { my @dicts = ("/usr/dict/words", -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org