compiz team mailing list archive
-
compiz team
-
Mailing list archive
-
Message #21446
[Merge] lp:~dbarth/compiz/oneiric-0.9.5.94-changes into lp:compiz
David Barth has proposed merging lp:~dbarth/compiz/oneiric-0.9.5.94-changes into lp:compiz.
Requested reviews:
compiz packagers (compiz)
For more details, see:
https://code.launchpad.net/~dbarth/compiz/oneiric-0.9.5.94-changes/+merge/74794
0.9.5.94
--
https://code.launchpad.net/~dbarth/compiz/oneiric-0.9.5.94-changes/+merge/74794
Your team compiz packagers is requested to review the proposed merge of lp:~dbarth/compiz/oneiric-0.9.5.94-changes into lp:compiz.
=== modified file 'debian/changelog'
--- debian/changelog 2011-09-06 09:46:01 +0000
+++ debian/changelog 2011-09-09 14:07:22 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
compiz (1:0.9.5.92+bzr2791-0ubuntu2) oneiric; urgency=low
* debian/rules, debian/compiz-gnome.install, debian/compiz-keybindings.sed:
@@ -6,6 +7,28 @@
-- Didier Roche <didrocks@xxxxxxxxxx> Tue, 06 Sep 2011 11:45:59 +0200
+=======
+compiz (1:0.9.5.94+bzr2803-0ubuntu1~test1) oneiric; urgency=low
+
+ [ David Barth ]
+ * New upstream release 0.9.5.94
+ - Merge in change to have a serverWindows () this break the API
+ - "mumble fix", ie "It is possible to stack windows relative to windows that are destroyed" (LP: #837252)
+ - fix for "Severe screen corruption after rotate the screen" (LP: #833549)
+ - Remove inactive API
+ - Fix for "vp switch causes windows to move further offscreen" (LP: #831987)
+ - Debug messages removed
+ - Memory leak fix in gtk and unity window decorators
+ - Fix further issues with shaped windows mapping/unmapping (rev. 2793)
+ * removed patches that were integrated into the new upstream release
+ - debian/patches/100_core-fix-rev-2794.patch
+ - debian/patches/101_memleak-fix-rev-2794.patch
+ - debian/patches/102_attrib-fix-rev-2796.patch
+ - debian/patches/103_driver_workaround.patch
+
+ -- David Barth <david.barth@xxxxxxxxxxxxx> Mon, 05 Sep 2011 19:20:34 +0200
+
+>>>>>>> MERGE-SOURCE
compiz (1:0.9.5.92+bzr2791-0ubuntu1) oneiric; urgency=low
* debian/65compiz_profile-on-session:
=== removed file 'debian/patches/01_don_t_init_a11y.patch'
--- debian/patches/01_don_t_init_a11y.patch 2011-07-19 05:18:01 +0000
+++ debian/patches/01_don_t_init_a11y.patch 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Index: compiz-0.9.5.0/src/main.cpp
-===================================================================
---- compiz-0.9.5.0.orig/src/main.cpp 2011-07-19 07:14:41.235099187 +0200
-+++ compiz-0.9.5.0/src/main.cpp 2011-07-19 07:15:32.811354937 +0200
-@@ -278,6 +278,12 @@
- signal (SIGINT, signalHandler);
- signal (SIGTERM, signalHandler);
-
-+ // In order to avoid the atk-bridge loading and the GAIL
-+ // initialization during the gtk_init, it is required to set some
-+ // environment vars.
-+ g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-+ g_setenv ("NO_GAIL", "1", TRUE);
-+
- gtk_init_check (&argc, &argv);
-
- if (!manager.parseArguments (argc, argv))
=== removed file 'debian/patches/100_core-fix-rev-2794.patch'
--- debian/patches/100_core-fix-rev-2794.patch 2011-08-23 16:47:40 +0000
+++ debian/patches/100_core-fix-rev-2794.patch 1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-=== modified file 'src/privatewindow.h'
---- compiz-0.9.5.92.orig/src/privatewindow.h 2011-08-19 12:58:20 +0000
-+++ compiz-0.9.5.92/src/privatewindow.h 2011-08-23 06:01:56 +0000
-@@ -36,14 +36,10 @@
-
- #define WINDOW_INVISIBLE(w) \
- ((w)->attrib.map_state != IsViewable || \
-- (w)->geometry.x () + (w)->geometry.width () + \
-- (w)->geometry.border () * 2 + (w)->output.right <= 0 || \
-- (w)->geometry.y () + (w)->geometry.height () + \
-- (w)->geometry.border () * 2 + (w)->output.bottom <= 0 || \
-- (w)->geometry.x () - \
-- (w)->output.left >= (int) screen->width () || \
-- (w)->geometry.y () - \
-- (w)->output.top >= (int) screen->height () )
-+ (w)->attrib.x + (w)->width + (w)->output.right <= 0 || \
-+ (w)->attrib.y + (w)->height + (w)->output.bottom <= 0 || \
-+ (w)->attrib.x - (w)->output.left >= (int) screen->width () || \
-+ (w)->attrib.y - (w)->output.top >= (int) screen->height () )
-
- typedef CompWindowExtents CompFullscreenMonitorSet;
-
-
-=== modified file 'src/screen.cpp'
---- compiz-0.9.5.92.orig/src/screen.cpp 2011-08-20 04:17:41 +0000
-+++ compiz-0.9.5.92/src/screen.cpp 2011-08-23 06:01:56 +0000
-@@ -2036,9 +2036,9 @@
- priv->attrib.height = ce->height;
- }
-
-- priv->reshape (ce->width, ce->height);
-+ priv->reshape (ce->width, ce->height);
-
-- priv->detectOutputDevices ();
-+ priv->detectOutputDevices ();
- }
-
- void
-
-=== modified file 'src/window.cpp'
---- compiz-0.9.5.92.orig/src/window.cpp 2011-08-19 12:58:20 +0000
-+++ compiz-0.9.5.92/src/window.cpp 2011-08-23 06:01:56 +0000
-@@ -796,11 +796,11 @@
- xev.event = screen->root ();
- xev.window = priv->frame;
-
-- xev.x = serverGeometry.x ();
-- xev.y = serverGeometry.y ();
-- xev.width = serverGeometry.width ();
-- xev.height = serverGeometry.height ();
-- xev.border_width = serverGeometry.border ();
-+ xev.x = x;
-+ xev.y = y;
-+ xev.width = width;
-+ xev.height = height;
-+ xev.border_width = window->priv->attrib.border_width;
-
- xev.above = (window->prev) ? ROOTPARENT (window->prev) : None;
- xev.override_redirect = window->priv->attrib.override_redirect;
-@@ -955,7 +955,6 @@
-
- }
-
-- /* FIXME: That doesn't look right */
- r.x = -priv->attrib.border_width;
- r.y = -priv->attrib.border_width;
- r.width = priv->width + priv->attrib.border_width;
-@@ -1230,10 +1229,10 @@
- xev.window = priv->id;
-
- /* normally we should never send configure notify events to override
-- * redirect windows but if they support the _NET_WM_SYNC_REQUEST
-- * protocol we need to do this when the window is mapped. however the
-- * only way we can make sure that the attributes we send are correct
-- * and is to grab the server. */
-+ redirect windows but if they support the _NET_WM_SYNC_REQUEST
-+ protocol we need to do this when the window is mapped. however the
-+ only way we can make sure that the attributes we send are correct
-+ and is to grab the server. */
- if (priv->attrib.override_redirect)
- {
- XWindowAttributes attrib;
-@@ -1398,9 +1397,9 @@
- priv->invisible = true;
-
- if (priv->shaded && priv->height)
-- resize (priv->geometry.x (), priv->geometry.y (),
-- priv->geometry.width (), priv->geometry.height () - 1,
-- priv->geometry.border ());
-+ resize (priv->attrib.x, priv->attrib.y,
-+ priv->attrib.width, ++priv->attrib.height - 1,
-+ priv->attrib.border_width);
-
- screen->priv->updateClientList ();
-
-@@ -1713,6 +1712,10 @@
- {
- if (dx || dy)
- {
-+ /*
-+ priv->attrib.x += dx;
-+ priv->attrib.y += dy;
-+ */
- priv->geometry.setX (priv->geometry.x () + dx);
- priv->geometry.setY (priv->geometry.y () + dy);
-
-@@ -4522,7 +4525,7 @@
- }
- else
- {
-- m = priv->geometry.y () + offY;
-+ m = priv->attrib.y + offY;
- if (m - priv->input.top < (int) s->height () - vHeight)
- rv.setY (offY + vHeight);
- else if (m + priv->height + priv->input.bottom > vHeight)
-@@ -5347,7 +5350,7 @@
-
- if (priv->attrib.c_class != InputOnly)
- {
-- priv->region = CompRegion (priv->geometry.x (), priv->geometry.y (),
-+ priv->region = CompRegion (priv->attrib.x, priv->attrib.y,
- priv->width, priv->height);
- priv->inputRegion = priv->region;
-
-
=== removed file 'debian/patches/101_memleak-fix-rev-2794.patch'
--- debian/patches/101_memleak-fix-rev-2794.patch 2011-08-23 16:47:40 +0000
+++ debian/patches/101_memleak-fix-rev-2794.patch 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-=== modified file 'gtk/window-decorator/switcher.c'
---- compiz-0.9.5.92.orig/gtk/window-decorator/switcher.c 2011-08-19 19:25:15 +0000
-+++ compiz-0.9.5.92/gtk/window-decorator/switcher.c 2011-08-23 10:40:29 +0000
-@@ -493,9 +493,6 @@
- if (d->picture)
- XRenderFreePicture (xdisplay, d->picture);
-
-- g_object_ref (G_OBJECT (pixmap));
-- g_object_ref (G_OBJECT (buffer_pixmap));
--
- d->pixmap = pixmap;
- d->buffer_pixmap = buffer_pixmap;
- d->cr = gdk_cairo_create (pixmap);
-
-=== modified file 'unity/unity_window_decorator/src/switcher.c'
---- compiz-0.9.5.92.orig/unity/unity_window_decorator/src/switcher.c 2011-08-19 18:23:21 +0000
-+++ compiz-0.9.5.92/unity/unity_window_decorator/src/switcher.c 2011-08-23 10:40:29 +0000
-@@ -433,9 +433,6 @@
- switcher_width = width;
- switcher_height = height;
-
-- g_object_ref (G_OBJECT (pixmap));
-- g_object_ref (G_OBJECT (buffer_pixmap));
--
- d->pixmap = pixmap;
- d->buffer_pixmap = buffer_pixmap;
- d->cr = gdk_cairo_create (pixmap);
-
=== removed file 'debian/patches/102_attrib-fix-rev-2796.patch'
--- debian/patches/102_attrib-fix-rev-2796.patch 2011-08-23 16:47:40 +0000
+++ debian/patches/102_attrib-fix-rev-2796.patch 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-=== modified file 'src/window.cpp'
---- compiz-0.9.5.92.orig/src/window.cpp 2011-08-23 13:28:44 +0000
-+++ compiz-0.9.5.92/src/window.cpp 2011-08-23 13:28:57 +0000
-@@ -4525,7 +4525,7 @@
- }
- else
- {
-- m = priv->attrib.y + offY;
-+ m = priv->geometry.y () + offY;
- if (m - priv->input.top < (int) s->height () - vHeight)
- rv.setY (offY + vHeight);
- else if (m + priv->height + priv->input.bottom > vHeight)
-
=== removed file 'debian/patches/103_driver_workaround.patch'
--- debian/patches/103_driver_workaround.patch 2011-08-23 16:47:40 +0000
+++ debian/patches/103_driver_workaround.patch 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-=== modified file 'compiz-0.9.5.92/plugins/opengl/src/screen.cpp'
---- compiz-0.9.5.92/plugins/opengl/src/screen.cpp 2011-02-24 07:52:09 +0000
-+++ compiz-0.9.5.92/plugins/opengl/src/screen.cpp 2011-08-23 14:33:20 +0000
-@@ -25,6 +25,11 @@
- * David Reveman <davidr@xxxxxxxxxx>
- */
-
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <errno.h>
-+
- #include "privates.h"
-
- #include <dlfcn.h>
-@@ -97,6 +102,11 @@
- const char *glRenderer;
- CompOption::Vector o (0);
-
-+#if defined (__GLIBC__) && (__GLIBC__ >= 2)
-+ /* bug #685682 */
-+ program_invocation_short_name[0] = 'C';
-+#endif
-+
- if (indirectRendering)
- {
- /* force Mesa libGL into indirect rendering mode, because
-@@ -531,6 +541,10 @@
- if (GL::textureFromPixmap)
- registerBindPixmap (TfpTexture::bindPixmapToTexture);
-
-+#if defined (__GLIBC__) && (__GLIBC__ >= 2)
-+ /* bug #685682 */
-+ program_invocation_short_name[0] = 'c';
-+#endif
- }
-
- GLScreen::~GLScreen ()
-
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-08-23 16:47:40 +0000
+++ debian/patches/series 2011-09-09 14:07:22 +0000
@@ -1,6 +1,1 @@
-01_don_t_init_a11y.patch
091_no_use_gnome_but_desktop_file.patch
-100_core-fix-rev-2794.patch
-101_memleak-fix-rev-2794.patch
-102_attrib-fix-rev-2796.patch
-103_driver_workaround.patch
Follow ups
