Merge lp:~smspillaz/compiz/compiz.fix_741656 into lp:~compiz/compiz/ubuntu

Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~smspillaz/compiz/compiz.fix_741656
Merge into: lp:~compiz/compiz/ubuntu
Diff against target: 68 lines (+44/-1)
3 files modified
debian/patches/101_disable_2d_decorations.patch (+42/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~smspillaz/compiz/compiz.fix_741656
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
compiz packagers Pending
Review via email: mp+54725@code.launchpad.net

This proposal has been superseded by a proposal from 2011-04-04.

Description of the change

Makes window decorators not report that they support WINDOW_DECORATION_TYPE_WINDOW since this forces the 2D mode which is broken in spectacular ways.

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1 looks good

review: Approve
578. By Sam Spilsbury

Don't build debug

Unmerged revisions

578. By Sam Spilsbury

Don't build debug

577. By Sam Spilsbury

Added 101_disable_2d_decorations.patch

Disables 2D decorations from being launched since it is currently unsupported

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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-03-24 16:22:20 +0000
@@ -0,0 +1,42 @@
1Index: compiz-0.9.4git20110322/gtk/window-decorator/gtk-window-decorator.c
2===================================================================
3--- compiz-0.9.4git20110322.orig/gtk/window-decorator/gtk-window-decorator.c 2011-03-22 16:46:56.000000000 +0800
4+++ compiz-0.9.4git20110322/gtk/window-decorator/gtk-window-decorator.c 2011-03-25 00:03:23.441180942 +0800
5@@ -415,8 +415,7 @@
6 switcher_p = gwd_get_decor_frame ("switcher");
7
8 decor_set_dm_check_hint (xdisplay, gdk_screen_get_number (gdkscreen),
9- WINDOW_DECORATION_TYPE_PIXMAP |
10- WINDOW_DECORATION_TYPE_WINDOW);
11+ WINDOW_DECORATION_TYPE_PIXMAP);
12
13 update_default_decorations (gdkscreen);
14
15Index: compiz-0.9.4git20110322/kde/window-decorator-kde4/main.cpp
16===================================================================
17--- compiz-0.9.4git20110322.orig/kde/window-decorator-kde4/main.cpp 2011-03-22 16:46:56.000000000 +0800
18+++ compiz-0.9.4git20110322/kde/window-decorator-kde4/main.cpp 2011-03-25 00:03:15.321169033 +0800
19@@ -107,8 +107,7 @@
20 }
21
22 decor_set_dm_check_hint (QX11Info::display (), QX11Info::appScreen (),
23- WINDOW_DECORATION_TYPE_PIXMAP |
24- WINDOW_DECORATION_TYPE_WINDOW);
25+ WINDOW_DECORATION_TYPE_PIXMAP);
26
27 if (!app->enableDecorations (timestamp))
28 {
29Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c
30===================================================================
31--- compiz-0.9.4git20110322.orig/unity/unity_window_decorator/src/gtk-window-decorator.c 2011-03-25 00:03:15.201168862 +0800
32+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c 2011-03-25 00:03:15.321169033 +0800
33@@ -432,8 +432,7 @@
34 }
35
36 decor_set_dm_check_hint (xdisplay, gdk_screen_get_number (gdkscreen),
37- WINDOW_DECORATION_TYPE_PIXMAP |
38- WINDOW_DECORATION_TYPE_WINDOW);
39+ WINDOW_DECORATION_TYPE_PIXMAP);
40
41 update_default_decorations (gdkscreen);
42
043
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-03-24 11:03:37 +0000
+++ debian/patches/series 2011-03-24 16:22:20 +0000
@@ -9,3 +9,4 @@
9086_new_grid_defaults.patch9086_new_grid_defaults.patch
10090_git_fix_new_invisible_windows.patch10090_git_fix_new_invisible_windows.patch
11100_bump_core.h.patch11100_bump_core.h.patch
12101_disable_2d_decorations.patch
1213
=== modified file 'debian/rules'
--- debian/rules 2011-03-01 12:31:42 +0000
+++ debian/rules 2011-03-24 16:22:20 +0000
@@ -12,7 +12,7 @@
1212
13override_dh_auto_configure:13override_dh_auto_configure:
14 # currently, segfault if CMAKE_BUILD_TYPE=Release14 # currently, segfault if CMAKE_BUILD_TYPE=Release
15 dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_DEFAULT_PLUGINS=\"$(DEFAULT_PLUGINS)\" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE15 dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_DEFAULT_PLUGINS=\"$(DEFAULT_PLUGINS)\" -DCMAKE_BUILD_TYPE=Debug -DCOMPIZ_PACKAGING_ENABLED=TRUE
1616
17override_dh_install:17override_dh_install:
18 # Language packs18 # Language packs

Subscribers

People subscribed via source and target branches

to all changes: