[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmymoney] /: Update AppImage dependencies
From: Łukasz_Wojniłowicz <null () kde ! org>
Date: 2018-09-08 19:46:33
Message-ID: E1fyjBh-0000xi-2g () code ! kde ! org
[Download RAW message or body]
Git commit 0d52935b7237fa802cf55fb8aaed3c32465aaddd by Łukasz Wojniłowicz.
Committed on 08/09/2018 at 19:46.
Pushed by wojnilowicz into branch 'master'.
Update AppImage dependencies
M +9 -3 3rdparty/CMakeLists.txt
M +1 -1 3rdparty/ext_alkimia/CMakeLists.txt
M +1 -16 3rdparty/ext_applications/CMakeLists.txt
M +3 -3 3rdparty/ext_aqbanking/CMakeLists.txt
M +2 -2 3rdparty/ext_assuan2/CMakeLists.txt
M +5 -3 3rdparty/ext_boost/CMakeLists.txt
M +2 -2 3rdparty/ext_fontconfig/CMakeLists.txt
M +87 -78 3rdparty/ext_frameworks/CMakeLists.txt
D +0 -11 3rdparty/ext_frameworks/desktoptojson.diff
D +0 -32 3rdparty/ext_frameworks/ecm_install_to_share.diff
D +0 -144 3rdparty/ext_frameworks/kconfig.diff
D +0 -22 3rdparty/ext_frameworks/ki18n-appdatalocation.diff
D +0 -62 3rdparty/ext_frameworks/ki18n.diff
D +0 -14 3rdparty/ext_frameworks/kimageformats.diff
D +0 -15 3rdparty/ext_frameworks/kwidgetsaddons.diff
D +0 -53 3rdparty/ext_frameworks/kwindowsystem-x11.diff
M +1 -1 3rdparty/ext_freetype/CMakeLists.txt
M +2 -2 3rdparty/ext_gettext/CMakeLists.txt
M +2 -2 3rdparty/ext_gmp/CMakeLists.txt
M +2 -2 3rdparty/ext_gpgerror/CMakeLists.txt
M +2 -2 3rdparty/ext_gpgme/CMakeLists.txt
M +1 -1 3rdparty/ext_grantlee/CMakeLists.txt
M +4 -4 3rdparty/ext_gwenhywfar/CMakeLists.txt
A +20 -0 3rdparty/ext_ical/CMakeLists.txt
M +2 -2 3rdparty/ext_iconv/CMakeLists.txt
M +2 -2 3rdparty/ext_icu/CMakeLists.txt
M +1 -1 3rdparty/ext_kdiagram/CMakeLists.txt
M +2 -2 3rdparty/ext_ktoblzcheck/CMakeLists.txt
M +4 -4 3rdparty/ext_lzma/CMakeLists.txt
A +26 -0 3rdparty/ext_mysql/CMakeLists.txt
A +16 -0 3rdparty/ext_ncurses/CMakeLists.txt
M +4 -4 3rdparty/ext_ofx/CMakeLists.txt
M +2 -2 3rdparty/ext_opensp/CMakeLists.txt
M +1 -1 3rdparty/ext_phonon/CMakeLists.txt
M +4 -3 3rdparty/ext_png/CMakeLists.txt
M +3 -3 3rdparty/ext_qt/CMakeLists.txt
M +2 -2 3rdparty/ext_sqlcipher/CMakeLists.txt
A +19 -0 3rdparty/ext_sqlite/CMakeLists.txt
A +162 -0 3rdparty/ext_sqlite/sqlite.diff
M +2 -2 3rdparty/ext_tcl/CMakeLists.txt
M +4 -4 3rdparty/ext_xml/CMakeLists.txt
M +5 -4 3rdparty/ext_xmlsec1/CMakeLists.txt
M +2 -2 3rdparty/ext_xslt/CMakeLists.txt
M +1 -1 3rdparty/ext_zlib/CMakeLists.txt
M +8 -6 packaging/linux/appimage/build-deps.sh
https://commits.kde.org/kmymoney/0d52935b7237fa802cf55fb8aaed3c32465aaddd
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index cd1ed74a0..9f764530e 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -39,6 +39,8 @@ message( STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
set(GLOBAL_BUILD_TYPE RelWithDebInfo)
set(GLOBAL_PROFILE ${GLOBAL_PROFILE} -DBUILD_TESTING=false)
+# without --host=x86_64 gmp builds with optimizations for skylake and that prevents \
running KMyMoney on pre-skylake CPUs +set(GLOBAL_AUTOMAKE_PROFILE --host=x86_64 \
--disable-static --enable-shared)
set(SECURITY_EXE_LINKER_FLAGS "")
set(SECURITY_SHARED_LINKER_FLAGS "")
@@ -56,19 +58,22 @@ endif ()
# this list must be dependency-ordered
add_subdirectory( ext_iconv )
+add_subdirectory( ext_icu )
add_subdirectory( ext_xml )
add_subdirectory( ext_gettext )
add_subdirectory( ext_zlib )
-add_subdirectory( ext_boost )
+add_subdirectory( ext_lzma )
add_subdirectory( ext_png )
-add_subdirectory( ext_icu )
+add_subdirectory( ext_boost )
add_subdirectory( ext_xslt )
-add_subdirectory( ext_lzma )
add_subdirectory( ext_fontconfig)
add_subdirectory( ext_freetype)
add_subdirectory( ext_qt )
add_subdirectory( ext_phonon )
add_subdirectory( ext_frameworks )
+add_subdirectory( ext_sqlite )
+add_subdirectory( ext_ncurses )
+add_subdirectory( ext_mysql )
add_subdirectory( ext_grantlee )
add_subdirectory( ext_applications )
add_subdirectory( ext_gmp )
@@ -85,3 +90,4 @@ add_subdirectory( ext_tcl )
add_subdirectory( ext_sqlcipher )
add_subdirectory( ext_opensp )
add_subdirectory( ext_ofx )
+add_subdirectory( ext_ical )
diff --git a/3rdparty/ext_alkimia/CMakeLists.txt \
b/3rdparty/ext_alkimia/CMakeLists.txt index ed91eda14..e2ade390e 100644
--- a/3rdparty/ext_alkimia/CMakeLists.txt
+++ b/3rdparty/ext_alkimia/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_alkimia "${EXTPREFIX}" )
+set(PREFIX_ext_alkimia "${EXTPREFIX}")
ExternalProject_Add(
ext_alkimia
diff --git a/3rdparty/ext_applications/CMakeLists.txt \
b/3rdparty/ext_applications/CMakeLists.txt index 221e65487..45133c178 100644
--- a/3rdparty/ext_applications/CMakeLists.txt
+++ b/3rdparty/ext_applications/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(EXTPREFIX_applications "${EXTPREFIX}" )
+set(EXTPREFIX_applications "${EXTPREFIX}")
ExternalProject_Add(
ext_akonadi
@@ -15,21 +15,6 @@ ExternalProject_Add(
DEPENDS ext_boost ext_xslt ext_kcompletion ext_kconfig ext_kconfigwidgets \
ext_kcoreaddons ext_kdbusaddons ext_ki18n ext_kiconthemes ext_kitemmodels \
ext_kitemviews ext_kio ext_kwidgetsaddons ext_kwindowsystem ext_kxmlgui ext_kcrash )
-ExternalProject_Add(
- ext_kholidays
- DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL https://download.kde.org/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz
- URL_MD5 7c2fecea0e6f5f2b9e1b6453b7c7c064
- INSTALL_DIR ${EXTPREFIX_applications}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_applications}
- -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
- ${GLOBAL_PROFILE}
- -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
- -DBUILD_TESTING=false
- UPDATE_COMMAND ""
- DEPENDS ext_extra_cmake_modules
-)
-
ExternalProject_Add(
ext_kpimtextedit
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
diff --git a/3rdparty/ext_aqbanking/CMakeLists.txt \
b/3rdparty/ext_aqbanking/CMakeLists.txt index c335a03d4..f54fd6d74 100644
--- a/3rdparty/ext_aqbanking/CMakeLists.txt
+++ b/3rdparty/ext_aqbanking/CMakeLists.txt
@@ -1,5 +1,5 @@
-SET(PREFIX_ext_aqbanking "${EXTPREFIX}" )
-SET(aqbanking_cppFlags "-L${INSTALL_ROOT}/lib -I${INSTALL_ROOT}/include" )
+set(PREFIX_ext_aqbanking "${EXTPREFIX}")
+set(aqbanking_cppFlags "-L${INSTALL_ROOT}/lib -I${INSTALL_ROOT}/include")
ExternalProject_Add(
ext_aqbanking
@@ -8,7 +8,7 @@ ExternalProject_Add(
URL_MD5 6aceeaad3a1000f22f08986e68946db3
INSTALL_DIR ${PREFIX_ext_aqbanking}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_aqbanking} \
CPPFLAGS=${aqbanking_cppFlags} + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_aqbanking} ${GLOBAL_AUTOMAKE_PROFILE} \
CPPFLAGS=${aqbanking_cppFlags} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_assuan2/CMakeLists.txt \
b/3rdparty/ext_assuan2/CMakeLists.txt index ee375dcb9..3445c28da 100644
--- a/3rdparty/ext_assuan2/CMakeLists.txt
+++ b/3rdparty/ext_assuan2/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_assuan2 "${EXTPREFIX}" )
+set(PREFIX_ext_assuan2 "${EXTPREFIX}")
ExternalProject_Add(
ext_assuan2
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 4354b7ae296894f232ada226a062d7d7
INSTALL_DIR ${PREFIX_ext_assuan2}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_assuan2}
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_assuan2} \
${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_boost/CMakeLists.txt b/3rdparty/ext_boost/CMakeLists.txt
index 1b82a5f64..f8182fdce 100644
--- a/3rdparty/ext_boost/CMakeLists.txt
+++ b/3rdparty/ext_boost/CMakeLists.txt
@@ -1,10 +1,12 @@
-SET(PREFIX_ext_boost "${EXTPREFIX}" )
+set(PREFIX_ext_boost "${EXTPREFIX}")
+# don't bump boost version without checking it with mysql
+# mysql e.g. needs exactly 1.67 and won't work with 1.68
ExternalProject_Add(
ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.tar.bz2
- URL_MD5 6095876341956f65f9d35939ccea1a9f
+ URL https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2
+ URL_MD5 ced776cb19428ab8488774e1415535ab
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.sh --prefix=${PREFIX_ext_boost} \
--with-libraries=system BUILD_COMMAND <SOURCE_DIR>/b2 -j${SUBMAKE_JOBS} install
diff --git a/3rdparty/ext_fontconfig/CMakeLists.txt \
b/3rdparty/ext_fontconfig/CMakeLists.txt index 6865e3a58..4a8a600b3 100644
--- a/3rdparty/ext_fontconfig/CMakeLists.txt
+++ b/3rdparty/ext_fontconfig/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_fontconfig "${EXTPREFIX}" )
+set(PREFIX_ext_fontconfig "${EXTPREFIX}")
ExternalProject_Add(
ext_fontconfig
@@ -6,7 +6,7 @@ ExternalProject_Add(
URL http://files.kde.org/krita/build/dependencies/fontconfig-2.12.0.tar.gz
URL_MD5 d8b056231abcb6257db6dc6d745360b2
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_fontconfig} \
${GLOBAL_AUTOMAKE_PROFILE} + CONFIGURE_COMMAND <SOURCE_DIR>/configure \
--prefix=${PREFIX_ext_fontconfig} ${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_frameworks/CMakeLists.txt \
b/3rdparty/ext_frameworks/CMakeLists.txt index 6650d9150..3167becdc 100644
--- a/3rdparty/ext_frameworks/CMakeLists.txt
+++ b/3rdparty/ext_frameworks/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
+set(EXTPREFIX_frameworks "${EXTPREFIX}")
#
# All needed frameworks:
# Tier 1
@@ -41,9 +41,8 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/extra-cmake-modules-5.44.0.zip
- URL_MD5 74aa8fc501e27024390b01c81f2925eb
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff + URL \
http://download.kde.org/stable/frameworks/5.50/extra-cmake-modules-5.50.0.zip + \
URL_MD5 9cbe6ed771c5375be5c79178039cff2c INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -56,8 +55,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/karchive-5.44.0.zip
- URL_MD5 c60a8e22b88cc7328610041638459689
+ URL http://download.kde.org/stable/frameworks/5.50/karchive-5.50.0.zip
+ URL_MD5 22e8576da06c1cc73ea2a58148ba5d62
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -71,8 +70,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcodecs
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kcodecs-5.44.0.zip
- URL_MD5 786f4a1870825c7df5934da35374b51c
+ URL http://download.kde.org/stable/frameworks/5.50/kcodecs-5.50.0.zip
+ URL_MD5 53c69b9fe7b3f7059e70fb104ffd15b4
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -86,9 +85,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kconfig-5.44.0.zip
- URL_MD5 d0223ea471bbf463ec42c2a2355a5183
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
+ URL http://download.kde.org/stable/frameworks/5.50/kconfig-5.50.0.zip
+ URL_MD5 c620f9af1ee9434c6e6aa70cc5174b29
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -102,8 +100,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kdbusaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kdbusaddons-5.44.0.zip
- URL_MD5 bee1d8ac4e6e87e3fe17ac7adba40b76
+ URL http://download.kde.org/stable/frameworks/5.50/kdbusaddons-5.50.0.zip
+ URL_MD5 4ed1e931764c7d9855ccf3920c1d7fdf
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -117,10 +115,9 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kcoreaddons-5.44.0.zip
- URL_MD5 16a7379f3e2941d1c19d6f80939f15e8
+ URL http://download.kde.org/stable/frameworks/5.50/kcoreaddons-5.50.0.zip
+ URL_MD5 0c1fbbad880b2c9dbf4cd94d1188c6c2
INSTALL_DIR ${EXTPREFIX_frameworks}
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff CMAKE_ARGS \
-DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
@@ -133,8 +130,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kguiaddons-5.44.0.zip
- URL_MD5 440eefbf5abcafc492dcf857f7e4eaf5
+ URL http://download.kde.org/stable/frameworks/5.50/kguiaddons-5.50.0.zip
+ URL_MD5 f4d2b282dd7d2232b6370d8b3ca6f01c
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -148,10 +145,9 @@ ExternalProject_Add(
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
- URL_MD5 333ab0a3f65a298e928d746144d4dc8e
+ URL http://download.kde.org/stable/frameworks/5.50/ki18n-5.50.0.zip
+ URL_MD5 98d7f984fe3d5ed462fc639b1a2630b6
INSTALL_DIR ${EXTPREFIX_frameworks}
- PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff CMAKE_ARGS \
-DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
@@ -164,8 +160,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kitemmodels-5.44.0.zip
- URL_MD5 ea43a5e2cc7033eb672796b108d7403b
+ URL http://download.kde.org/stable/frameworks/5.50/kitemmodels-5.50.0.zip
+ URL_MD5 09afdef2b07c45cbe94f4f34792c0ce9
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -179,8 +175,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kitemviews-5.44.0.zip
- URL_MD5 8b15c703313c7a790c7db897ef17de7d
+ URL http://download.kde.org/stable/frameworks/5.50/kitemviews-5.50.0.zip
+ URL_MD5 4ca143b90c5e93de3074e7a8a9e436e6
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -194,10 +190,9 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kwidgetsaddons-5.44.0.zip
- URL_MD5 a9911d8d0f8aaf7a7afd84c41c8f80a1
+ URL http://download.kde.org/stable/frameworks/5.50/kwidgetsaddons-5.50.0.zip
+ URL_MD5 64f4383ad1cbab14065e545d30b3b428
INSTALL_DIR ${EXTPREFIX_frameworks}
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff CMAKE_ARGS \
-DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
@@ -210,10 +205,9 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kwindowsystem-5.44.0.zip
- URL_MD5 75329f47cf8cd413fa1d15a57c298563
+ URL http://download.kde.org/stable/frameworks/5.50/kwindowsystem-5.50.0.zip
+ URL_MD5 4b5fa2379c32db8bce754c845d3db5c4
INSTALL_DIR ${EXTPREFIX_frameworks}
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff CMAKE_ARGS \
-DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
@@ -226,8 +220,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_solid
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/solid-5.44.0.zip
- URL_MD5 2697e1633428a63c6dc1ce1a26dc5485
+ URL http://download.kde.org/stable/frameworks/5.50/solid-5.50.0.zip
+ URL_MD5 65ea4d68d26fe4110d35765e8e28ac94
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -241,8 +235,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_sonnet
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/sonnet-5.44.0.zip
- URL_MD5 6c59ade0268bffdb5af93af340aef5ee
+ URL http://download.kde.org/stable/frameworks/5.50/sonnet-5.50.0.zip
+ URL_MD5 fe566c442740fe206f56db0aace0648e
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -256,8 +250,23 @@ ExternalProject_Add(
ExternalProject_Add(
ext_syntaxhighlighting
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/syntax-highlighting-5.44.0.zip
- URL_MD5 3e2f0c93df9a779981f0379de1ede79e
+ URL http://download.kde.org/stable/frameworks/5.50/syntax-highlighting-5.50.0.zip
+ URL_MD5 dcf3e9de360bedf6b555ada21b4d0d20
+ INSTALL_DIR ${EXTPREFIX_frameworks}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
+ -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
+ ${GLOBAL_PROFILE}
+ -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
+ -DBUILD_TESTING=false
+ UPDATE_COMMAND ""
+ DEPENDS ext_extra_cmake_modules
+)
+
+ExternalProject_Add(
+ ext_kholidays
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://download.kde.org/stable/frameworks/5.50/kholidays-5.50.0.zip
+ URL_MD5 d4e466c7c7667a48f65f200640213608
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -271,8 +280,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kactivities
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kactivities-5.44.0.zip
- URL_MD5 3f9ce93d19efc0d9a1a16708b3b8b56a
+ URL http://download.kde.org/stable/frameworks/5.50/kactivities-5.50.0.zip
+ URL_MD5 a0e88228a5eca47584e702fff3eafea1
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -286,8 +295,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kauth
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kauth-5.44.0.zip
- URL_MD5 b77ecf084b227f0ac3118f6af775299c
+ URL http://download.kde.org/stable/frameworks/5.50/kauth-5.50.0.zip
+ URL_MD5 f8ac61528d29d19e3dcd6f2bb729ea2f
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -301,8 +310,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kcompletion-5.44.0.zip
- URL_MD5 0647885a702c338a1b656eb4f311ad16
+ URL http://download.kde.org/stable/frameworks/5.50/kcompletion-5.50.0.zip
+ URL_MD5 ae4005e9a91c233b69b6f23f1301891b
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -316,8 +325,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kcrash-5.44.0.zip
- URL_MD5 61adc0e125c65288968d958acf25f4aa
+ URL http://download.kde.org/stable/frameworks/5.50/kcrash-5.50.0.zip
+ URL_MD5 2e13f654cd42e71870f1b5b3c74854af
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -331,8 +340,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kjobwidgets
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kjobwidgets-5.44.0.zip
- URL_MD5 0297d9655c85309bc85c0f7ff50fdb72
+ URL http://download.kde.org/stable/frameworks/5.50/kjobwidgets-5.50.0.zip
+ URL_MD5 544e060ff637ce65a1576647220019ba
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -346,8 +355,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_knotifications
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/knotifications-5.44.0.zip
- URL_MD5 c94e747cb1184f91aa084047e5c41d61
+ URL http://download.kde.org/stable/frameworks/5.50/knotifications-5.50.0.zip
+ URL_MD5 264b797f6403c706b2ef22d5306da71f
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -361,8 +370,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kpackage
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kpackage-5.44.0.zip
- URL_MD5 bab368ead50a516cd4f2dce1157415af
+ URL http://download.kde.org/stable/frameworks/5.50/kpackage-5.50.0.zip
+ URL_MD5 78603b21512ca81a246aa90da0ce25a4
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -376,8 +385,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfigwidgets
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kconfigwidgets-5.44.0.zip
- URL_MD5 46e2c1b755b6ee4f932a609451f32b42
+ URL http://download.kde.org/stable/frameworks/5.50/kconfigwidgets-5.50.0.zip
+ URL_MD5 e8671eda534abbc31afe7f4d60c3c0dd
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -391,8 +400,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kiconthemes
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kiconthemes-5.44.0.zip
- URL_MD5 080541d989b2a816c17a41339b9d35b3
+ URL http://download.kde.org/stable/frameworks/5.50/kiconthemes-5.50.0.zip
+ URL_MD5 5962649eeb7fa6dac32f55f5e0a791b7
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -406,8 +415,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kservice
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kservice-5.44.0.zip
- URL_MD5 62950b073eee9ad99a9eb73d2439b655
+ URL http://download.kde.org/stable/frameworks/5.50/kservice-5.50.0.zip
+ URL_MD5 d1ec9d1e8a8df544d15c8d2cc23c2c12
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -421,8 +430,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kemoticons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kemoticons-5.44.0.zip
- URL_MD5 73dd274ea43acf4abe8bc9e5556180f7
+ URL http://download.kde.org/stable/frameworks/5.50/kemoticons-5.50.0.zip
+ URL_MD5 7997898a22629365a3aad2690931ce2a
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -436,8 +445,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_ktextwidgets
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/ktextwidgets-5.44.0.zip
- URL_MD5 d5e7f26038efeec17069ad7a231f2e13
+ URL http://download.kde.org/stable/frameworks/5.50/ktextwidgets-5.50.0.zip
+ URL_MD5 3626fbcb9754642b38328858b1a712ce
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -451,8 +460,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kglobalaccel
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kglobalaccel-5.44.0.zip
- URL_MD5 dabfff26dbed4494754f7327fadd3cf0
+ URL http://download.kde.org/stable/frameworks/5.50/kglobalaccel-5.50.0.zip
+ URL_MD5 2757ca2ca8972996e99f6681fc36d632
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -466,8 +475,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kxmlgui
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kxmlgui-5.44.0.zip
- URL_MD5 b89499ffee5c768e87d4db20829467bd
+ URL http://download.kde.org/stable/frameworks/5.50/kxmlgui-5.50.0.zip
+ URL_MD5 7b218d41e1befd6d5e96ef0962a8e3c5
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -481,8 +490,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kbookmarks
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kbookmarks-5.44.0.zip
- URL_MD5 fd78c7fd52c324b919c878a7a3d0d887
+ URL http://download.kde.org/stable/frameworks/5.50/kbookmarks-5.50.0.zip
+ URL_MD5 52c78fd70ab9e52fbf41c99fa80bd2c7
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -496,8 +505,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kio
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kio-5.44.0.zip
- URL_MD5 44b6d7eaa9d56a0dd171e7c1f8cf7efe
+ URL http://download.kde.org/stable/frameworks/5.50/kio-5.50.0.zip
+ URL_MD5 483942f59e711d5e5111ec134520bfd2
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -511,8 +520,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kdeclarative
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kdeclarative-5.44.0.zip
- URL_MD5 1b66d349365c586d4b67ceaf5fa35071
+ URL http://download.kde.org/stable/frameworks/5.50/kdeclarative-5.50.0.zip
+ URL_MD5 d42cdb63906e25815833fc1b09cccc64
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -526,8 +535,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcmutils
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kcmutils-5.44.0.zip
- URL_MD5 920c1922396592be54002f84b4f1a816
+ URL http://download.kde.org/stable/frameworks/5.50/kcmutils-5.50.0.zip
+ URL_MD5 2867e17182c70aaa6be7669c7bb6fcc0
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -541,8 +550,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwallet
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kwallet-5.44.0.zip
- URL_MD5 7d8022a521208ece7d4d6ec8291ea377
+ URL http://download.kde.org/stable/frameworks/5.50/kwallet-5.50.0.zip
+ URL_MD5 24ff926a481cffa577eb412f9f8272c1
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
@@ -556,10 +565,9 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://download.kde.org/stable/frameworks/5.44/kimageformats-5.44.0.zip
- URL_MD5 02a98b682f9cb655592148d7ebcc05e7
+ URL http://download.kde.org/stable/frameworks/5.50/kimageformats-5.50.0.zip
+ URL_MD5 a209517d29e4f762abb5fb9c636c5d48
INSTALL_DIR ${EXTPREFIX_frameworks}
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff CMAKE_ARGS \
-DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
@@ -568,3 +576,4 @@ ExternalProject_Add(
UPDATE_COMMAND ""
DEPENDS ext_kitemviews
)
+
diff --git a/3rdparty/ext_frameworks/desktoptojson.diff \
b/3rdparty/ext_frameworks/desktoptojson.diff deleted file mode 100644
index 574e86875..000000000
--- a/3rdparty/ext_frameworks/desktoptojson.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/desktoptojson/CMakeLists.txt b/src/desktoptojson/CMakeLists.txt
-index dd668a4..424d14c 100644
---- a/src/desktoptojson/CMakeLists.txt
-+++ b/src/desktoptojson/CMakeLists.txt
-@@ -11,5 +11,5 @@ ecm_mark_nongui_executable(desktoptojson)
-
- target_link_libraries(desktoptojson Qt5::Core)
- target_compile_definitions(desktoptojson PRIVATE BUILDING_DESKTOPTOJSON_TOOL=1)
--
-+set_target_properties(desktoptojson PROPERTIES INSTALL_RPATH \
"${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/bin")
- install(TARGETS desktoptojson EXPORT KF5CoreAddonsToolingTargets \
${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/3rdparty/ext_frameworks/ecm_install_to_share.diff \
b/3rdparty/ext_frameworks/ecm_install_to_share.diff deleted file mode 100644
index b38eabbd8..000000000
--- a/3rdparty/ext_frameworks/ecm_install_to_share.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit a4170399404bf32e874e35d35f8a66703b2fff92
-Author: Boudewijn Rempt <boud@valdyas.org>
-Date: Sat Jul 30 14:33:10 2016 +0200
-
- Revert "Use "${BIN_INSTALL_DIR}/data" for DATAROOTDIR on Windows."
-
- This reverts commit 2503481e4537b88d76b4a596f519cb3311e1ca2a.
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index e84c0b3..1773706 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -489,15 +489,10 @@ _define_absolute(SHAREDSTATEDIR "com"
-
-
-
--if (WIN32)
-- _define_relative(DATAROOTDIR BINDIR "data"
-- "read-only architecture-independent data root"
-- SHARE_INSTALL_PREFIX)
--else()
-- _define_absolute(DATAROOTDIR "share"
-- "read-only architecture-independent data root"
-- SHARE_INSTALL_PREFIX)
--endif()
-+
-+_define_absolute(DATAROOTDIR "share"
-+ "read-only architecture-independent data root"
-+ SHARE_INSTALL_PREFIX)
-
- _define_relative(DATADIR DATAROOTDIR ""
- "read-only architecture-independent data"
diff --git a/3rdparty/ext_frameworks/kconfig.diff \
b/3rdparty/ext_frameworks/kconfig.diff deleted file mode 100644
index df589aa57..000000000
--- a/3rdparty/ext_frameworks/kconfig.diff
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
-index 3e0578f..6c4408d 100644
---- a/autotests/kconfigtest.cpp
-+++ b/autotests/kconfigtest.cpp
-@@ -587,7 +587,7 @@ void KConfigTest::testPathQtHome()
- qunsetenv("QT_CACHE_HOME");
- qunsetenv("QT_CONFIG_HOME");
- QVERIFY(group.hasKey("dataDir"));
-- QCOMPARE(group.readEntry("dataDir", QString()), \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation).append(QStringLiteral("/kconfigtest")));
-+ QCOMPARE(group.readEntry("dataDir", QString()), \
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).append(QStringLiteral("/kconfigtest")));
- QVERIFY(group.hasKey("cacheDir"));
- QCOMPARE(group.readEntry("cacheDir", QString()), \
QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation).append(QStringLiteral("/kconfigtest")));
- QVERIFY(group.hasKey("configDir"));
-diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp
-index fd4a5c9..db08f22 100644
---- a/autotests/kdesktopfiletest.cpp
-+++ b/autotests/kdesktopfiletest.cpp
-@@ -222,7 +222,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
- QVERIFY(QFile::exists(fileName));
- QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName));
-
-- const QString installedFile = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
-+ const QString installedFile = \
QStandardPaths::locate(QStandardPaths::AppDataLocation, \
QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
- if (!installedFile.isEmpty()) {
- QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile));
- } else {
-@@ -281,8 +281,8 @@ void KDesktopFileTest::testLocateLocal_data()
- {
- QString systemConfigLocation = \
QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last();
- QString writableConfigLocation = \
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
-- QString systemDataLocation = \
QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last();
-- QString writableDataLocation = \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-+ QString systemDataLocation = \
QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).last();
-+ QString writableDataLocation = \
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-
- QTest::addColumn<QString>("path");
- QTest::addColumn<QString>("result");
-diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp
-index 3353061..a80ae1e 100644
---- a/autotests/test_kconf_update.cpp
-+++ b/autotests/test_kconf_update.cpp
-@@ -625,7 +625,7 @@ void TestKConfUpdate::testScript()
-
- QSharedPointer<QTemporaryFile> updFile(writeUpdFile(updContent));
-
-- const QString scriptDir = \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + \
"/kconf_update";
-+ const QString scriptDir = \
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + \
"/kconf_update";
- QVERIFY(QDir().mkpath(scriptDir));
- QString scriptPath = scriptDir + "/test.sh";
- writeFile(scriptPath, updScript);
-diff --git a/docs/options.md b/docs/options.md
-index fab22e1..8823818 100644
---- a/docs/options.md
-+++ b/docs/options.md
-@@ -96,4 +96,4 @@ They are:
-
- * `$QT_CACHE_HOME` - QStandardPaths::GenericCacheLocation
- * `$QT_CONFIG_HOME` - QStandardPaths::GenericConfigLocation
--* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
-+* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
-diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
-index c8eb90a..18d1b69 100644
---- a/src/core/kconfig.cpp
-+++ b/src/core/kconfig.cpp
-@@ -229,7 +229,7 @@ QString KConfigPrivate::expandString(const QString &value)
- env = QString::fromLocal8Bit(pEnv.constData());
- } else {
- if (aVarName == QStringLiteral("QT_DATA_HOME")) {
-- env = \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-+ env = \
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
- } else if (aVarName == QStringLiteral("QT_CONFIG_HOME")) {
- env = \
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- } else if (aVarName == QStringLiteral("QT_CACHE_HOME")) {
-diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
-index b0b6a87..daddd54 100644
---- a/src/core/kdesktopfile.cpp
-+++ b/src/core/kdesktopfile.cpp
-@@ -88,7 +88,7 @@ QString KDesktopFile::locateLocal(const QString &path)
- }
- }
- // Relative to xdg data dir? (much more common)
-- Q_FOREACH (const QString &dir, \
QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) \
{
-+ Q_FOREACH (const QString &dir, \
QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
- if (path.startsWith(dir + plus)) {
- relativePath = path.mid(dir.length() + 1);
- }
-@@ -97,7 +97,7 @@ QString KDesktopFile::locateLocal(const QString &path)
- // What now? The desktop file doesn't come from XDG_DATA_DIRS. Use filename \
only and hope for the best.
- relativePath = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1);
- }
-- return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + \
QLatin1Char('/') + relativePath;
-+ return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + \
QLatin1Char('/') + relativePath;
- }
-
- bool KDesktopFile::isDesktopFile(const QString &path)
-@@ -134,7 +134,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
- }
- }
- const QString servicesDir = QStringLiteral("kservices5/"); // \
KGlobal::dirs()->xdgDataRelativePath("services")
-- Q_FOREACH (const QString &xdgDataPrefix, \
QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) \
{
-+ Q_FOREACH (const QString &xdgDataPrefix, \
QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
- if (QDir(xdgDataPrefix).exists()) {
- const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath();
- if (realPath.startsWith(prefix + QLatin1Char('/') + servicesDir, \
sensitivity)) {
-diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
-index ab7d946..eeaf6ca 100644
---- a/src/kconf_update/kconf_update.cpp
-+++ b/src/kconf_update/kconf_update.cpp
-@@ -125,7 +125,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser)
- m_bUseConfigInfo = false;
- if (parser->isSet(QStringLiteral("check"))) {
- m_bUseConfigInfo = true;
-- const QString file = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kconf_update/" + \
parser->value(QStringLiteral("check")));
-+ const QString file = \
QStandardPaths::locate(QStandardPaths::AppDataLocation, "kconf_update/" + \
parser->value(QStringLiteral("check")));
- if (file.isEmpty()) {
- qWarning("File '%s' not found.", \
parser->value(QStringLiteral("check")).toLocal8Bit().data());
- log() << "File '" << parser->value(QStringLiteral("check")) << "' \
passed on command line not found" << endl;
-@@ -177,7 +177,7 @@ KonfUpdate::log()
- {
- if (!m_textStream) {
- #if 0
-- QString dir = \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + \
QLatin1Char('/') + "kconf_update/log";
-+ QString dir = \
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') \
+ "kconf_update/log";
- QDir().mkpath(dir);
- QString file = dir + "/update.log";
- m_file = new QFile(file);
-@@ -206,7 +206,7 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
- {
- QStringList result;
-
-- const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, \
QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
-+ const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::AppDataLocation, \
QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
- Q_FOREACH (const QString &d, dirs) {
- const QDir dir(d);
-
-@@ -760,7 +760,7 @@ void KonfUpdate::gotScript(const QString &_script)
- return;
- }
-
-- QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("kconf_update/") + script);
-+ QString path = QStandardPaths::locate(QStandardPaths::AppDataLocation, \
QStringLiteral("kconf_update/") + script);
- if (path.isEmpty()) {
- if (interpreter.isEmpty()) {
- path = CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/kconf_update_bin/" + \
script;
diff --git a/3rdparty/ext_frameworks/ki18n-appdatalocation.diff \
b/3rdparty/ext_frameworks/ki18n-appdatalocation.diff deleted file mode 100644
index 7b548ef1d..000000000
--- a/3rdparty/ext_frameworks/ki18n-appdatalocation.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
-index c18d40f..b0ed09d 100644
---- a/src/kcatalog.cpp
-+++ b/src/kcatalog.cpp
-@@ -128,7 +128,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
- }
- }
-
-- QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-+ QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation,
- QStringLiteral("locale/") + relpath);
- QString localeDir;
- if (file.isEmpty()) {
-@@ -143,7 +143,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
- QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
- {
- QString domain = QFile::decodeName(domain_);
-- QStringList localeDirPaths = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
-+ QStringList localeDirPaths = \
QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
- QStringLiteral("locale"),
- QStandardPaths::LocateDirectory);
-
diff --git a/3rdparty/ext_frameworks/ki18n.diff b/3rdparty/ext_frameworks/ki18n.diff
deleted file mode 100644
index fdf19a06a..000000000
--- a/3rdparty/ext_frameworks/ki18n.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 178117e..497395d 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,11 +54,11 @@ if(MSVC)
- endif()
-
- add_definitions(-DTRANSLATION_DOMAIN=\"ki18n5\")
--if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-- ki18n_install(po)
--endif()
-+#if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-+# ki18n_install(po)
-+#endif()
- add_subdirectory(src)
--add_subdirectory(autotests)
-+#add_subdirectory(autotests)
-
- # create a Config.cmake and a ConfigVersion.cmake file and install them
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5I18n")
-diff --git a/cmake/KF5I18NMacros.cmake b/cmake/KF5I18NMacros.cmake
-index 53ba812..db8ea98 100755
---- a/cmake/KF5I18NMacros.cmake
-+++ b/cmake/KF5I18NMacros.cmake
-@@ -25,14 +25,9 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
--find_package(Gettext REQUIRED)
--find_package(PythonInterp REQUIRED)
--
--set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py)
--set(_ki18n_uic_script ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake)
--
- #create the implementation files from the ui files and add them to the list of \
sources
- #usage: KI18N_WRAP_UI(foo_SRCS ${ui_files})
-+set(_ki18n_uic_script ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake)
- macro (KI18N_WRAP_UI _sources )
- foreach (_current_FILE ${ARGN})
-
-@@ -57,6 +52,13 @@ macro (KI18N_WRAP_UI _sources )
- endforeach (_current_FILE)
- endmacro (KI18N_WRAP_UI)
-
-+find_package(Gettext)
-+find_package(PythonInterp)
-+
-+if (Gettext_FOUND AND PythonInterp_FOUND)
-+
-+set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py)
-+
- #install the scripts for a given language in the target folder
- #usage: KI18N_INSTALL_TS_FILES("ja" ${scripts_dir})
- function(KI18N_INSTALL_TS_FILES lang scripts_dir)
-@@ -225,3 +227,7 @@ function(_KI18N_GETTEXT_GET_UNIQUE_TARGET_NAME _name \
_unique_name)
- set_property(GLOBAL PROPERTY ${propertyName} ${currentCounter} )
- endfunction()
- # End of CMake copied code ####################################################
-+
-+else()
-+ message("Warning: Python and Gettext are needed for some functionality.")
-+endif() # Python and gettext found
diff --git a/3rdparty/ext_frameworks/kimageformats.diff \
b/3rdparty/ext_frameworks/kimageformats.diff deleted file mode 100644
index 306719437..000000000
--- a/3rdparty/ext_frameworks/kimageformats.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt
-index 0db2ae8..e78b55d 100644
---- a/src/imageformats/CMakeLists.txt
-+++ b/src/imageformats/CMakeLists.txt
-@@ -28,6 +28,9 @@ if(OpenEXR_FOUND)
- add_library(kimg_exr MODULE exr.cpp)
- target_link_libraries(kimg_exr Qt5::Gui OpenEXR::IlmImf)
- kde_target_enable_exceptions(kimg_exr PRIVATE)
-+ if (WIN32)
-+ add_definitions(-DOPENEXR_DLL)
-+ endif()
-
- install(TARGETS kimg_exr DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/)
- install(FILES exr.desktop DESTINATION \
${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
diff --git a/3rdparty/ext_frameworks/kwidgetsaddons.diff \
b/3rdparty/ext_frameworks/kwidgetsaddons.diff deleted file mode 100644
index 0c4fdb01f..000000000
--- a/3rdparty/ext_frameworks/kwidgetsaddons.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f7eb931..3f0f6d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,8 +39,8 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
- endif()
-
- add_subdirectory(src)
--add_subdirectory(autotests)
--add_subdirectory(tests)
-+#add_subdirectory(autotests)
-+#add_subdirectory(tests)
-
- # create a Config.cmake and a ConfigVersion.cmake file and install them
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5WidgetsAddons")
diff --git a/3rdparty/ext_frameworks/kwindowsystem-x11.diff \
b/3rdparty/ext_frameworks/kwindowsystem-x11.diff deleted file mode 100644
index b3620e15d..000000000
--- a/3rdparty/ext_frameworks/kwindowsystem-x11.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/kstartupinfo.cpp b/src/kstartupinfo.cpp
-index a97b8b5..0ae7e5b 100644
---- a/src/kstartupinfo.cpp
-+++ b/src/kstartupinfo.cpp
-@@ -493,7 +493,7 @@ bool KStartupInfo::sendStartupX(Display *disp_P, const \
KStartupInfoId &id_P,
- #ifdef KSTARTUPINFO_ALL_DEBUG
- qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
- #endif
-- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
-+ return true; // KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
- #else
- Q_UNUSED(disp_P)
- Q_UNUSED(data_P)
-@@ -548,7 +548,7 @@ bool KStartupInfo::sendChangeX(Display *disp_P, const \
KStartupInfoId &id_P,
- #ifdef KSTARTUPINFO_ALL_DEBUG
- qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
- #endif
-- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
-+ return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
- #else
- Q_UNUSED(disp_P)
- Q_UNUSED(data_P)
-@@ -580,7 +580,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const \
KStartupInfoId &id_P)
- #ifdef KSTARTUPINFO_ALL_DEBUG
- qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
- #endif
-- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
-+ return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
- #else
- Q_UNUSED(disp_P)
- return true;
-@@ -615,7 +615,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const \
KStartupInfoId &id_P,
- #ifdef KSTARTUPINFO_ALL_DEBUG
- qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
- #endif
-- return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
-+ return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg);
- #else
- Q_UNUSED(disp_P)
- Q_UNUSED(id_P)
-diff --git a/src/platforms/xcb/kwindowsystem.cpp \
b/src/platforms/xcb/kwindowsystem.cpp
-index 9d28704..603d9b2 100644
---- a/src/platforms/xcb/kwindowsystem.cpp
-+++ b/src/platforms/xcb/kwindowsystem.cpp
-@@ -196,7 +196,7 @@ bool NETEventFilter::nativeEventFilter(xcb_generic_event_t *ev)
- int old_number_of_desktops = numberOfDesktops();
- bool old_showing_desktop = showingDesktop();
- unsigned long m[ 5 ];
-- NETRootInfo::event(ev, m, 5);
-+ //NETRootInfo::event(ev, m, 5);
-
- if ((m[ PROTOCOLS ] & CurrentDesktop) && currentDesktop() != \
old_current_desktop) {
- emit s_q->currentDesktopChanged(currentDesktop());
diff --git a/3rdparty/ext_freetype/CMakeLists.txt \
b/3rdparty/ext_freetype/CMakeLists.txt index 026b34c99..83d303cd6 100644
--- a/3rdparty/ext_freetype/CMakeLists.txt
+++ b/3rdparty/ext_freetype/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_freetype "${EXTPREFIX}" )
+set(PREFIX_ext_freetype "${EXTPREFIX}")
ExternalProject_Add(
ext_freetype
diff --git a/3rdparty/ext_gettext/CMakeLists.txt \
b/3rdparty/ext_gettext/CMakeLists.txt index 99415e119..85197ea6b 100644
--- a/3rdparty/ext_gettext/CMakeLists.txt
+++ b/3rdparty/ext_gettext/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_gettext "${EXTPREFIX}" )
+set(PREFIX_ext_gettext "${EXTPREFIX}")
ExternalProject_Add(
ext_gettext
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 97e034cf8ce5ba73a28ff6c3c0638092
INSTALL_DIR ${PREFIX_ext_gettext}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} \
--disable-java --disable-native-java --disable-static --enable-shared --enable-nls \
--enable-c++ + CONFIGURE_COMMAND <SOURCE_DIR>/configure \
--prefix=${PREFIX_ext_gettext} ${GLOBAL_AUTOMAKE_PROFILE} --disable-java \
--disable-native-java --enable-nls --enable-c++ BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_gmp/CMakeLists.txt b/3rdparty/ext_gmp/CMakeLists.txt
index 550af3e38..6e6aeb272 100644
--- a/3rdparty/ext_gmp/CMakeLists.txt
+++ b/3rdparty/ext_gmp/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_gmp "${EXTPREFIX}" )
+set(PREFIX_ext_gmp "${EXTPREFIX}")
ExternalProject_Add(
ext_gmp
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 8ddbb26dc3bd4e2302984debba1406a5
INSTALL_DIR ${PREFIX_ext_gmp}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gmp} --enable-cxx
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gmp} \
${GLOBAL_AUTOMAKE_PROFILE} --enable-cxx BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_gpgerror/CMakeLists.txt \
b/3rdparty/ext_gpgerror/CMakeLists.txt index 1c993ee56..222a495b5 100644
--- a/3rdparty/ext_gpgerror/CMakeLists.txt
+++ b/3rdparty/ext_gpgerror/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_gpgerror "${EXTPREFIX}" )
+set(PREFIX_ext_gpgerror "${EXTPREFIX}")
ExternalProject_Add(
ext_gpgerror
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 ef3d928a5a453fa701ecc3bb22be1c64
INSTALL_DIR ${PREFIX_ext_gpgerror}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gpgerror}
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gpgerror} \
${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_gpgme/CMakeLists.txt b/3rdparty/ext_gpgme/CMakeLists.txt
index d84b93b2a..22b9e7144 100644
--- a/3rdparty/ext_gpgme/CMakeLists.txt
+++ b/3rdparty/ext_gpgme/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_gpgme "${EXTPREFIX}" )
+set(PREFIX_ext_gpgme "${EXTPREFIX}")
ExternalProject_Add(
ext_gpgme
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 129c46fb85a7ffa41e43345e48aee884
INSTALL_DIR ${PREFIX_ext_gpgme}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gpgme} \
--enable-languages=cpp,qt --disable-gpg-test + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_gpgme} ${GLOBAL_AUTOMAKE_PROFILE} --enable-languages=cpp,qt \
--disable-gpg-test BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_grantlee/CMakeLists.txt \
b/3rdparty/ext_grantlee/CMakeLists.txt index 7d4b61557..5d788c633 100644
--- a/3rdparty/ext_grantlee/CMakeLists.txt
+++ b/3rdparty/ext_grantlee/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_grantlee "${EXTPREFIX}" )
+set(PREFIX_ext_grantlee "${EXTPREFIX}")
ExternalProject_Add(
ext_grantlee
diff --git a/3rdparty/ext_gwenhywfar/CMakeLists.txt \
b/3rdparty/ext_gwenhywfar/CMakeLists.txt index 9d1167a4d..66c13d061 100644
--- a/3rdparty/ext_gwenhywfar/CMakeLists.txt
+++ b/3rdparty/ext_gwenhywfar/CMakeLists.txt
@@ -1,6 +1,6 @@
-SET(PREFIX_ext_gwenhywfar "${EXTPREFIX}" )
-SET(gwenhywfar_guis "qt5 cpp" )
-SET(gwenhywfar_cppflags "-L${INSTALL_ROOT}/lib -liconv" )
+set(PREFIX_ext_gwenhywfar "${EXTPREFIX}")
+set(gwenhywfar_guis "qt5 cpp")
+set(gwenhywfar_cppflags "-L${INSTALL_ROOT}/lib -liconv")
ExternalProject_Add(
ext_gwenhywfar
@@ -9,7 +9,7 @@ ExternalProject_Add(
URL_MD5 0744255cae68adca6dff81d3a9f3932d
INSTALL_DIR ${PREFIX_ext_gwenhywfar}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gwenhywfar} \
CPPFLAGS=${gwenhywfar_cppflags} --with-guis=${gwenhywfar_guis} --disable-static \
--enable-shared + CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gwenhywfar} \
${GLOBAL_AUTOMAKE_PROFILE} CPPFLAGS=${gwenhywfar_cppflags} \
--with-guis=${gwenhywfar_guis} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_ical/CMakeLists.txt b/3rdparty/ext_ical/CMakeLists.txt
new file mode 100644
index 000000000..abd8efd92
--- /dev/null
+++ b/3rdparty/ext_ical/CMakeLists.txt
@@ -0,0 +1,20 @@
+set(PREFIX_ext_ical "${EXTPREFIX}")
+
+ExternalProject_Add(
+ ext_ical
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://github.com/libical/libical/archive/v3.0.4.zip
+ URL_MD5 cafd73f1e8e55d8139394c99e8ca00b0
+
+ INSTALL_DIR ${PREFIX_ext_ical}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_ical}
+ -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
+ ${GLOBAL_PROFILE}
+ -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
+ -DBUILD_TESTING=false
+ -DUSE_BUILTIN_TZDATA=ON
+ -DICAL_UNIX_NEWLINE=OFF
+ -DICAL_GLIB=OFF
+ -DSHARED_ONLY=ON
+ UPDATE_COMMAND ""
+)
diff --git a/3rdparty/ext_iconv/CMakeLists.txt b/3rdparty/ext_iconv/CMakeLists.txt
index 7f3a1abed..8d16d76f2 100644
--- a/3rdparty/ext_iconv/CMakeLists.txt
+++ b/3rdparty/ext_iconv/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_iconv "${EXTPREFIX}" )
+set(PREFIX_ext_iconv "${EXTPREFIX}")
ExternalProject_Add(
ext_iconv
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 ace8b5f2db42f7b3b3057585e80d9808
INSTALL_DIR ${PREFIX_ext_iconv}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_iconv} --disable-static \
--enable-shared + CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_iconv} \
${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_icu/CMakeLists.txt b/3rdparty/ext_icu/CMakeLists.txt
index 010a541ae..2484e1132 100644
--- a/3rdparty/ext_icu/CMakeLists.txt
+++ b/3rdparty/ext_icu/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_icu "${EXTPREFIX}" )
+set(PREFIX_ext_icu "${EXTPREFIX}")
ExternalProject_Add(
ext_icu
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 490ad9d920158e0314e10ba74ae9a150
INSTALL_DIR ${PREFIX_ext_icu}
- CONFIGURE_COMMAND ./source/configure --prefix=${PREFIX_ext_icu} \
${GLOBAL_AUTOMAKE_PROFILE} + CONFIGURE_COMMAND ./source/configure \
--prefix=${PREFIX_ext_icu} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_kdiagram/CMakeLists.txt \
b/3rdparty/ext_kdiagram/CMakeLists.txt index 991b739c5..152aab5bb 100644
--- a/3rdparty/ext_kdiagram/CMakeLists.txt
+++ b/3rdparty/ext_kdiagram/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_kdiagram "${EXTPREFIX}" )
+set(PREFIX_ext_kdiagram "${EXTPREFIX}")
ExternalProject_Add(
ext_kdiagram
diff --git a/3rdparty/ext_ktoblzcheck/CMakeLists.txt \
b/3rdparty/ext_ktoblzcheck/CMakeLists.txt index 4779dc032..d0f5790f2 100644
--- a/3rdparty/ext_ktoblzcheck/CMakeLists.txt
+++ b/3rdparty/ext_ktoblzcheck/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_ktoblzcheck "${EXTPREFIX}" )
+set(PREFIX_ext_ktoblzcheck "${EXTPREFIX}")
ExternalProject_Add(
ext_ktoblzcheck
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 2ea1b01a931eb1e52b0ca0e07cb72435
INSTALL_DIR ${PREFIX_ext_ktoblzcheck}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_ktoblzcheck}
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_ktoblzcheck} \
${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_lzma/CMakeLists.txt b/3rdparty/ext_lzma/CMakeLists.txt
index cb0a25b98..ceafa2a5b 100644
--- a/3rdparty/ext_lzma/CMakeLists.txt
+++ b/3rdparty/ext_lzma/CMakeLists.txt
@@ -1,13 +1,13 @@
-SET(PREFIX_ext_lzma "${EXTPREFIX}" )
+set(PREFIX_ext_lzma "${EXTPREFIX}")
ExternalProject_Add(
ext_lzma
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://tukaani.org/xz/xz-5.2.3.tar.xz
- URL_MD5 60fb79cab777e3f71ca43d298adacbd5
+ URL http://tukaani.org/xz/xz-5.2.4.tar.xz
+ URL_MD5 003e4d0b1b1899fc6e3000b24feddf7c
INSTALL_DIR ${PREFIX_ext_lzma}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_lzma} \
${GLOBAL_AUTOMAKE_PROFILE} + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_lzma} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_mysql/CMakeLists.txt b/3rdparty/ext_mysql/CMakeLists.txt
new file mode 100644
index 000000000..31099ad26
--- /dev/null
+++ b/3rdparty/ext_mysql/CMakeLists.txt
@@ -0,0 +1,26 @@
+set(PREFIX_ext_mysql "${EXTPREFIX}")
+
+ExternalProject_Add(
+ ext_mysql
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-8.0.12.tar.gz
+ URL_MD5 569b6037bad533ad84c2b8d29534a68f
+
+ INSTALL_DIR ${PREFIX_ext_mysql}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_mysql}
+ -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
+ ${GLOBAL_PROFILE}
+ -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
+ -DBUILD_TESTING=false
+ -DBUILD_CONFIG=mysql_release
+ -DCPACK_MONOLITHIC_INSTALL=1
+ -DIGNORE_AIO_CHECK=1
+# -DDOWNLOAD_BOOST=ON
+# -DWITH_BOOST=${EXTERNALS_DOWNLOAD_DIR}/boost-1.67
+# -DWITH_ZLIB=system
+# -DWITH_LZMA=system
+# -DINSTALL_STATIC_LIBRARIES=OFF
+
+ UPDATE_COMMAND ""
+ DEPENDS ext_icu ext_ncurses
+)
diff --git a/3rdparty/ext_ncurses/CMakeLists.txt \
b/3rdparty/ext_ncurses/CMakeLists.txt new file mode 100644
index 000000000..ba6a394a2
--- /dev/null
+++ b/3rdparty/ext_ncurses/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(PREFIX_ext_ncurses "${EXTPREFIX}")
+
+ExternalProject_Add(
+ ext_ncurses
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz
+ URL_MD5 98c889aaf8d23910d2b92d65be2e737a
+
+ INSTALL_DIR ${PREFIX_ext_ncurses}
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_ncurses} \
${GLOBAL_AUTOMAKE_PROFILE} + BUILD_COMMAND make
+ INSTALL_COMMAND make install
+
+ UPDATE_COMMAND ""
+ BUILD_IN_SOURCE 1
+)
diff --git a/3rdparty/ext_ofx/CMakeLists.txt b/3rdparty/ext_ofx/CMakeLists.txt
index ec4ce9d38..c84b1e9a2 100644
--- a/3rdparty/ext_ofx/CMakeLists.txt
+++ b/3rdparty/ext_ofx/CMakeLists.txt
@@ -1,6 +1,6 @@
-SET(PREFIX_ext_ofx "${EXTPREFIX}" )
-SET(ofx_openSPIncludeDir "${INSTALL_ROOT}/include/OpenSP" )
-SET(ofx_openSPLibDir "${INSTALL_ROOT}/lib" )
+set(PREFIX_ext_ofx "${EXTPREFIX}")
+set(ofx_openSPIncludeDir "${INSTALL_ROOT}/include/OpenSP")
+set(ofx_openSPLibDir "${INSTALL_ROOT}/lib")
ExternalProject_Add(
ext_ofx
@@ -9,7 +9,7 @@ ExternalProject_Add(
URL_MD5 dde6276ffe2999f86bed5bf2cc80f7b2
INSTALL_DIR ${PREFIX_ext_ofx}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_ofx} --enable-shared \
--disable-static --with-opensp-includes=${ofx_openSPIncludeDir} \
--with-opensp-libs=${ofx_openSPLibDir} + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_ofx} ${GLOBAL_AUTOMAKE_PROFILE} \
--with-opensp-includes=${ofx_openSPIncludeDir} --with-opensp-libs=${ofx_openSPLibDir} \
BUILD_COMMAND make INSTALL_COMMAND make install
diff --git a/3rdparty/ext_opensp/CMakeLists.txt b/3rdparty/ext_opensp/CMakeLists.txt
index 9ad1f95ac..f54f9c125 100644
--- a/3rdparty/ext_opensp/CMakeLists.txt
+++ b/3rdparty/ext_opensp/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_opensp "${EXTPREFIX}" )
+set(PREFIX_ext_opensp "${EXTPREFIX}")
ExternalProject_Add(
ext_opensp
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 670b223c5d12cee40c9137be86b6c39b
INSTALL_DIR ${PREFIX_ext_opensp}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_opensp} --enable-shared \
--disable-static --disable-doc-build + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_opensp} ${GLOBAL_AUTOMAKE_PROFILE} --disable-doc-build \
BUILD_COMMAND make INSTALL_COMMAND make install
diff --git a/3rdparty/ext_phonon/CMakeLists.txt b/3rdparty/ext_phonon/CMakeLists.txt
index 1f28b68e0..86fd23338 100644
--- a/3rdparty/ext_phonon/CMakeLists.txt
+++ b/3rdparty/ext_phonon/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(EXTPREFIX_phonon "${EXTPREFIX}" )
+set(EXTPREFIX_phonon "${EXTPREFIX}")
ExternalProject_Add(
ext_phonon
diff --git a/3rdparty/ext_png/CMakeLists.txt b/3rdparty/ext_png/CMakeLists.txt
index a28beb97a..64ee1b4c8 100644
--- a/3rdparty/ext_png/CMakeLists.txt
+++ b/3rdparty/ext_png/CMakeLists.txt
@@ -1,12 +1,13 @@
-SET(PREFIX_ext_png "${EXTPREFIX}" )
+set(PREFIX_ext_png "${EXTPREFIX}")
ExternalProject_Add( ext_png
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL http://files.kde.org/krita/build/dependencies/libpng-1.6.34.tar.gz
- URL_MD5 03fbc5134830240104e96d3cda648e71
+ URL https://kent.dl.sourceforge.net/project/libpng/libpng16/1.6.35/libpng-1.6.35.tar.xz
+ URL_MD5 678b7e696a62a193ed3503b04bf449d6
INSTALL_DIR ${PREFIX_ext_png}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_png} \
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DPNG_TESTS=OFF
UPDATE_COMMAND ""
+ DEPENDS ext_zlib
)
diff --git a/3rdparty/ext_qt/CMakeLists.txt b/3rdparty/ext_qt/CMakeLists.txt
index 2f57d0182..345747418 100644
--- a/3rdparty/ext_qt/CMakeLists.txt
+++ b/3rdparty/ext_qt/CMakeLists.txt
@@ -1,10 +1,10 @@
-SET(EXTPREFIX_qt "${EXTPREFIX}")
+set(EXTPREFIX_qt "${EXTPREFIX}")
ExternalProject_Add(
ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL https://download.qt.io/official_releases/qt/5.10/5.10.0/single/qt-everywhere-src-5.10.0.tar.xz
- URL_MD5 c5e275ab0ed7ee61d0f4b82cd471770d
+ URL https://download.qt.io/official_releases/qt/5.11/5.11.1/single/qt-everywhere-src-5.11.1.tar.xz
+ URL_MD5 c6f0854d7de7bde80cfd8cc85bb7152b
CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXTPREFIX_qt} -opensource \
-confirm-license -verbose -nomake examples -skip qt3d -skip qtactiveqt -skip \
qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip \
qtlocation -skip qtwayland -skip qtandroidextras -skip qtserialport -skip qtdatavis3d \
-skip qtvirtualkeyboard -skip qtspeech -skip qtsensors -skip qtgamepad -skip qtscxml \
-skip qtremoteobjects -skip qtxmlpatterns -skip qtcharts -skip qtdatavis3d -skip \
qtgamepad -skip qtpurchasing -skip qtscxml -skip qtserialbus -skip qtspeech -skip \
qtvirtualkeyboard INSTALL_DIR ${EXTPREFIX_qt}
diff --git a/3rdparty/ext_sqlcipher/CMakeLists.txt \
b/3rdparty/ext_sqlcipher/CMakeLists.txt index 3cab6349c..9fc0966eb 100644
--- a/3rdparty/ext_sqlcipher/CMakeLists.txt
+++ b/3rdparty/ext_sqlcipher/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_sqlcipher "${EXTPREFIX}" )
+set(PREFIX_ext_sqlcipher "${EXTPREFIX}")
ExternalProject_Add(
ext_sqlcipher
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 f12c5975d784856ea89f83cfc9af1a6c
INSTALL_DIR ${PREFIX_ext_sqlcipher}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_sqlcipher} --disable-static \
--enable-shared --enable-tempstore=yes CFLAGS=-DSQLITE_HAS_CODEC + CONFIGURE_COMMAND \
./configure --prefix=${PREFIX_ext_sqlcipher} ${GLOBAL_AUTOMAKE_PROFILE} \
--enable-tempstore=yes CFLAGS=-DSQLITE_HAS_CODEC BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_sqlite/CMakeLists.txt b/3rdparty/ext_sqlite/CMakeLists.txt
new file mode 100644
index 000000000..767a0edb1
--- /dev/null
+++ b/3rdparty/ext_sqlite/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(PREFIX_ext_sqlite "${EXTPREFIX}")
+
+ExternalProject_Add(
+ ext_sqlite
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://sqlite.org/2018/sqlite-amalgamation-3240000.zip
+ URL_MD5 4ea1e0c6e7e82cb0490d4753d6878698
+
+ PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/sqlite.diff
+ INSTALL_DIR ${PREFIX_ext_sqlite}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_sqlite}
+ -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
+ ${GLOBAL_PROFILE}
+ -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
+ -DBUILD_TESTING=false
+ -DSQLITE_BUILD_STATIC=FALSE
+ -DENABLE_UNLOCK_NOTIFY=TRUE
+ UPDATE_COMMAND ""
+)
diff --git a/3rdparty/ext_sqlite/sqlite.diff b/3rdparty/ext_sqlite/sqlite.diff
new file mode 100644
index 000000000..f60840fa1
--- /dev/null
+++ b/3rdparty/ext_sqlite/sqlite.diff
@@ -0,0 +1,162 @@
+diff -ruN sqlite-amalgamation-3240000.orig/CMakeLists.txt \
sqlite-amalgamation-3240000/CMakeLists.txt +--- \
sqlite-amalgamation-3240000.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 \
++++ sqlite-amalgamation-3240000/CMakeLists.txt 2018-09-08 21:05:15.830749379 +0200 \
+@@ -0,0 +1,140 @@ ++#--------------------------------------------
++# SQLite build script for amalgamation
++#
++# default folder structure as follows
++# <project root folder>
++#
++#--------------------------------------------
++cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
++
++set(PROJECT_NAME sqlite)
++
++# define project for C language
++project(${PROJECT_NAME} C)
++
++message("Building on: ${CMAKE_SYSTEM_NAME}")
++
++option(SQLITE_BUILD_STATIC "Build SQLite static library" ON)
++option(SQLITE_BUILD_SHARED "Build SQLite shared library" ON)
++option(WITH_SQLITE_DEBUG "Build SQLite debug features" OFF)
++option(WITH_SQLITE_MEMDEBUG "Build SQLite memory debug features" OFF)
++option(WITH_SQLITE_RTREE "Build R*Tree index extension" OFF)
++option(ENABLE_UNLOCK_NOTIFY "ENABLE_UNLOCK_NOTIFY" ON)
++
++set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation \
directory for executables") ++set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE \
PATH "Installation directory for libraries") ++set(INSTALL_INC_DIR \
"${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") ++
++set(SQLITE_WIN_BUILD OFF)
++if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
++ set(SQLITE_WIN_BUILD ON)
++endif()
++
++set(SQLITE_WINRT_BUILD OFF)
++if(${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore")
++ set(SQLITE_WINRT_BUILD ON)
++endif()
++
++# ---------------------
++# Version detection
++# ---------------------
++file(STRINGS "${PROJECT_SOURCE_DIR}/sqlite3.h" _sqlite_api_h_VER_STRING REGEX \
".*#define[ ]+SQLITE_VERSION[ ]+") ++
++string(REGEX MATCH "[0-9\\.]+" SQLITE_VER_STRING ${_sqlite_api_h_VER_STRING})
++string(REGEX MATCHALL "[0-9]+" _sqlite_ver_LIST "${SQLITE_VER_STRING}")
++list(LENGTH _sqlite_ver_LIST _sqlite_list_len)
++list(GET _sqlite_ver_LIST 0 SQLITE_VER_MAJOR)
++list(GET _sqlite_ver_LIST 1 SQLITE_VER_MINOR)
++list(GET _sqlite_ver_LIST 2 SQLITE_VER_PATCH)
++if(_sqlite_list_len EQUAL 4)
++ list(GET _sqlite_ver_LIST 3 SQLITE_VER_PATCHLEVEL)
++ message("Patch level: ${SQLITE_VER_PATCHLEVEL}")
++endif()
++
++message("FOUND: SQLite version = ${SQLITE_VER_STRING}")
++
++set(SQLITE_DYN_NAME "${PROJECT_NAME}${SQLITE_VER_MAJOR}")
++set(SQLITE_STATIC_NAME "${SQLITE_DYN_NAME}-static")
++
++find_package(Threads REQUIRED)
++
++# add include path for project
++include_directories(${PROJECT_SOURCE_DIR}/src)
++
++set(SRC_LIB_FILE ${PROJECT_SOURCE_DIR}/sqlite${SQLITE_VER_MAJOR}.c)
++set(SRC_SHELL_FILE ${PROJECT_SOURCE_DIR}/shell.c)
++file(GLOB HDR_FILES ${PROJECT_SOURCE_DIR}/*.h)
++
++# adding compilation flags depending on options
++if(WITH_SQLITE_DEBUG)
++ add_definitions(-DSQLITE_DEBUG)
++endif()
++if(WITH_SQLITE_MEMDEBUG)
++ add_definitions(-DSQLITE_MEMDEBUG)
++endif()
++if(WITH_SQLITE_RTREE)
++ add_definitions(-DSQLITE_ENABLE_RTREE)
++endif()
++if(ENABLE_UNLOCK_NOTIFY)
++ add_definitions(-DSQLITE_ENABLE_UNLOCK_NOTIFY)
++endif()
++
++if(SQLITE_WINRT_BUILD)
++ # Don't use tools that are unavailable on RT platforms
++ add_definitions(-DSQLITE_OS_WINRT)
++endif()
++
++if (SQLITE_BUILD_STATIC)
++ # build static library
++ add_library(${SQLITE_STATIC_NAME} STATIC ${SRC_LIB_FILE})
++endif()
++
++if (SQLITE_BUILD_SHARED)
++ # build dynamic library
++ add_library(${SQLITE_DYN_NAME} SHARED ${SRC_LIB_FILE})
++ if (SQLITE_WIN_BUILD)
++ #then we do dll library, so need to export api
++ set_target_properties(${SQLITE_DYN_NAME} PROPERTIES DEFINE_SYMBOL \
"SQLITE_API=__declspec(dllexport)") ++ endif()
++endif()
++
++# build shell executable
++add_executable(shell ${SRC_SHELL_FILE})
++set_target_properties(shell PROPERTIES RUNTIME_OUTPUT_NAME sqlite3)
++
++if (SQLITE_BUILD_SHARED)
++ # preferred is shared library
++ target_link_libraries(shell ${SQLITE_DYN_NAME} ${CMAKE_THREAD_LIBS_INIT} \
${CMAKE_DL_LIBS}) ++elseif(SQLITE_BUILD_STATIC)
++ target_link_libraries(shell ${SQLITE_STATIC_NAME} ${CMAKE_THREAD_LIBS_INIT} \
${CMAKE_DL_LIBS}) ++else()
++ # no static or dynamic option selected
++ message(FATAL_ERROR "either static or dynamic option should be selected")
++endif()
++
++# installation
++list(APPEND TO_INSTALL shell)
++if(SQLITE_BUILD_SHARED)
++ list(APPEND TO_INSTALL ${SQLITE_DYN_NAME})
++endif()
++if(SQLITE_BUILD_STATIC)
++ list(APPEND TO_INSTALL ${SQLITE_STATIC_NAME})
++endif()
++
++install(TARGETS ${TO_INSTALL}
++ RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
++ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
++ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
++install(FILES ${HDR_FILES} DESTINATION "${INSTALL_INC_DIR}")
++
++set(prefix ${CMAKE_INSTALL_PREFIX})
++set(exec_prefix ${CMAKE_INSTALL_PREFIX})
++set(libdir ${INSTALL_LIB_DIR})
++set(includedir ${INSTALL_INC_DIR})
++set(LIBS "-lm -ldl -lz -lpthread")
++set(RELEASE ${SQLITE_VER_STRING})
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sqlite.pc.in
++ ${CMAKE_CURRENT_BINARY_DIR}/${SQLITE_DYN_NAME}.pc @ONLY)
++
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SQLITE_DYN_NAME}.pc
++ DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
+\ Brak znaku nowej linii na końcu pliku
+diff -ruN sqlite-amalgamation-3240000.orig/sqlite.pc.in \
sqlite-amalgamation-3240000/sqlite.pc.in +--- \
sqlite-amalgamation-3240000.orig/sqlite.pc.in 1970-01-01 01:00:00.000000000 +0100 \
++++ sqlite-amalgamation-3240000/sqlite.pc.in 2018-09-08 11:03:29.834556054 +0200 +@@ \
-0,0 +1,13 @@ ++# Package Information for pkg-config
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: SQLite
++Description: SQL database engine
++Version: @RELEASE@
++Libs: -L${libdir} -lsqlite3
++Libs.private: @LIBS@
++Cflags: -I${includedir}
diff --git a/3rdparty/ext_tcl/CMakeLists.txt b/3rdparty/ext_tcl/CMakeLists.txt
index a4fb6573a..4037d6264 100644
--- a/3rdparty/ext_tcl/CMakeLists.txt
+++ b/3rdparty/ext_tcl/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_tcl "${EXTPREFIX}" )
+set(PREFIX_ext_tcl "${EXTPREFIX}")
ExternalProject_Add(
ext_tcl
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 8fd508d3d2216b9c75895d6141219eab
INSTALL_DIR ${PREFIX_ext_tcl}
- CONFIGURE_COMMAND ./unix/configure --prefix=${PREFIX_ext_tcl} --disable-static \
--enable-shared --enable-threads --enable-64bit + CONFIGURE_COMMAND ./unix/configure \
--prefix=${PREFIX_ext_tcl} ${GLOBAL_AUTOMAKE_PROFILE} --enable-threads --enable-64bit \
BUILD_COMMAND make INSTALL_COMMAND make install
diff --git a/3rdparty/ext_xml/CMakeLists.txt b/3rdparty/ext_xml/CMakeLists.txt
index 7dd26887a..5b8579975 100644
--- a/3rdparty/ext_xml/CMakeLists.txt
+++ b/3rdparty/ext_xml/CMakeLists.txt
@@ -1,13 +1,13 @@
-SET(PREFIX_ext_xml "${EXTPREFIX}" )
+set(PREFIX_ext_xml "${EXTPREFIX}")
ExternalProject_Add(
ext_xml
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL ftp://xmlsoft.org/libxslt/libxml2-2.9.7.tar.gz
- URL_MD5 896608641a08b465098a40ddf51cefba
+ URL ftp://xmlsoft.org/libxslt/libxml2-2.9.8.tar.gz
+ URL_MD5 b786e353e2aa1b872d70d5d1ca0c740d
INSTALL_DIR ${PREFIX_ext_xml}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_xml} --without-python
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_xml} \
${GLOBAL_AUTOMAKE_PROFILE} --without-python BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_xmlsec1/CMakeLists.txt \
b/3rdparty/ext_xmlsec1/CMakeLists.txt index 0ed9939df..8819cc044 100644
--- a/3rdparty/ext_xmlsec1/CMakeLists.txt
+++ b/3rdparty/ext_xmlsec1/CMakeLists.txt
@@ -1,13 +1,14 @@
-SET(PREFIX_ext_xmlsec1 "${EXTPREFIX}" )
+set(PREFIX_ext_xmlsec1 "${EXTPREFIX}")
+# aqbanking checks only for xmlsec1-gnutls >= 1.0.0 so we don't need openssl and nss
ExternalProject_Add(
ext_xmlsec1
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.25.tar.gz
- URL_MD5 dbbef1efc69e61bc4629650205a05b41
+ URL https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.26.tar.gz
+ URL_MD5 9c4aaf9ff615a73921b9e3bf4988d878
INSTALL_DIR ${PREFIX_ext_xmlsec1}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_xmlsec1} --enable-shared \
--disable-static --without-openssl --disable-crypto-dl + CONFIGURE_COMMAND \
./configure --prefix=${PREFIX_ext_xmlsec1} ${GLOBAL_AUTOMAKE_PROFILE} \
--without-openssl --without-nss --disable-crypto-dl BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_xslt/CMakeLists.txt b/3rdparty/ext_xslt/CMakeLists.txt
index 260577c92..d43d371a2 100644
--- a/3rdparty/ext_xslt/CMakeLists.txt
+++ b/3rdparty/ext_xslt/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_xslt "${EXTPREFIX}" )
+set(PREFIX_ext_xslt "${EXTPREFIX}")
ExternalProject_Add(
ext_xslt
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 1fc72f98e98bf4443f1651165f3aa146
INSTALL_DIR ${PREFIX_ext_xslt}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_xslt} \
${GLOBAL_AUTOMAKE_PROFILE} + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_xslt} ${GLOBAL_AUTOMAKE_PROFILE} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_zlib/CMakeLists.txt b/3rdparty/ext_zlib/CMakeLists.txt
index 2e06b3ed9..6400ce315 100644
--- a/3rdparty/ext_zlib/CMakeLists.txt
+++ b/3rdparty/ext_zlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(PREFIX_ext_zlib "${EXTPREFIX}" )
+set(PREFIX_ext_zlib "${EXTPREFIX}")
ExternalProject_Add(
ext_zlib
diff --git a/packaging/linux/appimage/build-deps.sh \
b/packaging/linux/appimage/build-deps.sh index c67078586..aa2c57927 100755
--- a/packaging/linux/appimage/build-deps.sh
+++ b/packaging/linux/appimage/build-deps.sh
@@ -19,8 +19,8 @@ export LC_ALL=en_US.UTF-8
export LANG=en_us.UTF-8
# We want to use $prefix/deps/usr/ for all our dependencies
-export DEPS_INSTALL_PREFIX=$BUILD_PREFIX/deps/usr/
-export DOWNLOADS_DIR=$BUILD_PREFIX/downloads/
+export DEPS_INSTALL_PREFIX=$BUILD_PREFIX/deps/usr
+export DOWNLOADS_DIR=$BUILD_PREFIX/downloads
# Setup variables needed to help everything find what we build
export LD_LIBRARY_PATH=$DEPS_INSTALL_PREFIX/lib:$LD_LIBRARY_PATH
@@ -59,16 +59,18 @@ cmake $KMYMONEY_SOURCES/3rdparty \
-DCMAKE_INSTALL_PREFIX=$DEPS_INSTALL_PREFIX -DI
# Now start building everything we need, in the appropriate order
cmake --build . --config RelWithDebInfo --target ext_iconv
+# cmake --build . --config RelWithDebInfo --target ext_icu
cmake --build . --config RelWithDebInfo --target ext_xml # must be before gettext
cmake --build . --config RelWithDebInfo --target ext_gettext
# cmake --build . --config RelWithDebInfo --target ext_zlib
-cmake --build . --config RelWithDebInfo --target ext_boost
+# cmake --build . --config RelWithDebInfo --target ext_lzma
# cmake --build . --config RelWithDebInfo --target ext_png
-# cmake --build . --config RelWithDebInfo --target ext_icu
+cmake --build . --config RelWithDebInfo --target ext_boost
cmake --build . --config RelWithDebInfo --target ext_xslt # for ext_xmlsec1
-# cmake --build . --config RelWithDebInfo --target ext_lzma
# cmake --build . --config RelWithDebInfo --target ext_fontconfig
# cmake --build . --config RelWithDebInfo --target ext_freetype
+cmake --build . --config RelWithDebInfo --target ext_sqlite
+# cmake --build . --config RelWithDebInfo --target ext_mysql
cmake --build . --config RelWithDebInfo --target ext_qt
cmake --build . --config RelWithDebInfo --target ext_knotifications
cmake --build . --config RelWithDebInfo --target ext_kio
@@ -86,4 +88,4 @@ cmake --build . --config RelWithDebInfo --target ext_aqbanking
cmake --build . --config RelWithDebInfo --target ext_gpgme
cmake --build . --config RelWithDebInfo --target ext_sqlcipher
cmake --build . --config RelWithDebInfo --target ext_ofx
-
+cmake --build . --config RelWithDebInfo --target ext_ical
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic