Merge ~muktupavels/unity:compizconfig into unity:master

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 13c3da2178cd909be1429ca3c33ef861e028387a
Merged at revision: 825afea3cf21c111c38cb391617b3550738a7e7c
Proposed branch: ~muktupavels/unity:compizconfig
Merge into: unity:master
Diff against target: 247 lines (+134/-1)
15 files modified
data/CMakeLists.txt (+1/-0)
data/compiz/CMakeLists.txt (+26/-0)
data/compiz/unity-lowgfx.ini (+53/-0)
data/compiz/unity.conf (+11/-0)
data/compiz/unity.ini (+2/-0)
data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade (+12/-0)
data/compiz/upgrades/com.canonical.unity.unity.01.upgrade (+5/-0)
data/compiz/upgrades/com.canonical.unity.unity.02.upgrade (+8/-0)
data/compiz/upgrades/com.canonical.unity.unity.03.upgrade (+2/-0)
data/compiz/upgrades/com.canonical.unity.unity.04.upgrade (+2/-0)
data/compiz/upgrades/com.canonical.unity.unity.05.upgrade (+3/-0)
data/compiz/upgrades/com.canonical.unity.unity.06.upgrade (+2/-0)
data/compiz/upgrades/com.canonical.unity.unity.07.upgrade (+2/-0)
debian/control (+3/-1)
debian/unity.install (+2/-0)
Reviewer Review Type Date Requested Status
Khurshid Alam (community) Approve
Marco Trevisan (Treviño) Pending
Dmitry Shachnev Pending
Review via email: mp+362759@code.launchpad.net

Commit message

Install compiz configuration files.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

I think we no longer need 00_remove_obsolete_plugins_in_unity_session_v3.py.

We do not support upgrades from versions before Ubuntu 18.04, and 18.04 users already have this migration applied.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> I think we no longer need 00_remove_obsolete_plugins_in_unity_session_v3.py.
>
> We do not support upgrades from versions before Ubuntu 18.04, and 18.04 users
> already have this migration applied.

Removed commit that added this file.

Revision history for this message
Dmitry Shachnev (mitya57) :
Revision history for this message
Khurshid Alam (khurshid-alam) wrote :
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Unity not compiling against this compiz?
>
> https://code.launchpad.net/~khurshid-alam/+archive/ubuntu/experimental-
> ppa/+build/16364462/+files/buildlog_ubuntu-disco-amd64.unity_7.5.0+19.04.20190
> 103-0ubuntu1+201902071650~ubuntu19.04.1_BUILDING.txt.gz

There was few problems and this change depends on changes in compiz.

