Hello community, here is the log from the commit of package compiz checked in at Wed Jun 21 18:00:34 CEST 2006. -------- --- compiz/compiz.changes 2006-06-20 17:28:15.000000000 +0200 +++ compiz/compiz.changes 2006-06-21 17:29:39.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 21 17:26:54 CEST 2006 - dreveman@suse.de + +- Protect against circular transient dependencies. (bnc 186825) +- Constrain window dimensions if they are too large. + +------------------------------------------------------------------- Old: ---- 184483.diff compiz-i18n.patch mwm-error-trap.diff New: ---- 184483-2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.X4tABb/_old 2006-06-21 18:00:13.000000000 +0200 +++ /var/tmp/diff_new_pack.X4tABb/_new 2006-06-21 18:00:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package compiz (Version cvs_060616) +# spec file for package compiz (Version cvs_060621) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ PreReq: %fillup_prereq Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526 Autoreqprov: on -Version: cvs_060616 -Release: 2 +Version: cvs_060621 +Release: 1 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -34,11 +34,9 @@ Patch4: java-config-notify.diff Patch5: gnome-xgl-settings-install.patch Patch6: gnome-xgl-settings-i18n.patch -Patch7: 184483.diff +Patch7: 184483-2.diff Patch8: gnome-xgl-settings-i18n-more.patch -Patch9: compiz-i18n.patch -Patch10: mwm-error-trap.diff -Patch11: gnome-xgl-settings-i18n-fixes.patch +Patch9: gnome-xgl-settings-i18n-fixes.patch %description Compiz is an OpenGL compositing manager that use @@ -62,9 +60,7 @@ patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff -patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/184483.diff -patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/compiz-i18n.patch -patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/mwm-error-trap.diff +patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/184483-2.diff patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-install.patch patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n.patch patch -d gnome-xgl* -p1 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n-more.patch @@ -156,6 +152,9 @@ /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Wed Jun 21 2006 - dreveman@suse.de +- Protect against circular transient dependencies. (bnc 186825) +- Constrain window dimensions if they are too large. * Tue Jun 20 2006 - danw@suse.de - Fix a mistranslation and a typo in de.po (186618) - Add "Desktop Effects" to the po files where we have a translation ++++++ mwm-error-trap.diff -> 184483-2.diff ++++++ --- compiz/mwm-error-trap.diff 2006-06-19 23:59:20.000000000 +0200 +++ compiz/184483-2.diff 2006-06-21 17:44:11.000000000 +0200 @@ -1,30 +1,163 @@ ---- gnome/window-decorator/gnome-window-decorator.c 16 Jun 2006 20:54:20 -0000 1.38 -+++ gnome/window-decorator/gnome-window-decorator.c 19 Jun 2006 21:51:21 -0000 -@@ -2335,19 +2335,25 @@ - { - Display *xdisplay; - Atom actual; -- int result, format; -+ int err, result, format; - unsigned long n, left; - MwmHints *mwm_hints; - unsigned int decor = MWM_DECOR_ALL; - - xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - -+ gdk_error_trap_push (); -+ - result = XGetWindowProperty (xdisplay, xwindow, mwm_hints_atom, - 0L, 20L, FALSE, mwm_hints_atom, - &actual, &format, &n, &left, - (unsigned char **) &mwm_hints); - -- if (result == Success && n && mwm_hints) -+ err = gdk_error_trap_pop (); -+ if (err != Success || result != Success) -+ return decor; +--- plugins/cube.c 15 Jun 2006 17:39:29 -0000 1.22 ++++ plugins/cube.c 18 Jun 2006 22:40:10 -0000 +@@ -1446,7 +1446,20 @@ + damageScreen (s); + } + } ++ break; + default: ++ if (event->type == d->xkbEvent) ++ { ++ s = d->screens; ++ if (s) ++ { ++ CUBE_SCREEN (s); + -+ if (n && mwm_hints) - { - if (n >= PROP_MOTIF_WM_HINT_ELEMENTS) ++ if (eventTerminates (d, event, ++ &cs->opt[CUBE_SCREEN_OPTION_UNFOLD])) ++ cubeFold (s); ++ } ++ } + break; + } + +--- plugins/rotate.c 12 May 2006 11:54:05 -0000 1.18 ++++ plugins/rotate.c 18 Jun 2006 22:40:11 -0000 +@@ -1317,7 +1317,20 @@ + handleEnterScreenEdge (s, event->xcrossing.window); + } + } ++ break; + default: ++ if (event->type == d->xkbEvent) ++ { ++ s = d->screens; ++ if (s) ++ { ++ ROTATE_SCREEN (s); ++ ++ if (eventTerminates (d, event, ++ &rs->opt[ROTATE_SCREEN_OPTION_INITIATE])) ++ rotateTerminate (s); ++ } ++ } + break; + } + +--- plugins/switcher.c 16 Jun 2006 20:57:50 -0000 1.38 ++++ plugins/switcher.c 18 Jun 2006 22:40:12 -0000 +@@ -1107,7 +1107,21 @@ + &ss->opt[SWITCH_SCREEN_OPTION_INITIATE])) + switchTerminate (s, TRUE); + } ++ break; + default: ++ if (event->type == d->xkbEvent) ++ { ++ s = d->screens; ++ if (s) ++ { ++ SWITCH_SCREEN (s); ++ ++ if (ss->switching && ++ eventTerminates (d, event, ++ &ss->opt[SWITCH_SCREEN_OPTION_INITIATE])) ++ switchTerminate (s, TRUE); ++ } ++ } + break; + } + +--- plugins/water.c 23 May 2006 21:23:26 -0000 1.20 ++++ plugins/water.c 18 Jun 2006 22:40:14 -0000 +@@ -1405,6 +1405,8 @@ { + XkbAnyEvent *xkbEvent = (XkbAnyEvent *) event; + ++ s = d->screens; ++ + if (xkbEvent->xkb_type == XkbBellNotify) + { + CompWindow *w; +@@ -1435,6 +1437,20 @@ + } + } + } ++ else if (s) ++ { ++ WATER_SCREEN (s); ++ ++ if (eventTerminates (d, event, ++ &ws->opt[WATER_SCREEN_OPTION_INITIATE])) ++ { ++ if (ws->grabIndex) ++ { ++ removeScreenGrab (s, ws->grabIndex, 0); ++ ws->grabIndex = 0; ++ } ++ } ++ } + } + break; + } +--- plugins/zoom.c 30 Apr 2006 13:00:05 -0000 1.9 ++++ plugins/zoom.c 18 Jun 2006 22:40:14 -0000 +@@ -621,7 +621,20 @@ + damageScreen (s); + } + } ++ break; + default: ++ if (event->type == d->xkbEvent) ++ { ++ s = d->screens; ++ if (s) ++ { ++ ZOOM_SCREEN (s); ++ ++ if (eventTerminates (d, event, ++ &zs->opt[ZOOM_SCREEN_OPTION_INITIATE])) ++ zoomTerminate (s); ++ } ++ } + break; + } + +--- src/display.c 7 Jun 2006 21:50:42 -0000 1.34 ++++ src/display.c 18 Jun 2006 22:40:15 -0000 +@@ -1979,8 +1979,8 @@ + { + XkbSelectEvents (dpy, + XkbUseCoreKbd, +- XkbBellNotifyMask, +- XkbBellNotifyMask); ++ XkbBellNotifyMask | XkbStateNotifyMask, ++ XkbAllEventsMask); + } + else + { +--- src/event.c 9 Jun 2006 12:12:01 -0000 1.51 ++++ src/event.c 18 Jun 2006 22:40:16 -0000 +@@ -1646,6 +1646,22 @@ + return (state & modMask & bindMods) != bindMods; + + default: ++ if (event->type == display->xkbEvent) ++ { ++ XkbAnyEvent *xkbEvent = (XkbAnyEvent *) event; ++ ++ if (xkbEvent->xkb_type == XkbStateNotify) ++ { ++ XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event; ++ ++ modMask = REAL_MOD_MASK & ~display->ignoredModMask; ++ bindMods = virtualToRealModMask (display, ++ bind->u.key.modifiers); ++ ++ return (stateEvent->mods & modMask & bindMods) != bindMods; ++ } ++ } ++ + return FALSE; + } + } ++++++ compiz-0.0.13.tar.bz2 ++++++ ++++ 2351 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org