Merge ~muktupavels/unity:compizconfig into unity:master

Proposed by Alberts Muktupāvels on 2019-02-06
Status: Merged
Approved by: Dmitry Shachnev on 2019-02-08
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) 2019-02-06 Approve on 2019-02-08
Marco Trevisan (Treviño) 2019-02-06 Pending
Dmitry Shachnev 2019-02-06 Pending
Review via email: mp+362759@code.launchpad.net

Commit message

Install compiz configuration files.

To post a comment you must log in.
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.

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.

Dmitry Shachnev (mitya57) :
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"

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.

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 ?

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.

Khurshid Alam (khurshid-alam) wrote :

Working here.

review: Approve
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index adc5f9c..4b8d722 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,3 +1,4 @@
1add_subdirectory(compiz)
1add_subdirectory(pam)2add_subdirectory(pam)
23
3# GSettings Schema4# GSettings Schema
diff --git a/data/compiz/CMakeLists.txt b/data/compiz/CMakeLists.txt
4new file mode 1006445new file mode 100644
index 0000000..c24e404
--- /dev/null
+++ b/data/compiz/CMakeLists.txt
@@ -0,0 +1,26 @@
1find_package (PkgConfig REQUIRED)
2
3pkg_check_modules (COMPIZCONFIG libcompizconfig)
4
5if (COMPIZCONFIG_FOUND)
6 pkg_get_variable (COMPIZCONFIG_CONFIG_DIR libcompizconfig configdir)
7 pkg_get_variable (COMPIZCONFIG_UPGRADES_DIR libcompizconfig upgradesdir)
8
9 set (config_files
10 unity.conf
11 unity.ini
12 unity-lowgfx.ini)
13
14 set (upgrade_files
15 upgrades/com.canonical.unity.unity.01.upgrade
16 upgrades/com.canonical.unity.unity.02.upgrade
17 upgrades/com.canonical.unity.unity.03.upgrade
18 upgrades/com.canonical.unity.unity.04.upgrade
19 upgrades/com.canonical.unity.unity.05.upgrade
20 upgrades/com.canonical.unity.unity.06.upgrade
21 upgrades/com.canonical.unity.unity.07.upgrade
22 upgrades/com.canonical.unity.unity-lowgfx.01.upgrade)
23
24 install (FILES ${config_files} DESTINATION ${COMPIZCONFIG_CONFIG_DIR})
25 install (FILES ${upgrade_files} DESTINATION ${COMPIZCONFIG_UPGRADES_DIR})
26endif ()
diff --git a/data/compiz/unity-lowgfx.ini b/data/compiz/unity-lowgfx.ini
0new file mode 10064427new file mode 100644
index 0000000..e5e76a6
--- /dev/null
+++ b/data/compiz/unity-lowgfx.ini
@@ -0,0 +1,53 @@
1[core]
2s0_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
3
4[ezoom]
5s0_speed = 100
6
7[expo]
8s0_expo_animation = 3
9
10[fade]
11s0_fade_mode = 1
12s0_fade_time = 1
13
14[grid]
15s0_animation_duration = 0
16s0_draw_stretched_window = false
17
18[move]
19s0_mode = 2
20s0_lazy_positioning = true
21s0_increase_border_contrast = true
22
23[resize]
24s0_mode = 2
25s0_increase_border_contrast = true
26
27[opengl]
28s0_texture_filter = 0
29
30[scale]
31s0_skip_animation = true
32
33[unityshell]
34s0_dash_blur_experimental = 0
35
36s0_override_decoration_theme = true
37s0_shadow_x_offset = 1
38s0_shadow_y_offset = 1
39s0_active_shadow_radius = 3
40s0_inactive_shadow_radius = 2
41
42s0_menus_fadein = 0
43s0_menus_fadeout = 0
44s0_menus_discovery_fadein = 0
45s0_menus_discovery_fadeout = 0
46
47s0_autohide_animation = 1
48
49[wall]
50s0_slide_duration = 0
51
52[showdesktop]
53s0_skip_animation = true
diff --git a/data/compiz/unity.conf b/data/compiz/unity.conf
0new file mode 10064454new file mode 100644
index 0000000..4594e21
--- /dev/null
+++ b/data/compiz/unity.conf
@@ -0,0 +1,11 @@
1[general_ubuntu]
2backend = gsettings
3integration = true
4plugin_list_autosort = true
5profile = unity
6
7[general_ubuntu-lowgfx]
8backend = gsettings
9integration = true
10plugin_list_autosort = true
11profile = unity-lowgfx
diff --git a/data/compiz/unity.ini b/data/compiz/unity.ini
0new file mode 10064412new file mode 100644
index 0000000..7591bcb
--- /dev/null
+++ b/data/compiz/unity.ini
@@ -0,0 +1,2 @@
1[core]
2s0_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
diff --git a/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade b/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade
0new file mode 1006443new file mode 100644
index 0000000..288881f
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade
@@ -0,0 +1,12 @@
1[grid]
2+s0_animation_duration = 0
3+s0_draw_stretched_window = false
4
5[move]
6+s0_mode = 2
7+s0_increase_border_contrast = true
8+s0_lazy_positioning = true
9
10[resize]
11+s0_mode = 2
12+s0_increase_border_contrast = true
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade
0new file mode 10064413new file mode 100644
index 0000000..d7576b7
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade
@@ -0,0 +1,5 @@
1[core]
2-s0_active_plugins = staticswitcher
3
4[unityshell]
5+s0_alt_tab_timeout = true
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade
0new file mode 1006446new file mode 100644
index 0000000..7034bce
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade
@@ -0,0 +1,8 @@
1[expo]
2+s0_distance = 0.005
3+s0_vp_brightness = 40.0
4+s0_vp_saturation = 40.0
5+s0_vp_distance = 0.2
6+s0_reflection = false
7+s0_x_offset = 64
8+s0_y_offset = 24
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade
0new file mode 1006449new file mode 100644
index 0000000..06e0c24
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade
@@ -0,0 +1,2 @@
1[core]
2+s0_active_plugins = copytex
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade
0new file mode 1006443new file mode 100644
index 0000000..9b39661
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade
@@ -0,0 +1,2 @@
1[core]
2-s0_active_plugins = decor
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade
0new file mode 1006443new file mode 100644
index 0000000..e4d094d
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade
@@ -0,0 +1,3 @@
1[scale]
2+s0_speed = 5.0
3+s0_spacing = 20
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade
0new file mode 1006444new file mode 100644
index 0000000..859b21a
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade
@@ -0,0 +1,2 @@
1[core]
2-s0_active_plugins = scalefilter
diff --git a/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade b/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade
0new file mode 1006443new file mode 100644
index 0000000..c8e9c92
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade
@@ -0,0 +1,2 @@
1[core]
2-s0_active_plugins = gnomecompat
diff --git a/debian/control b/debian/control
index 1a1b48b..5e23aa1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: cmake,
19 libbamf3-dev (>= 0.5.3~bzr0),19 libbamf3-dev (>= 0.5.3~bzr0),
20 libboost-dev,20 libboost-dev,
21 libcairo2-dev,21 libcairo2-dev,
22 libcompizconfig0-dev,22 libcompizconfig0-dev (>= 1:0.9.13.1+19.04.20190208-0ubuntu1),
23 libdbus-1-dev,23 libdbus-1-dev,
24 libdbusmenu-glib-dev (>= 0.3.91),24 libdbusmenu-glib-dev (>= 0.3.91),
25 libdee-dev (>= 1.2.6),25 libdee-dev (>= 1.2.6),
@@ -97,6 +97,8 @@ Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2),
97 unity-lens-music (<< 6.0.0),97 unity-lens-music (<< 6.0.0),
98 unity-lens-video (<< 0.3.6-0ubuntu2),98 unity-lens-video (<< 0.3.6-0ubuntu2),
99 ubuntu-session (<< 3.24.1-0ubuntu3~),99 ubuntu-session (<< 3.24.1-0ubuntu3~),
100 compiz-gnome (<< 1:0.9.13.1+19.04.20190208-0ubuntu1~),
101Replaces: compiz-gnome (<< 1:0.9.13.1+19.04.20190208-0ubuntu1~),
100Description: Interface designed for efficiency of space and interaction.102Description: Interface designed for efficiency of space and interaction.
101 Unity is a desktop experience that sings. Designed by Canonical and the Ayatana103 Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
102 community, Unity is all about the combination of familiarity and the future. We104 community, Unity is all about the combination of familiarity and the future. We
diff --git a/debian/unity.install b/debian/unity.install
index 3469bef..b60c762 100644
--- a/debian/unity.install
+++ b/debian/unity.install
@@ -1,3 +1,4 @@
1etc/compizconfig
1etc/pam.d2etc/pam.d
2usr/bin3usr/bin
3usr/lib/*/compiz/libunity*.so4usr/lib/*/compiz/libunity*.so
@@ -8,5 +9,6 @@ usr/lib/*/unity/*-prestart-check
8usr/lib/systemd/user/unity7.service9usr/lib/systemd/user/unity7.service
9usr/share/man/*/unity.110usr/share/man/*/unity.1
10usr/share/compiz11usr/share/compiz
12usr/share/compizconfig
11usr/share/locale13usr/share/locale
12usr/share/upstart/systemd-session/upstart/unity7.override14usr/share/upstart/systemd-session/upstart/unity7.override

Subscribers

People subscribed via source and target branches