From 549abc8c90b590acda636a1a666c2ab9873d553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Thu, 1 Feb 2018 19:22:46 +0100 Subject: [PATCH] Build Xenial with Qt 5.5 --- .../debian/debian.xenial/post-patches/qt5.5.patch | 13 +++++++++++++ admin/linux/debian/drone-build.sh | 8 ++++++++ admin/linux/debian/scripts/create_debdir.sh | 9 +++++++++ 3 files changed, 30 insertions(+) create mode 100644 admin/linux/debian/debian.xenial/post-patches/qt5.5.patch diff --git a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch new file mode 100644 index 000000000..812d3e1ae --- /dev/null +++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch @@ -0,0 +1,13 @@ +Binary files nextcloud-client-2.4.0.orig/.git/index and nextcloud-client-2.4.0/.git/index differ +diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/src/CMakeLists.txt +--- nextcloud-client-2.4.0.orig/src/CMakeLists.txt 2018-02-01 19:16:38.461162563 +0100 ++++ nextcloud-client-2.4.0/src/CMakeLists.txt 2018-02-01 19:20:20.253824030 +0100 +@@ -4,7 +4,7 @@ + + set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) + +-find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent REQUIRED) ++find_package(Qt5 5.5 COMPONENTS Core Network Xml Concurrent REQUIRED) + if (Qt5Core_VERSION VERSION_LESS 5.9.0) + message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.") + endif() diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index e50861da7..05fdc1a25 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -70,6 +70,14 @@ for distribution in xenial artful bionic stable; do else cat admin/linux/debian/debian/changelog >> debian/changelog fi + + for p in debian/post-patches/*.patch; do + if test -f "${p}"; then + echo "Applying ${p}" + patch -p1 < "${p}" + fi + done + fullver=`head -1 debian/changelog | sed "s:nextcloud-client (\([^)]*\)).*:\1:"` EDITOR=true dpkg-source --commit . local-changes diff --git a/admin/linux/debian/scripts/create_debdir.sh b/admin/linux/debian/scripts/create_debdir.sh index 99209b690..f95da484a 100755 --- a/admin/linux/debian/scripts/create_debdir.sh +++ b/admin/linux/debian/scripts/create_debdir.sh @@ -75,6 +75,15 @@ if test -d "${scriptdir}/../debian.${distribution}"; then tar cf - -C "${scriptdir}/../debian.${distribution}" . | tar xf - -C "${packagedir}/debian" fi +pushd "${packagedir}" +for p in debian/post-patches/*.patch; do + if test -f "${p}"; then + echo "Applying ${p}" + patch -p1 < "${p}" + fi +done +popd + "${scriptdir}/git2changelog.py" /tmp/git2changelog "${distribution}" mv "${packagedir}/debian/changelog" "${packagedir}/debian/changelog.old" cat /tmp/git2changelog "${packagedir}/debian/changelog.old" > "${packagedir}/debian/changelog"