compiz team mailing list archive
-
compiz team
-
Mailing list archive
-
Message #13960
[Merge] lp:~smspillaz/compiz/compiz.fix_741656 into lp:compiz
Sam "SmSpillaz" Spilsbury has proposed merging lp:~smspillaz/compiz/compiz.fix_741656 into lp:compiz.
Requested reviews:
Jason Smith (jassmith)
compiz packagers (compiz)
For more details, see:
https://code.launchpad.net/~smspillaz/compiz/compiz.fix_741656/+merge/56142
Makes window decorators not report that they support WINDOW_DECORATION_TYPE_WINDOW since this forces the 2D mode which is broken in spectacular ways.
--
https://code.launchpad.net/~smspillaz/compiz/compiz.fix_741656/+merge/56142
Your team compiz packagers is requested to review the proposed merge of lp:~smspillaz/compiz/compiz.fix_741656 into lp:compiz.
=== added file 'debian/patches/101_disable_2d_decorations.patch'
--- debian/patches/101_disable_2d_decorations.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/101_disable_2d_decorations.patch 2011-04-04 12:02:37 +0000
@@ -0,0 +1,42 @@
+Index: compiz-0.9.4git20110322/gtk/window-decorator/gtk-window-decorator.c
+===================================================================
+--- compiz-0.9.4git20110322.orig/gtk/window-decorator/gtk-window-decorator.c 2011-03-22 16:46:56.000000000 +0800
++++ compiz-0.9.4git20110322/gtk/window-decorator/gtk-window-decorator.c 2011-03-25 00:03:23.441180942 +0800
+@@ -415,8 +415,7 @@
+ switcher_p = gwd_get_decor_frame ("switcher");
+
+ decor_set_dm_check_hint (xdisplay, gdk_screen_get_number (gdkscreen),
+- WINDOW_DECORATION_TYPE_PIXMAP |
+- WINDOW_DECORATION_TYPE_WINDOW);
++ WINDOW_DECORATION_TYPE_PIXMAP);
+
+ update_default_decorations (gdkscreen);
+
+Index: compiz-0.9.4git20110322/kde/window-decorator-kde4/main.cpp
+===================================================================
+--- compiz-0.9.4git20110322.orig/kde/window-decorator-kde4/main.cpp 2011-03-22 16:46:56.000000000 +0800
++++ compiz-0.9.4git20110322/kde/window-decorator-kde4/main.cpp 2011-03-25 00:03:15.321169033 +0800
+@@ -107,8 +107,7 @@
+ }
+
+ decor_set_dm_check_hint (QX11Info::display (), QX11Info::appScreen (),
+- WINDOW_DECORATION_TYPE_PIXMAP |
+- WINDOW_DECORATION_TYPE_WINDOW);
++ WINDOW_DECORATION_TYPE_PIXMAP);
+
+ if (!app->enableDecorations (timestamp))
+ {
+Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c
+===================================================================
+--- compiz-0.9.4git20110322.orig/unity/unity_window_decorator/src/gtk-window-decorator.c 2011-03-25 00:03:15.201168862 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c 2011-03-25 00:03:15.321169033 +0800
+@@ -432,8 +432,7 @@
+ }
+
+ decor_set_dm_check_hint (xdisplay, gdk_screen_get_number (gdkscreen),
+- WINDOW_DECORATION_TYPE_PIXMAP |
+- WINDOW_DECORATION_TYPE_WINDOW);
++ WINDOW_DECORATION_TYPE_PIXMAP);
+
+ update_default_decorations (gdkscreen);
+
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-03-29 13:25:21 +0000
+++ debian/patches/series 2011-04-04 12:02:37 +0000
@@ -7,3 +7,9 @@
065_add_bailer_and_detection_plugins.patch
085_add_grid_plugin.patch
086_new_grid_defaults.patch
+<<<<<<< TREE
+=======
+090_git_fix_new_invisible_windows.patch
+100_bump_core.h.patch
+101_disable_2d_decorations.patch
+>>>>>>> MERGE-SOURCE
=== modified file 'debian/rules'
--- debian/rules 2011-03-01 12:31:42 +0000
+++ debian/rules 2011-04-04 12:02:37 +0000
@@ -12,7 +12,7 @@
override_dh_auto_configure:
# currently, segfault if CMAKE_BUILD_TYPE=Release
- dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_DEFAULT_PLUGINS=\"$(DEFAULT_PLUGINS)\" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE
+ dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_DEFAULT_PLUGINS=\"$(DEFAULT_PLUGINS)\" -DCMAKE_BUILD_TYPE=Debug -DCOMPIZ_PACKAGING_ENABLED=TRUE
override_dh_install:
# Language packs
Follow ups