From 3defc30e1225061ae5ca216f288c5cf6c669e3cf Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 4 Apr 2018 15:41:31 +0200 Subject: [PATCH 1/5] macosx.pkgproj; This is a .cmake preprocessed file --- admin/osx/CMakeLists.txt | 2 +- admin/osx/{macosx.pkgproj => macosx.pkgproj.cmake} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename admin/osx/{macosx.pkgproj => macosx.pkgproj.cmake} (100%) diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt index 75e0abfc2..301491470 100644 --- a/admin/osx/CMakeLists.txt +++ b/admin/osx/CMakeLists.txt @@ -13,6 +13,6 @@ endif() find_package(Qt5 5.6 COMPONENTS Core REQUIRED) configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh) -configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj) +configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj) configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh) configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh) diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj.cmake similarity index 100% rename from admin/osx/macosx.pkgproj rename to admin/osx/macosx.pkgproj.cmake From a0e17ce2214b149d21f451580f79f2c84a3e0d10 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 4 Apr 2018 15:46:16 +0200 Subject: [PATCH 2/5] create_mac.sh: Also name properly in source dir --- admin/osx/CMakeLists.txt | 2 +- admin/osx/{create_mac_pkg.sh.cmake => create_mac.sh.cmake} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename admin/osx/{create_mac_pkg.sh.cmake => create_mac.sh.cmake} (100%) diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt index 301491470..83b572a9e 100644 --- a/admin/osx/CMakeLists.txt +++ b/admin/osx/CMakeLists.txt @@ -12,7 +12,7 @@ else() endif() find_package(Qt5 5.6 COMPONENTS Core REQUIRED) -configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh) +configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh) configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj) configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh) configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh) diff --git a/admin/osx/create_mac_pkg.sh.cmake b/admin/osx/create_mac.sh.cmake similarity index 100% rename from admin/osx/create_mac_pkg.sh.cmake rename to admin/osx/create_mac.sh.cmake From 5667408c58b5c4e714e6a220b27c36f0a7ebf1b6 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 4 Apr 2018 16:23:18 +0200 Subject: [PATCH 3/5] macOS: Offer only standard installation in installer --- admin/osx/macosx.pkgproj.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/osx/macosx.pkgproj.cmake b/admin/osx/macosx.pkgproj.cmake index 927ca92df..2c9b885a6 100644 --- a/admin/osx/macosx.pkgproj.cmake +++ b/admin/osx/macosx.pkgproj.cmake @@ -579,7 +579,9 @@ INSTALLATION TYPE - 0 + 1 + MODE + 1 INSTALLATION_STEPS From 16bf765818dfcdb44ddb951c442e064e042e284a Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 4 Apr 2018 16:45:42 +0200 Subject: [PATCH 4/5] macOS: Don't hardcode path in Installer source --- admin/osx/macosx.pkgproj.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/osx/macosx.pkgproj.cmake b/admin/osx/macosx.pkgproj.cmake index 2c9b885a6..0552e1c32 100644 --- a/admin/osx/macosx.pkgproj.cmake +++ b/admin/osx/macosx.pkgproj.cmake @@ -701,7 +701,7 @@ BUILD_PATH PATH - ../install/. + @CMAKE_INSTALL_PREFIX@/. PATH_TYPE 3 From 4ddbb35d776888bb4deef7bcdd4f6fc256258f8e Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 5 Jun 2018 10:35:59 +0200 Subject: [PATCH 5/5] Fix debian patch Signed-off-by: Roeland Jago Douma --- admin/linux/debian/debian.xenial/post-patches/qt5.5.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch index 57d7f83b4..91dc9e7e1 100644 --- a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch +++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch @@ -19,6 +19,6 @@ diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/ -find_package(Qt5 5.6 COMPONENTS Core REQUIRED) +find_package(Qt5 5.5 COMPONENTS Core REQUIRED) - configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh) - configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj) + configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh) + configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj) configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)