Merge lp:~brandontschaefer/unity/libnux-bump into lp:unity

[Brandon Schaefer]

Bump to new libnux from this branch:
https://code.launchpad.net/~brandontschaefer/nux/xim-preedit-support

Bump to new libnux from this branch:
https://code.launchpad.net/~brandontschaefer/nux/xim-preedit-support

Hopefully I've bumped it correctly!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3612
http://jenkins.qa.ubuntu.com/job/unity-ci/532/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/532/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3613
http://jenkins.qa.ubuntu.com/job/unity-ci/533/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/67

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/533/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

I think the version dependency may be a problem. Here's why.

Currently in the daily-build PPA, Nux version 4.0.4+14.04.20131220.1-0ubuntu1 is built but does not include the XIM changes. This version is greater than 4.0.4+14.04.20131203.0-0ubuntu2, so I'm thinking we should bump the Nux version to 4.0.5. That way there is no question on the exact build version (e.g. 14.04.20131220.1) that gets the ABI change.

Also, should also change the Nux version in CMakeLists.txt so compiled versions of Unity will also build against the abi change.

I'll comment in the Nux branch as well about the Nux versioning.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3614
http://jenkins.qa.ubuntu.com/job/unity-ci/534/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/68/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/534/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3615
http://jenkins.qa.ubuntu.com/job/unity-ci/535/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/535/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

This looks good now. Will globally approve once the Nux branch is merged.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3616
http://jenkins.qa.ubuntu.com/job/unity-ci/536/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/70/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/536/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-07 13:54:18 +0000
+++ CMakeLists.txt	2014-01-03 17:07:12 +0000
@@ -230,7 +230,7 @@
     libbamf3>=0.5.0
     libnotify
     libstartup-notification-1.0
-    nux-4.0>=4.0.4
+    nux-4.0>=4.0.5
     sigc++-2.0
     unity-misc>=0.4.0
     xpathselect=1.4

=== modified file 'debian/control'
--- debian/control	2013-12-02 19:08:01 +0000
+++ debian/control	2014-01-03 17:07:12 +0000
@@ -36,7 +36,7 @@
                libnih-dbus-dev,
                libnih-dev,
                libnotify-dev,
-               libnux-4.0-dev (>= 4.0.4),
+               libnux-4.0-dev (>= 4.0.5),
                libpango1.0-dev,
                libsigc++-2.0-dev,
                libstartup-notification0-dev,
@@ -148,7 +148,7 @@
          libunity-core-6.0-8 (= ${binary:Version}),
          libglib2.0-dev,
          libsigc++-2.0-dev,
-         libnux-4.0-dev (>= 4.0.4),
+         libnux-4.0-dev (>= 4.0.5),
          libunity-dev (>= 7.1.0~),
          libdee-dev,
 Description: Core library for the Unity interface - development files

=== modified file 'tests/autopilot/unity/tests/xim/test_gcin.py'
--- tests/autopilot/unity/tests/xim/test_gcin.py	2013-02-04 19:54:47 +0000
+++ tests/autopilot/unity/tests/xim/test_gcin.py	2014-01-03 17:07:12 +0000
@@ -30,10 +30,6 @@
         if 'gcin' not in running_process:
             self.skip("gcin is not an active process, please start 'gcin' before running these tests.")
 
-        if 'ibus' in running_process:
-            self.skip("IBus is currently running, please close 'ibus-daemon' before running these tests.")
-
-
 class GcinTestHangul(GcinTestCase):
     """Tests the Dash and Hud with gcin in hangul mode."""