> Also nux requires a fix first against gcc > 8.1
> (https://bugs.launchpad.net/ubuntu/+source/nux/+bug/1815094)

This seems to be unrelated, that can be fixed and uploaded separately, no?

> And it's better if we open a bug for this.

Why? This was Trevinho reply when I asked about moving files:
"it's mostly an historic reason, since unity was depending on compiz-gnome, but yes... All should have been moved to unity side since long time"

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

> There was few problems and this change depends on changes in compiz.

I was compiling compiz from your branch though but there was a release in disco today, that's why it didn't work...trying again..

>This seems to be unrelated, that can be fixed and uploaded separately, no?

Yes, I will someone from unity team, I just wanted to compile unity against nux.

> Why?

Just to keep track where and when it happened, but I am ok if none objects.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

In the ppa I can't build unity

The following packages have unmet dependencies:
 builddeps:unity : Depends: libcompizconfig0-dev (>= 1:0.9.13.1+19.04.20190207.3-0ubuntu1) but it is not going to be installed

Can it be removed from debian/control ? May be add a break for libcompizconfig0 ?

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

https://bileto.ubuntu.com/#/ticket/3639
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3639/+packages

Wait when this ppa will be ready and use it for testing... Unity build will start (I guess) when compiz will be published in the repository.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Working here.

review: Approve
Revision history for this message
Khurshid Alam (khurshid-alam) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
2index adc5f9c..4b8d722 100644
3--- a/data/CMakeLists.txt
4+++ b/data/CMakeLists.txt
5@@ -1,3 +1,4 @@
6+add_subdirectory(compiz)
7 add_subdirectory(pam)
8
9 # GSettings Schema
10diff --git a/data/compiz/CMakeLists.txt b/data/compiz/CMakeLists.txt
11new file mode 100644
12index 0000000..c24e404
13--- /dev/null
14+++ b/data/compiz/CMakeLists.txt
15@@ -0,0 +1,26 @@
16+find_package (PkgConfig REQUIRED)
17+
18+pkg_check_modules (COMPIZCONFIG libcompizconfig)
19+
20+if (COMPIZCONFIG_FOUND)
21+ pkg_get_variable (COMPIZCONFIG_CONFIG_DIR libcompizconfig configdir)
22+ pkg_get_variable (COMPIZCONFIG_UPGRADES_DIR libcompizconfig upgradesdir)
23+
24+ set (config_files
25+ unity.conf
26+ unity.ini
27+ unity-lowgfx.ini)
28+
29+ set (upgrade_files
30+ upgrades/com.canonical.unity.unity.01.upgrade
31+ upgrades/com.canonical.unity.unity.02.upgrade
32+ upgrades/com.canonical.unity.unity.03.upgrade
33+ upgrades/com.canonical.unity.unity.04.upgrade
34+ upgrades/com.canonical.unity.unity.05.upgrade
35+ upgrades/com.canonical.unity.unity.06.upgrade
36+ upgrades/com.canonical.unity.unity.07.upgrade
37+ upgrades/com.canonical.unity.unity-lowgfx.01.upgrade)
38+
39+ install (FILES ${config_files} DESTINATION ${COMPIZCONFIG_CONFIG_DIR})
40+ install (FILES ${upgrade_files} DESTINATION ${COMPIZCONFIG_UPGRADES_DIR})
41+endif ()
42diff --git a/data/compiz/unity-lowgfx.ini b/data/compiz/unity-lowgfx.ini
43new file mode 100644
44index 0000000..e5e76a6
45--- /dev/null
46+++ b/data/compiz/unity-lowgfx.ini
47@@ -0,0 +1,53 @@
48+[core]
49+s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell
50+
51+[ezoom]
52+s0_speed = 100
53+
54+[expo]
55+s0_expo_animation = 3
56+
57+[fade]
58+s0_fade_mode = 1
59+s0_fade_time = 1
60+
61+[grid]
62+s0_animation_duration = 0
63+s0_draw_stretched_window = false
64+
65+[move]
66+s0_mode = 2
67+s0_lazy_positioning = true
68+s0_increase_border_contrast = true
69+
70+[resize]
71+s0_mode = 2
72+s0_increase_border_contrast = true
73+
74+[opengl]
75+s0_texture_filter = 0
76+
77+[scale]
78+s0_skip_animation = true
79+
80+[unityshell]
81+s0_dash_blur_experimental = 0
82+
83+s0_override_decoration_theme = true
84+s0_shadow_x_offset = 1
85+s0_shadow_y_offset = 1
86+s0_active_shadow_radius = 3
87+s0_inactive_shadow_radius = 2
88+
89+s0_menus_fadein = 0
90+s0_menus_fadeout = 0
91+s0_menus_discovery_fadein = 0
92+s0_menus_discovery_fadeout = 0
93+
94+s0_autohide_animation = 1
95+
96+[wall]
97+s0_slide_duration = 0
98+
99+[showdesktop]
100+s0_skip_animation = true
101diff --git a/data/compiz/unity.conf b/data/compiz/unity.conf
102new file mode 100644
103index 0000000..4594e21
104--- /dev/null
105+++ b/data/compiz/unity.conf
106@@ -0,0 +1,11 @@
107+[general_ubuntu]
108+backend = gsettings
109+integration = true
110+plugin_list_autosort = true
111+profile = unity
112+
113+[general_ubuntu-lowgfx]
114+backend = gsettings
115+integration = true
116+plugin_list_autosort = true
117+profile = unity-lowgfx
118diff --git a/data/compiz/unity.ini b/data/compiz/unity.ini
119new file mode 100644
120index 0000000..7591bcb
121--- /dev/null
122+++ b/data/compiz/unity.ini
123@@ -0,0 +1,2 @@
124+[core]
125+s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;commands;unityshell
126diff --git a/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade b/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade
127new file mode 100644
128index 0000000..288881f
129--- /dev/null
130+++ b/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade
131@@ -0,0 +1,12 @@
132+[grid]
133++s0_animation_duration = 0
134++s0_draw_stretched_window = false
135+
136+[move]
137++s0_mode = 2
138++s0_increase_border_contrast = true
139++s0_lazy_positioning = true
140+
141+[resize]
142++s0_mode = 2
143++s0_increase_border_contrast = true
144diff --git a/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade
145new file mode 100644
146index 0000000..d7576b7
147--- /dev/null
148+++ b/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade
149@@ -0,0 +1,5 @@
150+[core]
151+-s0_active_plugins = staticswitcher
152+
153+[unityshell]
154++s0_alt_tab_timeout = true
155diff --git a/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade
156new file mode 100644
157index 0000000..7034bce
158--- /dev/null
159+++ b/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade
160@@ -0,0 +1,8 @@
161+[expo]
162++s0_distance = 0.005
163++s0_vp_brightness = 40.0
164++s0_vp_saturation = 40.0
165++s0_vp_distance = 0.2
166++s0_reflection = false
167++s0_x_offset = 64
168++s0_y_offset = 24
169diff --git a/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade
170new file mode 100644
171index 0000000..06e0c24
172--- /dev/null
173+++ b/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade
174@@ -0,0 +1,2 @@
175+[core]
176++s0_active_plugins = copytex
177diff --git a/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade
178new file mode 100644
179index 0000000..9b39661
180--- /dev/null
181+++ b/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade
182@@ -0,0 +1,2 @@
183+[core]
184+-s0_active_plugins = decor
185diff --git a/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade
186new file mode 100644
187index 0000000..e4d094d
188--- /dev/null
189+++ b/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade
190@@ -0,0 +1,3 @@
191+[scale]
192++s0_speed = 5.0
193++s0_spacing = 20
194diff --git a/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade
195new file mode 100644
196index 0000000..859b21a
197--- /dev/null
198+++ b/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade
199@@ -0,0 +1,2 @@
200+[core]
201+-s0_active_plugins = scalefilter
202diff --git a/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade
203new file mode 100644
204index 0000000..c8e9c92
205--- /dev/null
206+++ b/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade
207@@ -0,0 +1,2 @@
208+[core]
209+-s0_active_plugins = gnomecompat
210diff --git a/debian/control b/debian/control
211index 1a1b48b..5e23aa1 100644
212--- a/debian/control
213+++ b/debian/control
214@@ -19,7 +19,7 @@ Build-Depends: cmake,
215 libbamf3-dev (>= 0.5.3~bzr0),
216 libboost-dev,
217 libcairo2-dev,
218- libcompizconfig0-dev,
219+ libcompizconfig0-dev (>= 1:0.9.13.1+19.04.20190208-0ubuntu1),
220 libdbus-1-dev,
221 libdbusmenu-glib-dev (>= 0.3.91),
222 libdee-dev (>= 1.2.6),
223@@ -97,6 +97,8 @@ Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2),
224 unity-lens-music (<< 6.0.0),
225 unity-lens-video (<< 0.3.6-0ubuntu2),
226 ubuntu-session (<< 3.24.1-0ubuntu3~),
227+ compiz-gnome (<< 1:0.9.13.1+19.04.20190208-0ubuntu1~),
228+Replaces: compiz-gnome (<< 1:0.9.13.1+19.04.20190208-0ubuntu1~),
229 Description: Interface designed for efficiency of space and interaction.
230 Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
231 community, Unity is all about the combination of familiarity and the future. We
232diff --git a/debian/unity.install b/debian/unity.install
233index 3469bef..b60c762 100644
234--- a/debian/unity.install
235+++ b/debian/unity.install
236@@ -1,3 +1,4 @@
237+etc/compizconfig
238 etc/pam.d
239 usr/bin
240 usr/lib/*/compiz/libunity*.so
241@@ -8,5 +9,6 @@ usr/lib/*/unity/*-prestart-check
242 usr/lib/systemd/user/unity7.service
243 usr/share/man/*/unity.1
244 usr/share/compiz
245+usr/share/compizconfig
246 usr/share/locale
247 usr/share/upstart/systemd-session/upstart/unity7.override

Subscribers

People subscribed via source and target branches