Merge lp:~xnox/ubuntu-keyboard/libpinyin4 into lp:ubuntu-keyboard

[Dimitri John Ledkov]

Port to libpinyin4-dev API. (LP: #1247840)

Port to libpinyin4-dev API. (LP: #1247840)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/32/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/204/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/209/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/37/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/209/rebuild

review: Needs Fixing (continuous-integration)

[Dimitri John Ledkov (xnox)]

99 trunk merges borked lp:ubuntu-keyboard

- depends on gdb, yet gdb build-dep is not declared
- depends on running dbus, which is not available in sbuild/chroot.

[Dimitri John Ledkov (xnox)]

Also reported https://bugs.launchpad.net/ubuntu-ci-services-itself/+bug/1247992 the upstream merger is build this package with trusty-proposed enabled.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/ubuntu-keyboard/libpinyin4/+merge/193859/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/210/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/38/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/210/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:100
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/ubuntu-keyboard/libpinyin4/+merge/193859/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/45/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/217/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/48/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/47/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/48

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/220/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

code looks good

[Günter Schwann (schwann)]

WARNING: bool MIMPluginManagerPrivate::loadPlugin(const QDir&, const QString&) Error loading plugin from "/usr/lib/maliit/plugins/libubuntu-keyboard-plugin.so" "Cannot load library /usr/lib/maliit/plugins/libubuntu-keyboard-plugin.so: (libpinyin.so.4: cannot open shared object file: No such file or directory)"

So I was able to install the package, without needing to upgrade to the new version of libpinyin4

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

From the package information, it clearly states that libpinyin4 is a dependency. Please check that you have correctly installed all produced packages and their dependencies.

dpkg-deb -I ubuntu-keyboard_0.99.trunk.phablet2+14.04.20131105.1-0ubuntu1_armhf.deb
 new debian package, version 2.0.
 size 224694 bytes: control archive=1035 bytes.
      32 bytes, 1 lines conffiles
    1339 bytes, 20 lines control
     244 bytes, 3 lines md5sums
 Package: ubuntu-keyboard
 Version: 0.99.trunk.phablet2+14.04.20131105.1-0ubuntu1
 Architecture: armhf
 Maintainer: Ubuntu Developers <email address hidden>
 Installed-Size: 713
 Depends: maliit-framework (>= 0.99.0+git20130615+97e8335-0ubuntu3), qtdeclarative5-window-plugin, ubuntu-keyboard-data (>= 0.99.trunk.phablet2+14.04.20131105.1-0ubuntu1), libc6 (>= 2.4), libgcc1 (>= 1:4.4.0), libglib2.0-0 (>= 2.12.0), libgsettings-qt1, libhunspell-1.3-0, libmaliit-plugins0, libpinyin4 (>= 0.9.93), libpresage1 (>= 0.8.3), libqt5core5 (>= 5.0.2), libqt5gui5 (>= 5.0.2), libqt5network5 (>= 5.0.2), libqt5qml5, libqt5quick5, libstdc++6 (>= 4.4.0), libubuntu-application-api1 (>= 0.18.1daily13.06.21)

[Günter Schwann (schwann)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-autolanding/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-autolanding/24
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-autolanding/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-autolanding/24

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/71

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/243/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-11-07 16:07:36 +0000
+++ debian/control	2013-11-12 23:09:13 +0000
@@ -10,7 +10,7 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libhunspell-dev,
-               libpinyin2-dev,
+               libpinyin4-dev,
                libplatform-api1-dev,
                libpresage-dev,
                libxml2-utils,

=== modified file 'src/lib/logic/pinyinadapter.cpp'
--- src/lib/logic/pinyinadapter.cpp	2013-08-19 20:44:22 +0000
+++ src/lib/logic/pinyinadapter.cpp	2013-11-12 23:09:13 +0000
@@ -57,8 +57,8 @@
     std::cout << std::endl;
 #endif
 
-    m_array = g_array_new(FALSE, FALSE, sizeof(lookup_candidate_t));
-    pinyin_get_candidates(m_instance, 0, m_array);
+
+    pinyin_guess_candidates(m_instance, 0);
 
     pinyin_guess_sentence(m_instance);
 
@@ -66,16 +66,20 @@
     pinyin_get_sentence(m_instance, &sentence);
 
     candidates.clear();
-    for (unsigned int i = 0 ; i < m_array->len; i ++ )
+    guint len = 0;
+    pinyin_get_n_candidate(m_instance, &len);
+    for (unsigned int i = 0 ; i < len; i ++ )
     {
-        lookup_candidate_t token = g_array_index(m_array, lookup_candidate_t, i);
-        char* word = NULL;
+        lookup_candidate_t * candidate = NULL;
+	pinyin_get_candidate(m_instance, i, &candidate);
+
+        const char* word = NULL;
+	pinyin_get_candidate_string(m_instance, candidate, &word);
+
         // Translate the token to utf-8 phrase.
-        pinyin_translate_token(m_instance, token.m_token, &word);
         if (word) {
             candidates.append(QString(word));
         }
-        g_free(word);
     }
 
     QString unicode(sentence);
@@ -91,7 +95,10 @@
 void PinyinAdapter::wordCandidateSelected(const QString& word)
 {
     Q_UNUSED(word)
-    pinyin_choose_candidate(m_instance, 0, &g_array_index(m_array, lookup_candidate_t, 1));
+
+    lookup_candidate_t * candidate = NULL;
+    pinyin_get_candidate(m_instance, 1, &candidate);
+    pinyin_choose_candidate(m_instance, 0, candidate);
 }
 
 void PinyinAdapter::reset()