Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at Sat Dec 26 14:01:07 CET 2009. -------- --- xscreensaver/xscreensaver.changes 2009-12-04 14:40:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/xscreensaver/xscreensaver.changes 2009-12-24 17:42:06.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 24 16:40:52 UTC 2009 - coolo@novell.com + +- update to version 5.10 + * new hacks: rubikblocks, surfaces + * Retired hypercube and hyperball, which are redundant with polytopes. + * Updates to mirrorblob, glhanoi, and sonar + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xscreensaver-5.08.tar.bz2 xscreensaver-s_isdir.patch New: ---- xscreensaver-5.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.ESDrQQ/_old 2009-12-26 14:00:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ESDrQQ/_new 2009-12-26 14:00:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xscreensaver (Version 5.08) +# spec file for package xscreensaver (Version 5.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Provides: xscrns xscreensaver-gnome Obsoletes: xscrns xscreensaver-gnome Requires: desktop-data pam-modules -Version: 5.08 -Release: 3 +Version: 5.10 +Release: 1 Summary: A screen saver and locker for the X Window System Url: http://www.jwz.org/xscreensaver/ Source: %{name}-%{version}.tar.bz2 @@ -40,7 +40,6 @@ Patch29: xscreensaver-ignore-no-pwent-password.patch Patch31: xscreensaver-override_redirect.patch Patch32: xscreensaver-fireworkx-man.patch -Patch33: xscreensaver-s_isdir.patch Patch34: xscreensaver-strict-aliasing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -84,10 +83,11 @@ # FIXME: Test, whether this patch is still needed: %patch24 %patch29 -%patch31 +# No longer compiles and I have no idea if it was reported upstream +##%patch31 %patch32 -%patch33 -%patch34 +#Most of the old patch was applied upstream - not sure the rest is really needed still +##%patch34 # KDE and GNOME have its own screensavers: echo 'NotShowIn=KDE;GNOME;' >>driver/screensaver-properties.desktop.in ++++++ xscreensaver-5.08.tar.bz2 -> xscreensaver-5.10.tar.bz2 ++++++ ++++ 24650 lines of diff (skipped) ++++++ xscreensaver-default-screensaver.patch ++++++ --- /var/tmp/diff_new_pack.ESDrQQ/_old 2009-12-26 14:00:56.000000000 +0100 +++ /var/tmp/diff_new_pack.ESDrQQ/_new 2009-12-26 14:00:56.000000000 +0100 @@ -9,11 +9,9 @@ ================================================================================ Index: driver/XScreenSaver.ad.in =================================================================== ---- driver/XScreenSaver.ad.in.orig -+++ driver/XScreenSaver.ad.in -@@ -35,11 +35,11 @@ - *passwdTimeout: 0:00:30 - *dpmsEnabled: False +--- driver/XScreenSaver.ad.in.orig 2009-09-08 06:53:15.000000000 +0200 ++++ driver/XScreenSaver.ad.in 2009-12-24 17:10:18.000000000 +0100 +@@ -37,7 +37,7 @@ *dpmsStandby: 2:00:00 *dpmsSuspend: 2:00:00 *dpmsOff: 4:00:00 @@ -22,11 +20,7 @@ *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ - *nice: 10 - *memoryLimit: 0 -@@ -51,14 +51,14 @@ - *fadeSeconds: 0:00:03 - *fadeTicks: 20 +@@ -53,10 +53,10 @@ *splash: True *splashDuration: 0:00:05 *visualID: default @@ -40,11 +34,7 @@ *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ *textProgram: fortune - *textURL: http://www.livejournal.com/stats/latest-rss.bml - !*textURL: http://twitter.com/statuses/public_timeline.atom -@@ -138,10 +138,12 @@ GetViewPortIsFullOfLies: False - ! to false. Or switch WMs. Or join the 21st century and get a 24-bit - ! graphics card. +@@ -140,6 +140,8 @@ GetViewPortIsFullOfLies: False ! *installColormap: True @@ -53,27 +43,20 @@ ! This is the list of installed screen saver modes. See "man xscreensaver" ! for the syntax used here. - ! - ! If you want to disable a screensaver, DO NOT remove it from this list: -@@ -294,11 +296,12 @@ GetViewPortIsFullOfLies: False - @GL_KLUDGE@ GL: flyingtoasters -root \n\ - fontglide -root \n\ +@@ -294,7 +296,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_KLUDGE@ 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\ - @GL_KLUDGE@ GL: klein -root \n\ metaballs -root \n\ - @GL_KLUDGE@ GL: mirrorblob -root \n\ Index: driver/XScreenSaver_ad.h =================================================================== ---- driver/XScreenSaver_ad.h.orig -+++ driver/XScreenSaver_ad.h -@@ -1,21 +1,22 @@ +--- driver/XScreenSaver_ad.h.orig 2009-09-08 06:54:40.000000000 +0200 ++++ driver/XScreenSaver_ad.h 2009-12-24 17:11:15.000000000 +0100 +@@ -1,7 +1,8 @@ "#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.", @@ -83,8 +66,7 @@ "*timeout: 0:10:00", "*cycle: 0:10:00", "*lockTimeout: 0:00:00", - "*passwdTimeout: 0:00:30", - "*dpmsEnabled: False", +@@ -10,10 +11,10 @@ "*dpmsStandby: 2:00:00", "*dpmsSuspend: 2:00:00", "*dpmsOff: 4:00:00", @@ -97,11 +79,7 @@ "*nice: 10", "*memoryLimit: 0", "*lock: False", - "*verbose: False", - "*timestamp: True", -@@ -25,12 +26,12 @@ - "*fadeTicks: 20", - "*splash: True", +@@ -27,8 +28,8 @@ "*splashDuration: 0:00:05", "*visualID: default", "*captureStderr: True", @@ -112,19 +90,12 @@ "*textLiteral: XScreenSaver", "*textFile: ", "*textProgram: fortune", - "*textURL: http://www.livejournal.com/stats/latest-rss.bml", - "*overlayTextForeground: #FFFF00", -@@ -193,11 +194,12 @@ - GL: flyingtoasters -root \\n\ - fontglide -root \\n\ +@@ -193,7 +194,7 @@ GL: gleidescope -root \\n\ GL: glknots -root \\n\ GL: glmatrix -root \\n\ -- GL: glslideshow -root \\n\ -+ GL: glslideshow -root -duration 21 -zoom 84 \ -+ -pan 30 -titles \\n\ ++- GL: glslideshow -root -root -duration 21 -zoom 84 -pan 30 -titles \\n\ GL: hypertorus -root \\n\ - GL: jigglypuff -root \\n\ - GL: klein -root \\n\ metaballs -root \\n\ - GL: mirrorblob -root \\n\ ++++++ xscreensaver-strict-aliasing.patch ++++++ --- /var/tmp/diff_new_pack.ESDrQQ/_old 2009-12-26 14:00:56.000000000 +0100 +++ /var/tmp/diff_new_pack.ESDrQQ/_new 2009-12-26 14:00:56.000000000 +0100 @@ -1,146 +1,8 @@ ---- driver/timers.c -+++ driver/timers.c -@@ -669,7 +669,15 @@ - sleep_until_idle (saver_info *si, Bool until_idle_p) - { - saver_preferences *p = &si->prefs; -- XEvent event; -+ union { -+ XEvent x_event; -+#ifdef HAVE_RANDR -+ XRRScreenChangeNotifyEvent xrr_event; -+#endif /* HAVE_RANDR */ -+#ifdef HAVE_MIT_SAVER_EXTENSION -+ XScreenSaverNotifyEvent sevent; -+#endif /* HAVE_MIT_SAVER_EXTENSION */ -+ } event; - - /* We need to select events on all windows if we're not using any extensions. - Otherwise, we don't need to. */ -@@ -713,9 +721,9 @@ - - while (1) - { -- XtAppNextEvent (si->app, &event); -+ XtAppNextEvent (si->app, &event.x_event); - -- switch (event.xany.type) { -+ switch (event.x_event.xany.type) { - case 0: /* our synthetic "timeout" event has been signalled */ - if (until_idle_p) - { -@@ -803,7 +811,7 @@ - break; - - case ClientMessage: -- if (handle_clientmessage (si, &event, until_idle_p)) -+ if (handle_clientmessage (si, &event.x_event, until_idle_p)) - goto DONE; - break; - -@@ -812,7 +820,7 @@ - supposed to scan all windows for events, prepare this window. */ - if (scanning_all_windows) - { -- Window w = event.xcreatewindow.window; -+ Window w = event.x_event.xcreatewindow.window; - start_notice_events_timer (si, w, p->debug_p); - } - break; -@@ -831,28 +839,28 @@ - Window root=0, window=0; - int x=-1, y=-1; - const char *type = 0; -- if (event.xany.type == MotionNotify) -+ if (event.x_event.xany.type == MotionNotify) - { - /*type = "MotionNotify";*/ -- root = event.xmotion.root; -- window = event.xmotion.window; -- x = event.xmotion.x_root; -- y = event.xmotion.y_root; -+ root = event.x_event.xmotion.root; -+ window = event.x_event.xmotion.window; -+ x = event.x_event.xmotion.x_root; -+ y = event.x_event.xmotion.y_root; - } -- else if (event.xany.type == KeyPress) -+ else if (event.x_event.xany.type == KeyPress) - { - type = "KeyPress"; -- root = event.xkey.root; -- window = event.xkey.window; -+ root = event.x_event.xkey.root; -+ window = event.x_event.xkey.window; - x = y = -1; - } -- else if (event.xany.type == ButtonPress) -+ else if (event.x_event.xany.type == ButtonPress) - { - type = "ButtonPress"; -- root = event.xkey.root; -- window = event.xkey.window; -- x = event.xmotion.x_root; -- y = event.xmotion.y_root; -+ root = event.x_event.xkey.root; -+ window = event.x_event.xkey.window; -+ x = event.x_event.xmotion.x_root; -+ y = event.x_event.xmotion.y_root; - } - - if (type) -@@ -866,13 +874,13 @@ - - /* Be careful never to do this unless in -debug mode, as - this could expose characters from the unlock password. */ -- if (p->debug_p && event.xany.type == KeyPress) -+ if (p->debug_p && event.x_event.xany.type == KeyPress) - { - KeySym keysym; - char c = 0; -- XLookupString (&event.xkey, &c, 1, &keysym, 0); -+ XLookupString (&event.x_event.xkey, &c, 1, &keysym, 0); - fprintf (stderr, " (%s%s)", -- (event.xkey.send_event ? "synthetic " : ""), -+ (event.x_event.xkey.send_event ? "synthetic " : ""), - XKeysymToString (keysym)); - } - -@@ -884,7 +892,7 @@ - } - - /* If any widgets want to handle this event, let them. */ -- dispatch_event (si, &event); -+ dispatch_event (si, &event.x_event); - - - /* If we got a MotionNotify event, figure out what screen it -@@ -892,11 +900,11 @@ - far enough to count as "real" motion, then ignore this - event. - */ -- if (event.xany.type == MotionNotify) -+ if (event.x_event.xany.type == MotionNotify) - { - int i; - for (i = 0; i < si->nscreens; i++) -- if (event.xmotion.root == -+ if (event.x_event.xmotion.root == - RootWindowOfScreen (si->screens[i].screen)) - break; - if (i < si->nscreens) -@@ -915,8 +923,8 @@ - if (!until_idle_p) - { - if (si->demoing_p && -- (event.xany.type == MotionNotify || -- event.xany.type == KeyRelease)) -+ (event.x_event.xany.type == MotionNotify || -+ event.x_event.xany.type == KeyRelease)) - /* When we're demoing a single hack, mouse motion doesn't - cause deactivation. Only clicks and keypresses do. */ - ; -@@ -937,17 +945,17 @@ +Index: driver/timers.c +=================================================================== +--- driver/timers.c.orig 2009-12-24 17:06:04.000000000 +0100 ++++ driver/timers.c 2009-12-24 17:06:20.000000000 +0100 +@@ -950,17 +950,17 @@ sleep_until_idle (saver_info *si, Bool u * screen) */ case MapNotify: @@ -161,7 +23,7 @@ } if(rr==TRUE) { if (p->debug_p) { fprintf (stderr, ", raising unconditionally.\n"); } -@@ -961,17 +969,17 @@ +@@ -974,17 +974,17 @@ sleep_until_idle (saver_info *si, Bool u break; case ConfigureNotify: @@ -182,119 +44,3 @@ } if(rr==TRUE) { if (p->debug_p) { fprintf (stderr, ", raising unconditionally.\n"); } -@@ -987,16 +995,14 @@ - default: - - #ifdef HAVE_MIT_SAVER_EXTENSION -- if (event.type == si->mit_saver_ext_event_number) -+ if (event.x_event.type == si->mit_saver_ext_event_number) - { - /* This event's number is that of the MIT-SCREEN-SAVER server - extension. This extension has one event number, and the event - itself contains sub-codes that say what kind of event it was - (an "idle" or "not-idle" event.) - */ -- XScreenSaverNotifyEvent *sevent = -- (XScreenSaverNotifyEvent *) &event; -- if (sevent->state == ScreenSaverOn) -+ if (event.sevent.state == ScreenSaverOn) - { - int i = 0; - if (p->verbose_p) -@@ -1014,7 +1020,7 @@ - XUnmapWindow (si->dpy, ssi->server_mit_saver_window); - } - -- if (sevent->kind != ScreenSaverExternal) -+ if (event.sevent.kind != ScreenSaverExternal) - { - fprintf (stderr, - "%s: ScreenSaverOn event wasn't of type External!\n", -@@ -1024,7 +1030,7 @@ - if (until_idle_p) - goto DONE; - } -- else if (sevent->state == ScreenSaverOff) -+ else if (event.sevent.state == ScreenSaverOff) - { - if (p->verbose_p) - fprintf (stderr, "%s: MIT ScreenSaverOff event received.\n", -@@ -1035,7 +1041,7 @@ - else - fprintf (stderr, - "%s: unknown MIT-SCREEN-SAVER event %d received!\n", -- blurb(), sevent->state); -+ blurb(), event.sevent.state); - } - else - -@@ -1043,7 +1049,7 @@ - - - #ifdef HAVE_SGI_SAVER_EXTENSION -- if (event.type == (si->sgi_saver_ext_event_number + ScreenSaverStart)) -+ if (event.x_event.type == (si->sgi_saver_ext_event_number + ScreenSaverStart)) - { - /* The SGI SCREEN_SAVER server extension has two event numbers, - and this event matches the "idle" event. */ -@@ -1054,7 +1060,7 @@ - if (until_idle_p) - goto DONE; - } -- else if (event.type == (si->sgi_saver_ext_event_number + -+ else if (event.x_event.type == (si->sgi_saver_ext_event_number + - ScreenSaverEnd)) - { - /* The SGI SCREEN_SAVER server extension has two event numbers, -@@ -1069,25 +1075,22 @@ - #endif /* HAVE_SGI_SAVER_EXTENSION */ - - #ifdef HAVE_RANDR -- if (event.type == (si->randr_event_number + RRScreenChangeNotify)) -+ if (event.x_event.type == (si->randr_event_number + RRScreenChangeNotify)) - { - /* The Resize and Rotate extension sends an event when the - size, rotation, or refresh rate of any screen has changed. - */ -- XRRScreenChangeNotifyEvent *xrr_event = -- (XRRScreenChangeNotifyEvent *) &event; -- - if (p->verbose_p) - { - /* XRRRootToScreen is in Xrandr.h 1.4, 2001/06/07 */ -- int screen = XRRRootToScreen (si->dpy, xrr_event->window); -+ int screen = XRRRootToScreen (si->dpy, event.xrr_event.window); - fprintf (stderr, "%s: %d: screen change event received\n", - blurb(), screen); - } - - # ifdef RRScreenChangeNotifyMask - /* Inform Xlib that it's ok to update its data structures. */ -- XRRUpdateConfiguration (&event); /* Xrandr.h 1.9, 2002/09/29 */ -+ XRRUpdateConfiguration (&event.x_event); /* Xrandr.h 1.9, 2002/09/29 */ - # endif /* RRScreenChangeNotifyMask */ - - /* Resize the existing xscreensaver windows and cached ssi data. */ -@@ -1105,7 +1108,7 @@ - #endif /* HAVE_RANDR */ - - /* Just some random event. Let the Widgets handle it, if desired. */ -- dispatch_event (si, &event); -+ dispatch_event (si, &event.x_event); - } - } - DONE: -@@ -1120,11 +1123,11 @@ - there's only one event generated by user activity, not two.) - */ - if (!until_idle_p && si->locked_p) -- swallow_unlock_typeahead_events (si, &event); -+ swallow_unlock_typeahead_events (si, &event.x_event); - else - while (XCheckMaskEvent (si->dpy, - (KeyPressMask|ButtonPressMask|PointerMotionMask), -- &event)) -+ &event.x_event)) - ; - - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org