From b05e128624d7f0dfb0bbe8c80d446891bd293215 Mon Sep 17 00:00:00 2001
From: Benjamin Zeller <benjamin.zeller@canonical.com>
Date: Thu, 17 Mar 2016 15:43:26 +0100
Subject: [PATCH] Fix some build issues

---
 CMakeLists.txt               |  2 +-
 patch-qt.cmake               |  8 ++++----
 patches/qt-enable-uitk.patch | 19 ++++++-------------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9204ddc73..d71fc30b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ ExternalProject_Add(${QT_VERSION}
   INSTALL_DIR "${QT_INSTALL_DIR}"
   DOWNLOAD_COMMAND  sh -c "bzr branch lp:~bzoltan/+junk/qt-everywhere-opensource-src-5.6.0 ${QT_SOURCE_DIR} -Ossl.cert_reqs=none --use-existing-dir"
   UPDATE_COMMAND    sh -c "exit 0"
-  PATCH_COMMAND     sh -c "${CMAKE_COMMAND} -DQT_SOURCE_DIR=\"${QT_SOURCE_DIR}\" -DCMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\" -P ${CMAKE_SOURCE_DIR}/patch-qt.cmake"
+  PATCH_COMMAND     sh -c "${CMAKE_COMMAND} -DQT_SOURCE_DIR=\"${QT_SOURCE_DIR}\" -DSOURCE_DIR=\"${CMAKE_SOURCE_DIR}\" -P ${CMAKE_SOURCE_DIR}/patch-qt.cmake"
   CONFIGURE_COMMAND sh -c "${QT_SOURCE_DIR}/configure -prefix ${QT_INSTALL_DIR} `cat ${CMAKE_SOURCE_DIR}/qt5config`"
   BUILD_COMMAND     sh -c "make ${GENERATED_MAKE_FLAGS}"
   INSTALL_COMMAND   sh -c "make install"
diff --git a/patch-qt.cmake b/patch-qt.cmake
index 6c9a22348..7b578c62b 100644
--- a/patch-qt.cmake
+++ b/patch-qt.cmake
@@ -1,19 +1,19 @@
 if (NOT EXISTS "${QT_SOURCE_DIR}/qtfeedback")
   EXECUTE_PROCESS(
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
-    COMMAND sh -c "${CMAKE_SOURCE_DIR}/get_package_source.py qtfeedback"
+    COMMAND sh -c "${SOURCE_DIR}/get_package_source.py qtfeedback-opensource-src && mv qtfeedback-opensource-src qtfeedback"
     RESULT_VARIABLE command_result
   )
 
   if (NOT ${command_result} EQUAL 0)
-    message(SEND_ERROR "Fetching qtfeedback failed")
+    message(SEND_ERROR "Fetching qtfeedback-opensource-src failed")
   endif()
 endif()
 
 if (NOT EXISTS "${QT_SOURCE_DIR}/qtpim")
   EXECUTE_PROCESS(
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
-    COMMAND sh -c "${CMAKE_SOURCE_DIR}/get_package_source.py qtpim"
+    COMMAND sh -c "${SOURCE_DIR}/get_package_source.py qtpim-opensource-src && mv qtpim-opensource-src qtpim"
     RESULT_VARIABLE command_result
   )
 
@@ -27,7 +27,7 @@ if (NOT EXISTS "${QT_SOURCE_DIR}/ubuntu-sdk")
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
 #    COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit/staging ubuntu-sdk -Ossl.cert_reqs=none \\
     COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit/staging ubuntu-sdk -Ossl.cert_reqs=none \\
-                   && patch -p0 < ${CMAKE_SOURCE_DIR}/patches/qt-enable-uitk.patch \\
+                   && cat ${SOURCE_DIR}/patches/qt-enable-uitk.patch >> ${QT_SOURCE_DIR}/.gitmodules \\
                    && mkdir -p ubuntu-sdk/.git"
     RESULT_VARIABLE command_result
   )
diff --git a/patches/qt-enable-uitk.patch b/patches/qt-enable-uitk.patch
index 921a89711..9ee06932a 100644
--- a/patches/qt-enable-uitk.patch
+++ b/patches/qt-enable-uitk.patch
@@ -1,14 +1,7 @@
-=== modified file '.gitmodules'
---- .gitmodules 2016-03-10 12:57:26 +0000
-+++ .gitmodules 2016-03-16 11:24:22 +0000
-@@ -342,3 +342,9 @@
-        branch = 5.6
-        status = addon
-        project = qmlcompiler.pro
-+[submodule "ubuntu-sdk"]
-+       depends = qtdeclarative qtfeedback qtpim
-+       path = ubuntu-sdk
-+       branch = 5.6
-+       status = addon
-+       project = ubuntu-sdk.pro
+[submodule "ubuntu-sdk"]
+       depends = qtdeclarative qtfeedback qtpim
+       path = ubuntu-sdk
+       branch = 5.6
+       status = addon
+       project = ubuntu-sdk.pro