Merge lp:~brandontschaefer/libertine/seed-packages-workaround into lp:libertine

[Brandon Schaefer]

https://bugs.launchpad.net/libertine/+bug/1592549

Work around for this bug. Only needed for chroot, since utils.py doesnt know the container type a bool seemed easier for now.

As well as seeding packages needed to get the OSK actually working!

https://bugs.launchpad.net/libertine/+bug/1592549

Work around for this bug. Only needed for chroot, since utils.py doesnt know the container type a bool seemed easier for now.

As well as seeding packages needed to get the OSK actually working!

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:246
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/258/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/261
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/220
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/220
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/220
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/220
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1156/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/258/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, this looks good. And we will keep looking for another solution so we don't need the title bars in chroot based containers.

review: Approve

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-06-07 19:05:09 +0000
+++ python/libertine/ChrootContainer.py	2016-06-14 20:25:19 +0000
@@ -250,7 +250,7 @@
         proot_cmd = self._build_proot_command()
 
         args = shlex.split(proot_cmd)
-        args.extend(utils.setup_window_manager(self.container_id))
+        args.extend(utils.setup_window_manager(self.container_id), enable_toolbars=True)
         window_manager = psutil.Popen(args)
 
         args = shlex.split(proot_cmd)

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-06-07 19:05:09 +0000
+++ python/libertine/Libertine.py	2016-06-14 20:25:19 +0000
@@ -80,7 +80,10 @@
         self.default_packages = ['matchbox',
                                  'libnss-extrausers',
                                  'software-properties-common',
-                                 'humanity-icon-theme']
+                                 'humanity-icon-theme',
+                                 'maliit-inputcontext-gtk2',
+                                 'maliit-inputcontext-gtk3',
+                                 'maliit-framework']
 
     def create_libertine_container(self, password=None, multiarch=False, verbosity=1):
         pass

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2016-05-20 14:37:56 +0000
+++ python/libertine/utils.py	2016-06-14 20:25:19 +0000
@@ -29,7 +29,7 @@
 
 def container_exists(container_id):
     container_config_file_path = get_libertine_database_file_path()
- 
+
     if (os.path.exists(container_config_file_path) and
         os.path.getsize(container_config_file_path) != 0):
         with open(get_libertine_database_file_path()) as fd:
@@ -132,9 +132,12 @@
     return os.path.join(get_libertine_runtime_dir(), 'pulse_socket')
 
 
-def setup_window_manager(container_id):
+def setup_window_manager(container_id, enable_toolbars=False):
     if os.path.exists(os.path.join(get_libertine_container_rootfs_path(container_id),
                                    'usr', 'bin', 'matchbox-window-manager')):
+        if enable_toolbars:
+            return ['matchbox-window-manager']
+
         return ['matchbox-window-manager', '-use_titlebar', 'no']
     else:
         return ['compiz']