Merge ~muktupavels/unity:compizconfig into unity:master

[Alberts Muktupāvels]

Install compiz configuration files.

[Dmitry Shachnev (mitya57)]

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)]

> 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.

[Khurshid Alam (khurshid-alam)]

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.20190103-0ubuntu1+201902071650~ubuntu19.04.1_BUILDING.txt.gz

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

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

[Alberts Muktupāvels (muktupavels)]

> 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)]

> 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)]

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)]

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)]

Working here.

review: Approve

[Khurshid Alam (khurshid-alam)]

review: Approve

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 @@
+add_subdirectory(compiz)
 add_subdirectory(pam)
 
 # GSettings Schema
diff --git a/data/compiz/CMakeLists.txt b/data/compiz/CMakeLists.txt
new file mode 100644
index 0000000..c24e404
--- /dev/null
+++ b/data/compiz/CMakeLists.txt
@@ -0,0 +1,26 @@
+find_package (PkgConfig REQUIRED)
+
+pkg_check_modules (COMPIZCONFIG libcompizconfig)
+
+if (COMPIZCONFIG_FOUND)
+    pkg_get_variable (COMPIZCONFIG_CONFIG_DIR libcompizconfig configdir)
+    pkg_get_variable (COMPIZCONFIG_UPGRADES_DIR libcompizconfig upgradesdir)
+
+    set (config_files
+         unity.conf
+         unity.ini
+         unity-lowgfx.ini)
+
+    set (upgrade_files
+         upgrades/com.canonical.unity.unity.01.upgrade
+         upgrades/com.canonical.unity.unity.02.upgrade
+         upgrades/com.canonical.unity.unity.03.upgrade
+         upgrades/com.canonical.unity.unity.04.upgrade
+         upgrades/com.canonical.unity.unity.05.upgrade
+         upgrades/com.canonical.unity.unity.06.upgrade
+         upgrades/com.canonical.unity.unity.07.upgrade
+         upgrades/com.canonical.unity.unity-lowgfx.01.upgrade)
+
+    install (FILES ${config_files} DESTINATION ${COMPIZCONFIG_CONFIG_DIR})
+    install (FILES ${upgrade_files} DESTINATION ${COMPIZCONFIG_UPGRADES_DIR})
+endif ()
diff --git a/data/compiz/unity-lowgfx.ini b/data/compiz/unity-lowgfx.ini
new file mode 100644
index 0000000..e5e76a6
--- /dev/null
+++ b/data/compiz/unity-lowgfx.ini
@@ -0,0 +1,53 @@
+[core]
+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
+
+[ezoom]
+s0_speed = 100
+
+[expo]
+s0_expo_animation = 3
+
+[fade]
+s0_fade_mode = 1
+s0_fade_time = 1
+
+[grid]
+s0_animation_duration = 0
+s0_draw_stretched_window = false
+
+[move]
+s0_mode = 2
+s0_lazy_positioning = true
+s0_increase_border_contrast = true
+
+[resize]
+s0_mode = 2
+s0_increase_border_contrast = true
+
+[opengl]
+s0_texture_filter = 0
+
+[scale]
+s0_skip_animation = true
+
+[unityshell]
+s0_dash_blur_experimental = 0
+
+s0_override_decoration_theme = true
+s0_shadow_x_offset = 1
+s0_shadow_y_offset = 1
+s0_active_shadow_radius = 3
+s0_inactive_shadow_radius = 2
+
+s0_menus_fadein = 0
+s0_menus_fadeout = 0
+s0_menus_discovery_fadein = 0
+s0_menus_discovery_fadeout = 0
+
+s0_autohide_animation = 1
+
+[wall]
+s0_slide_duration = 0
+
+[showdesktop]
+s0_skip_animation = true
diff --git a/data/compiz/unity.conf b/data/compiz/unity.conf
new file mode 100644
index 0000000..4594e21
--- /dev/null
+++ b/data/compiz/unity.conf
@@ -0,0 +1,11 @@
+[general_ubuntu]
+backend = gsettings
+integration = true
+plugin_list_autosort = true
+profile = unity
+
+[general_ubuntu-lowgfx]
+backend = gsettings
+integration = true
+plugin_list_autosort = true
+profile = unity-lowgfx
diff --git a/data/compiz/unity.ini b/data/compiz/unity.ini
new file mode 100644
index 0000000..7591bcb
--- /dev/null
+++ b/data/compiz/unity.ini
@@ -0,0 +1,2 @@
+[core]
+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
diff --git a/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade b/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade
new file mode 100644
index 0000000..288881f
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity-lowgfx.01.upgrade
@@ -0,0 +1,12 @@
+[grid]
++s0_animation_duration = 0
++s0_draw_stretched_window = false
+
+[move]
++s0_mode = 2
++s0_increase_border_contrast = true
++s0_lazy_positioning = true
+
+[resize]
++s0_mode = 2
++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
new file mode 100644
index 0000000..d7576b7
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.01.upgrade
@@ -0,0 +1,5 @@
+[core]
+-s0_active_plugins = staticswitcher
+
+[unityshell]
++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
new file mode 100644
index 0000000..7034bce
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.02.upgrade
@@ -0,0 +1,8 @@
+[expo]
++s0_distance = 0.005
++s0_vp_brightness = 40.0
++s0_vp_saturation = 40.0
++s0_vp_distance = 0.2
++s0_reflection = false
++s0_x_offset = 64
++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
new file mode 100644
index 0000000..06e0c24
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.03.upgrade
@@ -0,0 +1,2 @@
+[core]
++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
new file mode 100644
index 0000000..9b39661
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.04.upgrade
@@ -0,0 +1,2 @@
+[core]
+-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
new file mode 100644
index 0000000..e4d094d
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.05.upgrade
@@ -0,0 +1,3 @@
+[scale]
++s0_speed = 5.0
++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
new file mode 100644
index 0000000..859b21a
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.06.upgrade
@@ -0,0 +1,2 @@
+[core]
+-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
new file mode 100644
index 0000000..c8e9c92
--- /dev/null
+++ b/data/compiz/upgrades/com.canonical.unity.unity.07.upgrade
@@ -0,0 +1,2 @@
+[core]
+-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,
                libbamf3-dev (>= 0.5.3~bzr0),
                libboost-dev,
                libcairo2-dev,
-               libcompizconfig0-dev,
+               libcompizconfig0-dev (>= 1:0.9.13.1+19.04.20190208-0ubuntu1),
                libdbus-1-dev,
                libdbusmenu-glib-dev (>= 0.3.91),
                libdee-dev (>= 1.2.6),
@@ -97,6 +97,8 @@ Breaks: unity-lens-applications (<< 5.12.0-0ubuntu2),
         unity-lens-music (<< 6.0.0),
         unity-lens-video (<< 0.3.6-0ubuntu2),
         ubuntu-session (<< 3.24.1-0ubuntu3~),
+        compiz-gnome (<< 1:0.9.13.1+19.04.20190208-0ubuntu1~),
+Replaces: compiz-gnome (<< 1:0.9.13.1+19.04.20190208-0ubuntu1~),
 Description: Interface designed for efficiency of space and interaction.
  Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
  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 @@
+etc/compizconfig
 etc/pam.d
 usr/bin
 usr/lib/*/compiz/libunity*.so
@@ -8,5 +9,6 @@ usr/lib/*/unity/*-prestart-check
 usr/lib/systemd/user/unity7.service
 usr/share/man/*/unity.1
 usr/share/compiz
+usr/share/compizconfig
 usr/share/locale
 usr/share/upstart/systemd-session/upstart/unity7.override