diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/configure compiz-0.8.4/configure --- compiz-0.8.3+git20090907/configure 2009-08-24 10:41:39.000000000 +0100 +++ compiz-0.8.4/configure 2009-10-14 00:51:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for compiz 0.8.3. +# Generated by GNU Autoconf 2.64 for compiz 0.8.4. # # Report bugs to . # @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='compiz' PACKAGE_TARNAME='compiz' -PACKAGE_VERSION='0.8.3' -PACKAGE_STRING='compiz 0.8.3' +PACKAGE_VERSION='0.8.4' +PACKAGE_STRING='compiz 0.8.4' PACKAGE_BUGREPORT='davidr@novell.com' PACKAGE_URL='' @@ -1618,7 +1618,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures compiz 0.8.3 to adapt to many kinds of systems. +\`configure' configures compiz 0.8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1688,7 +1688,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of compiz 0.8.3:";; + short | recursive ) echo "Configuration of compiz 0.8.4:";; esac cat <<\_ACEOF @@ -1876,7 +1876,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -compiz configure 0.8.3 +compiz configure 0.8.4 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2368,7 +2368,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by compiz $as_me 0.8.3, which was +It was created by compiz $as_me 0.8.4, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2718,7 +2718,7 @@ COMPIZ_VERSION_MAJOR=0 COMPIZ_VERSION_MINOR=8 -COMPIZ_VERSION_MICRO=3 +COMPIZ_VERSION_MICRO=4 @@ -3184,7 +3184,7 @@ # Define the identity of the package. PACKAGE='compiz' - VERSION='0.8.3' + VERSION='0.8.4' cat >>confdefs.h <<_ACEOF @@ -19841,7 +19841,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by compiz $as_me 0.8.3, which was +This file was extended by compiz $as_me 0.8.4, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19905,7 +19905,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -compiz config.status 0.8.3 +compiz config.status 0.8.4 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/configure.ac /tmp/mT0PtBZhyB/compiz-0.8.4/configure.ac --- compiz-0.8.3+git20090907/configure.ac 2009-08-24 10:41:08.000000000 +0100 +++ compiz-0.8.4/configure.ac 2009-10-14 00:51:02.000000000 +0100 @@ -5,7 +5,7 @@ dnl An even micro number indicates a released version. m4_define(compiz_version_major, 0) m4_define(compiz_version_minor, 8) -m4_define(compiz_version_micro, 3) +m4_define(compiz_version_micro, 4) AC_INIT([compiz], [compiz_version_major().compiz_version_minor().compiz_version_micro()], diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/changelog /tmp/mT0PtBZhyB/compiz-0.8.4/debian/changelog --- compiz-0.8.3+git20090907/debian/changelog 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/changelog 2009-12-03 08:24:14.000000000 +0000 @@ -1,14 +1,155 @@ -compiz (1:0.8.3+git20090907-0ubuntu1) karmic; urgency=low +compiz (1:0.8.4-0ubuntu3~ppa1) karmic; urgency=low + + * debian/patches/030_from_git_crash_fix_multiscreen.patch: + - merge commit 24dea72a395071b533dcf66b2eef37b20522cbba to fix + crash with wobbly windows in a multi screen setup + * debian/patches/031_from_git_fix_gnome_keybindings.patch: + - fix gnome keybindings (terminal key) + + -- Michael Vogt Thu, 03 Dec 2009 09:14:04 +0100 + +compiz (1:0.8.4-0ubuntu2) karmic; urgency=low + + * debian/patches/020_fix_focus.patch: + - give back the focus to the previous focused window (LP: #455900) + + -- Michael Vogt Tue, 20 Oct 2009 12:28:25 +0200 + +compiz (1:0.8.4-0ubuntu1) karmic; urgency=low + + * new upstream release: (LP: #451773) + - cannot resize window taller than screen (LP: #221698) + - moving a "always on visible workspace" window to another workspace + makes it inaccessible (LP: #290079) + - enabling "always on visible workspace" for window on another + workspace does not bring to current workspace (LP: #372626) + - screenshot plugin gets confused by screenshot02.png.sig file (LP: #382969) + - window moves when closed (LP: #444836) + - translation updates + * debian/compiz-gnome.install: + - don't install the gconf plugin at all, it just causes problems with + the ccp plugin (LP: #439287) + * debian/watch: + - updated for new release website + + -- Travis Watkins Wed, 14 Oct 2009 14:55:25 -0500 + +compiz (1:0.8.3+git20091005-0ubuntu5) karmic; urgency=low + + * New snapshot from upstream stable git: + - compiz.real crashed with SIGSEGV in blurDrawWindow() + (LP: #353236) + - Windows disappear if resolution is changed to something smaller + than window size (LP: #414134) + - compiz.real crashed with SIGSEGV in handleEvent() (LP: #430518) + - Windows that span screen width or height cannot be resized + in that dimension (LP: #137134) + - Reducing number of workspaces leaves windows inaccessible + (LP: #189259) + - "Snap Inverted" in Wobbly Windows compiz plugin broken + (LP: #366822) + - Problem when resizing and the Panels + (LP: #408030) + * debian/control: + - make compiz package depend on compiz-gnome | compiz-kde (LP: #172385) + * debian/patches/015_draw_dock_shadows_on_desktop.patch: + - fix clock/calendar shadow not going away (LP: #428783) + thanks to Erkin Bahceci + * debian/patches/029_default_options: + - add a focus prevention match to allow polkit windows to steal focus + otherwise they never get focus (LP: #436852) + * debian/compiz-gnome.gconf-defaults: + - change /apps/gwd/blur_type to all since it only does anything if blur + is enabled and is usually what is wanted (LP: #158376) + - turn constrain_y back on (LP: #82654) + * debian/rules: + - add commands plugin to default active_plugins (LP: #355018) + + -- Travis Watkins Mon, 05 Oct 2009 15:42:00 +0200 + +compiz (1:0.8.3+git20090917-0ubuntu4) karmic; urgency=low + + * debian/patches/017_always_unredirect_screensaver_on_nvidia.patch: + - always unredirect gnome-screensaver when using nvidia, workaround + for LP #160264 while still disabling unredirect fullscreen + windows for nvidia users + * debian/compiz-manager: + - remove the code to enable unredirect fullscreen windows for + nvidia users + + -- Travis Watkins Fri, 25 Sep 2009 16:44:40 -0500 + +compiz (1:0.8.3+git20090917-0ubuntu3) karmic; urgency=low + + * debian/compiz-manager: + - reenable intel 845 blacklist (LP: #259385) + * debian/patches/016_call_glxwaitx_before_drawing.patch: + - Call glXWaitX before we start drawing to make sure X is done + handling rendering calls. Suggested by Michel Dänzer to ensure + we don't have any rendering glitches. + * debian/patches/035_ignore_workspaces: + - patch the right file to ensure users can't use workspaces instead + of viewports (LP: #385446) + + -- Travis Watkins Thu, 24 Sep 2009 13:53:04 -0500 + +compiz (1:0.8.3+git20090917-0ubuntu2) karmic; urgency=low + + * debian/rules: + - remove metacity num_workspaces check from keybinding file (LP: #150918) + * debian/compiz-manager: + - enable unredirect_fullscreen_windows if nvidia is detected + * debian/patches/029_default_options: + - turn off unredirect_fullscreen_windows by default again + + -- Travis Watkins Mon, 21 Sep 2009 08:56:25 -0500 + +compiz (1:0.8.3+git20090917-0ubuntu1) karmic; urgency=low + + * New git snapshot of the 0.8 stable branch: + - fix assert failure when core is loaded twice + * debian/patches/029_default_options: + - revert 'set Unredirect Fullscreen windows to "false"' change, + it causes problems on nvidia system + + -- Michael Vogt Thu, 17 Sep 2009 18:12:02 +0200 + +compiz (1:0.8.3+git20090915-0ubuntu1) karmic; urgency=low + + * New git snapshot of the 0.8 stable branch: + - fix window stacking order on initial login (LP: #429969) + - fixes in the kde4 window decorator + * debian/patches/029_default_options: + - set Unredirect Fullscreen windows to "false" again + + -- Michael Vogt Tue, 15 Sep 2009 18:10:04 +0200 + +compiz (1:0.8.3+git20090914-0ubuntu1) karmic; urgency=low * Pre-Version of the upcomming 0.8.4 bugfix release - - fixes segfaults on 64bit arches - - warning fixes - - avoid adding core twice - - fix stacking below problem with the polkit1 dialog - - fixes doPoll() crash (LP: #131679) - - many more bugfixes + - fixes crashes LP: #268683, #284362, #346391, #351878, #352037, #380338 + - fixes crashes on 64bit arches due to issue in va_list use + - fixes at least some of the doPoll/eventLoop crashes reported in + LP: #131679, #145360, #279820 + - likely fixes crashes LP: #340428 and #360643 + - fixes placing of dialogs (e.g. PolicyKit) behind currently focused + window (LP: #165161) + - fixes placing of new windows behind fullscreen window (LP: #153676) + - fixes wobbly bouncing near panel and screen edges (LP: #153374) + - screenshot plugin now saves to the correct desktop directory by default + (LP: #175116) + - lowering a window now activates the topmost window, unless + click-to-focus is off (LP: #122507) + - fixes inconsistent icon sizes in switcher, ring, shift, staticswitcher + plugins + - fixes some memory leaks + - texture compression is now off by default due to texture quality issues + - ported KDE4 window decorator to KDE 4.3 + * debian/control: + - add versionized dependency on compiz-wrapper from + compiz-core - -- Michael Vogt Fri, 11 Sep 2009 13:10:08 +0200 + -- Michael Vogt Mon, 14 Sep 2009 09:39:42 +0200 compiz (1:0.8.3+git20090907-0ubuntu1~ppa1) karmic; urgency=low diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/compiz-gnome.gconf-defaults /tmp/mT0PtBZhyB/compiz-0.8.4/debian/compiz-gnome.gconf-defaults --- compiz-0.8.3+git20090907/debian/compiz-gnome.gconf-defaults 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/compiz-gnome.gconf-defaults 2009-12-03 08:24:14.000000000 +0000 @@ -1,5 +1,6 @@ /apps/compiz/plugins/decoration/allscreens/options/shadow_radius 9.0 -/apps/compiz/plugins/move/allscreens/options/constrain_y false +/apps/compiz/plugins/move/allscreens/options/constrain_y true /apps/compiz/plugins/scale/allscreens/options/initiate_edge Disabled /apps/compiz/general/screen0/options/hsize 2 +/apps/gwd/blur_type all /apps/gwd/metacity_theme_shade_opacity true diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/compiz-gnome.install /tmp/mT0PtBZhyB/compiz-0.8.4/debian/compiz-gnome.install --- compiz-0.8.3+git20090907/debian/compiz-gnome.install 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/compiz-gnome.install 2009-12-03 08:24:14.000000000 +0000 @@ -3,7 +3,5 @@ usr/share/applications/compiz.desktop usr/share/gnome/wm-properties usr/bin/gtk-window-decorator usr/share/gconf/schemas/*.schemas -usr/lib/compiz/libgconf.so -usr/share/compiz/gconf.xml usr/share/gnome-control-center diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/compiz-manager /tmp/mT0PtBZhyB/compiz-0.8.4/debian/compiz-manager --- compiz-0.8.3+git20090907/debian/compiz-manager 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/compiz-manager 2009-12-03 08:24:14.000000000 +0000 @@ -67,7 +67,7 @@ #T="$T 1002:4153" # ATI Rv350 #T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12" # intel 965 #T="$T 8086:2a02 " # Intel GM965 -#T="$T 8086:3577 8086:2562 " # Intel 830MG, 845G (LP: #259385) +T="$T 8086:3577 8086:2562 " # Intel 830MG, 845G (LP: #259385) BLACKLIST_PCIIDS="$T" unset T diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/control /tmp/mT0PtBZhyB/compiz-0.8.4/debian/control --- compiz-0.8.3+git20090907/debian/control 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/control 2009-12-03 08:24:14.000000000 +0000 @@ -23,7 +23,7 @@ Package: compiz Architecture: all -Depends: compiz-core (>= 1:0.8.3), compiz-plugins, compiz-gnome, +Depends: compiz-core (>= 1:0.8.3), compiz-plugins, compiz-gnome | compiz-kde, compiz-fusion-plugins-main (>= 0.8.3), compiz-fusion-plugins-extra (>= 0.8.3), libcompizconfig0 (>= 0.8.3) Provides: x-window-manager @@ -46,7 +46,7 @@ Package: compiz-core Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, compiz-wrapper +Depends: ${shlibs:Depends}, ${misc:Depends}, compiz-wrapper (= ${binary:Version}) Recommends: compiz-plugins (= ${binary:Version}) Suggests: nvidia-glx (>= 1.0.9625-1) Breaks: libcompizconfig0 (<< 0.8.3), diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/patches/015_draw_dock_shadows_on_desktop.patch /tmp/mT0PtBZhyB/compiz-0.8.4/debian/patches/015_draw_dock_shadows_on_desktop.patch --- compiz-0.8.3+git20090907/debian/patches/015_draw_dock_shadows_on_desktop.patch 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/patches/015_draw_dock_shadows_on_desktop.patch 2009-12-03 08:24:14.000000000 +0000 @@ -35,7 +35,7 @@ + /* drawing dock shadows now */ + for (window = w->screen->windows; window; window = window->next) + { -+ if (window->type & CompWindowTypeDockMask) ++ if (window->type & CompWindowTypeDockMask && !window->destroyed) + { + DECOR_WINDOW (window); + diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/patches/016_call_glxwaitx_before_drawing.patch /tmp/mT0PtBZhyB/compiz-0.8.4/debian/patches/016_call_glxwaitx_before_drawing.patch --- compiz-0.8.3+git20090907/debian/patches/016_call_glxwaitx_before_drawing.patch 1970-01-01 01:00:00.000000000 +0100 +++ compiz-0.8.4/debian/patches/016_call_glxwaitx_before_drawing.patch 2009-12-03 08:24:14.000000000 +0000 @@ -0,0 +1,11 @@ +--- compiz-0.8.3/src/display.c 2009-09-25 05:15:32.584699137 -0500 ++++ compiz-0.8.3.new/src/display.c 2009-09-25 05:16:15.596738659 -0500 +@@ -1493,6 +1493,8 @@ + timeDiff = 0; + + makeScreenCurrent (s); ++ /* make sure X is ready for us to draw */ ++ glXWaitX (); + + if (s->slowAnimations) + { diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/patches/017_always_unredirect_screensaver_on_nvidia.patch /tmp/mT0PtBZhyB/compiz-0.8.4/debian/patches/017_always_unredirect_screensaver_on_nvidia.patch --- compiz-0.8.3+git20090907/debian/patches/017_always_unredirect_screensaver_on_nvidia.patch 1970-01-01 01:00:00.000000000 +0100 +++ compiz-0.8.4/debian/patches/017_always_unredirect_screensaver_on_nvidia.patch 2009-12-03 08:24:14.000000000 +0000 @@ -0,0 +1,28 @@ +diff -ur compiz-0.8.3+git20090917/src/paint.c compiz-0.8.3+git20090917.new/src/paint.c +--- compiz-0.8.3+git20090917/src/paint.c 2009-08-24 04:41:08.000000000 -0500 ++++ compiz-0.8.3+git20090917.new/src/paint.c 2009-09-25 15:16:02.071834076 -0500 +@@ -262,6 +262,7 @@ + CompTransform vTransform; + int offX, offY; + Region clip = region; ++ int dontcare; + + if (!tmpRegion) + { +@@ -341,9 +342,15 @@ + XSubtractRegion (tmpRegion, w->region, tmpRegion); + + /* unredirect top most fullscreen windows. */ ++ /* if the fullscreen window is gnome-screensaver and we're ++ on nvidia we want to always unredirect even if this ++ option is disabled to work around LP #160264 */ + if (count == 0 && +- screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b) ++ (screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b || ++ (w->resName && !strcmp(w->resName, "gnome-screensaver") && ++ XQueryExtension (screen->display->display, "NV-GLX", ++ &dontcare, &dontcare, &dontcare)))) + { + if (XEqualRegion (w->region, &screen->region) && + !REGION_NOT_EMPTY (tmpRegion)) + { diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/patches/020_fix_focus.patch /tmp/mT0PtBZhyB/compiz-0.8.4/debian/patches/020_fix_focus.patch --- compiz-0.8.3+git20090907/debian/patches/020_fix_focus.patch 1970-01-01 01:00:00.000000000 +0100 +++ compiz-0.8.4/debian/patches/020_fix_focus.patch 2009-12-03 08:24:14.000000000 +0000 @@ -0,0 +1,81 @@ +diff --git a/include/compiz-core.h b/include/compiz-core.h +index 9f51e40..5f89ddb 100644 +--- a/include/compiz-core.h ++++ b/include/compiz-core.h +@@ -142,6 +142,7 @@ typedef struct _CompWalker CompWalker; + #define CompWindowStateBelowMask (1 << 10) + #define CompWindowStateDemandsAttentionMask (1 << 11) + #define CompWindowStateDisplayModalMask (1 << 12) ++#define CompWindowStateUnmanagingMask (1 << 13) + + #define MAXIMIZE_STATE (CompWindowStateMaximizedHorzMask | \ + CompWindowStateMaximizedVertMask) +diff --git a/src/event.c b/src/event.c +index aa6f5df..0ab554f 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -1366,13 +1366,14 @@ handleEvent (CompDisplay *d, + } + else /* X -> Withdrawn */ + { ++ unsigned int newState = w->state; ++ + /* Iconic -> Withdrawn */ + if (w->state & CompWindowStateHiddenMask) + { + w->minimized = FALSE; + +- changeWindowState (w, +- w->state & ~CompWindowStateHiddenMask); ++ newState &= ~CompWindowStateHiddenMask; + + updateClientListForScreen (w->screen); + } +@@ -1380,6 +1381,12 @@ handleEvent (CompDisplay *d, + if (!w->attrib.override_redirect) + setWmState (d, WithdrawnState, w->id); + ++ if (w->managed) ++ newState |= CompWindowStateUnmanagingMask; ++ ++ changeWindowState (w, newState); ++ ++ w->managed = FALSE; + w->placed = FALSE; + } + +diff --git a/src/window.c b/src/window.c +index dc28ae1..a8870db 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -2554,7 +2554,7 @@ unmapWindow (CompWindow *w) + if (w->unmapRefCnt > 0) + return; + +- if (w->managed && !w->placed) /* only for managed and closed windows */ ++ if (w->state & CompWindowStateUnmanagingMask) + { + XWindowChanges xwc; + unsigned int xwcm; +@@ -2573,7 +2573,7 @@ unmapWindow (CompWindow *w) + if (xwcm) + configureXWindow (w, xwcm, &xwc); + +- w->managed = FALSE; ++ changeWindowState (w, w->state & ~CompWindowStateUnmanagingMask); + } + + if (w->struts) +@@ -2948,6 +2948,12 @@ focusWindow (CompWindow *w) + if (!w->managed) + return FALSE; + ++ if (w->destroyed) ++ return FALSE; ++ ++ if (w->state & CompWindowStateUnmanagingMask) ++ return FALSE; ++ + if (!onCurrentDesktop (w)) + return FALSE; + \ No newline at end of file diff -Nru /tmp/OpklRsRlIQ/compiz-0.8.3+git20090907/debian/patches/029_default_options /tmp/mT0PtBZhyB/compiz-0.8.4/debian/patches/029_default_options --- compiz-0.8.3+git20090907/debian/patches/029_default_options 2009-12-03 08:24:14.000000000 +0000 +++ compiz-0.8.4/debian/patches/029_default_options 2009-12-03 08:24:14.000000000 +0000 @@ -1,7 +1,7 @@ -Index: compiz-0.8.3+git20090831/metadata/core.xml.in.in +Index: compiz-0.8.3+git20090917/metadata/core.xml.in.in =================================================================== ---- compiz-0.8.3+git20090831.orig/metadata/core.xml.in.in 2009-08-24 11:41:08.000000000 +0200 -+++ compiz-0.8.3+git20090831/metadata/core.xml.in.in 2009-08-31 14:08:50.031840634 +0200 +--- compiz-0.8.3+git20090917.orig/metadata/core.xml.in.in 2009-09-07 11:07:47.000000000 -0500 ++++ compiz-0.8.3+git20090917/metadata/core.xml.in.in 2009-09-30 07:54:02.418725091 -0500 @@ -199,7 +199,7 @@ -@@ -313,7 +313,7 @@ +@@ -307,7 +307,7 @@ + + -