Merge lp:~zeller-benjamin/ubuntu-sdk-ide/add-fcitx into lp:ubuntu-sdk-ide

[Benjamin Zeller]

Add fcitx-qt5 platforminputcontext plugin

Add fcitx-qt5 platforminputcontext plugin

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-12 11:49:24 +0000
+++ CMakeLists.txt	2016-01-26 10:46:29 +0000
@@ -65,6 +65,27 @@
   INSTALL_COMMAND   sh -c "LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make install"
 )
 
+SET (FCITX_PREFIX "${CMAKE_BINARY_DIR}/fcitx-qt-build")
+ConcatStrings (FCITX_BUILD_SCRIPT
+  "${CMAKE_COMMAND} "
+  "-DCMAKE_INSTALL_PREFIX=${QT_INSTALL_DIR} "
+  "-DCMAKE_PREFIX_PATH=${QT_INSTALL_DIR} "
+  "-DUSE_QT5=true "
+  "-DCMAKE_BUILD_TYPE=RelWithDebInfo "
+  "-DCMAKE_INSTALL_LIBDIR=lib ${FCITX_PREFIX}/fcitx-qt"
+)
+ExternalProject_Add(fcitx-qt5
+  DEPENDS ${QT_VERSION}
+  PREFIX      "${FCITX_PREFIX}"
+  SOURCE_DIR  "${FCITX_PREFIX}/fcitx-qt"
+  BINARY_DIR  "${FCITX_PREFIX}/build"
+  INSTALL_DIR "${QT_INSTALL_DIR}"
+  DOWNLOAD_COMMAND  sh -c "bzr branch lp:ubuntu/wily-proposed/fcitx-qt5 ${FCITX_PREFIX}/fcitx-qt -Ossl.cert_reqs=none --use-existing-dir"
+  CONFIGURE_COMMAND sh -c "${FCITX_BUILD_SCRIPT}"
+  BUILD_COMMAND     sh -c "LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib VERBOSE=1 make ${GENERATED_MAKE_FLAGS}"
+  INSTALL_COMMAND   sh -c "LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib VERBOSE=1 make install"
+)
+
 SET (APPMENU_PREFIX "${CMAKE_BINARY_DIR}/appmenu-qt5-build")
 ExternalProject_Add(appmenu-qt5
   DEPENDS libdbusmenu-qt

=== modified file 'debian/control'
--- debian/control	2016-01-12 12:08:57 +0000
+++ debian/control	2016-01-26 10:46:29 +0000
@@ -68,7 +68,10 @@
                zlib1g-dev,
                liblttng-ust-dev,
                libbotan1.10-dev,
-               libboost-regex-dev
+               libboost-regex-dev,
+               extra-cmake-modules (>= 1.4.0),
+               fcitx-libs-dev (>= 1:4.2.8),
+               intltool,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-sdk-ide
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging changes,

=== modified file 'patch-qt.cmake'
--- patch-qt.cmake	2015-11-26 14:13:36 +0000
+++ patch-qt.cmake	2016-01-26 10:46:29 +0000
@@ -2,8 +2,7 @@
   EXECUTE_PROCESS(
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
     COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtfeedback-opensource-src_5.0~git20130529-0ubuntu11.dsc \\
-                   && mv qtfeedback-opensource-src-* qtfeedback \\
-                   && mkdir -p qtfeedback/.git"
+                   && mv qtfeedback-opensource-src-* qtfeedback"
     RESULT_VARIABLE command_result
   )
 
@@ -16,8 +15,7 @@
   EXECUTE_PROCESS(
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
     COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtpim-opensource-src_5.0~git20140515~29475884-0ubuntu11.dsc \\
-                   && mv qtpim-opensource-src-* qtpim \\
-                   && mkdir -p qtpim/.git"
+                   && mv qtpim-opensource-src-* qtpim"
     RESULT_VARIABLE command_result
   )
 
@@ -38,3 +36,13 @@
     message(SEND_ERROR "Fetching ubuntu-sdk failed")
   endif()
 endif()
+
+EXECUTE_PROCESS(
+  WORKING_DIRECTORY "${QT_SOURCE_DIR}"
+  COMMAND sh -c "for i in $(ls -d qt*/); do mkdir -p $i/.git; done"
+  RESULT_VARIABLE command_result
+)
+
+if (NOT ${command_result} EQUAL 0)
+  message(SEND_ERROR "Enabling git build failed")
+endif()