[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmymoney] /: Add more AppImage dependencies
From: Łukasz_Wojniłowicz <null () kde ! org>
Date: 2018-08-31 7:11:29
Message-ID: E1fvdab-0008Kq-3I () code ! kde ! org
[Download RAW message or body]
Git commit 433bc7252d205524705fb2f829e1ade950b236f0 by Łukasz Wojniłowicz.
Committed on 31/08/2018 at 07:06.
Pushed by wojnilowicz into branch 'master'.
Add more AppImage dependencies
M +8 -4 3rdparty/CMakeLists.txt
A +63 -0 3rdparty/ext_applications/CMakeLists.txt
M +2 -1 3rdparty/ext_aqbanking/CMakeLists.txt
M +32 -0 3rdparty/ext_frameworks/CMakeLists.txt
A +16 -0 3rdparty/ext_grantlee/CMakeLists.txt
M +2 -1 3rdparty/ext_gwenhywfar/CMakeLists.txt
A +17 -0 3rdparty/ext_sqlcipher/CMakeLists.txt
A +16 -0 3rdparty/ext_tcl/CMakeLists.txt
M +1 -1 3rdparty/ext_xml/CMakeLists.txt
M +1 -0 3rdparty/ext_xslt/CMakeLists.txt
M +7 -3 packaging/linux/appimage/build-deps.sh
https://commits.kde.org/kmymoney/433bc7252d205524705fb2f829e1ade950b236f0
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index d054f147..cfce1fa6 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -69,13 +69,17 @@ add_subdirectory( ext_freetype)
add_subdirectory( ext_qt )
add_subdirectory( ext_phonon )
add_subdirectory( ext_frameworks )
+add_subdirectory( ext_grantlee )
+add_subdirectory( ext_applications )
add_subdirectory( ext_gmp )
add_subdirectory( ext_alkimia )
add_subdirectory( ext_kdiagram )
-# add_subdirectory( ext_ktoblzcheck )
-# add_subdirectory( ext_gwenhywfar )
-# add_subdirectory( ext_xmlsec1 )
-# add_subdirectory( ext_aqbanking )
+add_subdirectory( ext_ktoblzcheck )
+add_subdirectory( ext_gwenhywfar )
+add_subdirectory( ext_xmlsec1 )
+add_subdirectory( ext_aqbanking )
add_subdirectory( ext_gpgerror )
add_subdirectory( ext_assuan2 )
add_subdirectory( ext_gpgme )
+add_subdirectory( ext_tcl )
+add_subdirectory( ext_sqlcipher )
diff --git a/3rdparty/ext_applications/CMakeLists.txt \
b/3rdparty/ext_applications/CMakeLists.txt new file mode 100644
index 00000000..6058109e
--- /dev/null
+++ b/3rdparty/ext_applications/CMakeLists.txt
@@ -0,0 +1,63 @@
+SET(EXTPREFIX_applications "${EXTPREFIX}" )
+
+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}
+ URL https://download.kde.org/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz
+ URL_MD5 8d7d128e5eadbf1a0022a134a00420e6
+ 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_kcodecs ext_kconfig ext_kconfigwidgets ext_kcoreaddons \
ext_kemoticons ext_ki18n ext_kiconthemes ext_kio ext_sonnet ext_syntaxhighlighting \
ext_kwidgetsaddons ext_kxmlgui ext_grantlee +)
+
+ExternalProject_Add(
+ ext_kidentitymanagement
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://download.kde.org/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz
+ URL_MD5 4cd6e2ddfbe9a07e7916b27ac7a468dc
+ 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_kcoreaddons ext_kcompletion ext_ktextwidgets ext_kxmlgui ext_kio \
ext_kconfig ext_kcodecs ext_kiconthemes ext_kpimtextedit +)
+
+ExternalProject_Add(
+ ext_kcontacts
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://download.kde.org/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz
+ URL_MD5 bbfbc05509e92cac07ffb4ffee05c9ee
+ 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_kcoreaddons ext_ki18n ext_kconfig ext_kcodecs
+)
+
+
diff --git a/3rdparty/ext_aqbanking/CMakeLists.txt \
b/3rdparty/ext_aqbanking/CMakeLists.txt index 4ed8cfc2..8ba5f676 100644
--- a/3rdparty/ext_aqbanking/CMakeLists.txt
+++ b/3rdparty/ext_aqbanking/CMakeLists.txt
@@ -1,4 +1,5 @@
SET(PREFIX_ext_aqbanking "${EXTPREFIX}" )
+SET(aqbanking_cppFlags "-L${INSTALL_ROOT}/lib -I${INSTALL_ROOT}/include" )
ExternalProject_Add(
ext_aqbanking
@@ -7,7 +8,7 @@ ExternalProject_Add(
URL_MD5 6aceeaad3a1000f22f08986e68946db3
INSTALL_DIR ${PREFIX_ext_aqbanking}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_aqbanking}
+ CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_aqbanking} \
CPPFLAGS=${aqbanking_cppFlags} BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_frameworks/CMakeLists.txt \
b/3rdparty/ext_frameworks/CMakeLists.txt index ac02d090..450f9f41 100644
--- a/3rdparty/ext_frameworks/CMakeLists.txt
+++ b/3rdparty/ext_frameworks/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
# WindowSystem
# Solid
# Sonnet
+# SyntaxHighlighting
# Tier 2
# Auth
# Completion
@@ -23,6 +24,7 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
# Notifications
# Package
# Tier 3
+# Emoticons
# ConfigWidgets
# IconThemes
# Service
@@ -250,6 +252,21 @@ ExternalProject_Add(
DEPENDS ext_extra_cmake_modules
)
+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
+ 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_kauth
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
@@ -385,6 +402,21 @@ ExternalProject_Add(
DEPENDS ext_kconfig ext_kcoreaddons ext_kcrash ext_kdbusaddons ext_ki18n
)
+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
+ 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_karchive ext_kconfig ext_kservice ext_kcoreaddons
+)
+
ExternalProject_Add(
ext_ktextwidgets
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
diff --git a/3rdparty/ext_grantlee/CMakeLists.txt \
b/3rdparty/ext_grantlee/CMakeLists.txt new file mode 100644
index 00000000..7d4b6155
--- /dev/null
+++ b/3rdparty/ext_grantlee/CMakeLists.txt
@@ -0,0 +1,16 @@
+SET(PREFIX_ext_grantlee "${EXTPREFIX}" )
+
+ExternalProject_Add(
+ ext_grantlee
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://github.com/steveire/grantlee/archive/v5.1.0.zip
+ URL_MD5 cf959612f577114ad7c9e3456bc41a62
+
+ INSTALL_DIR ${PREFIX_ext_grantlee}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_grantlee}
+ -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
+ ${GLOBAL_PROFILE}
+ -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
+ -DBUILD_TESTING=false
+ UPDATE_COMMAND ""
+)
diff --git a/3rdparty/ext_gwenhywfar/CMakeLists.txt \
b/3rdparty/ext_gwenhywfar/CMakeLists.txt index e5944b3c..de32ee06 100644
--- a/3rdparty/ext_gwenhywfar/CMakeLists.txt
+++ b/3rdparty/ext_gwenhywfar/CMakeLists.txt
@@ -1,4 +1,5 @@
SET(PREFIX_ext_gwenhywfar "${EXTPREFIX}" )
+SET(gwenhywfar_guis "qt5 cpp" )
ExternalProject_Add(
ext_gwenhywfar
@@ -7,7 +8,7 @@ ExternalProject_Add(
URL_MD5 0744255cae68adca6dff81d3a9f3932d
INSTALL_DIR ${PREFIX_ext_gwenhywfar}
- CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_gwenhywfar} --with-guis=qt5 \
--disable-static --enable-shared --disable-binreloc + CONFIGURE_COMMAND ./configure \
--prefix=${PREFIX_ext_gwenhywfar} --with-guis=${gwenhywfar_guis} --disable-static \
--enable-shared --disable-binreloc BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_sqlcipher/CMakeLists.txt \
b/3rdparty/ext_sqlcipher/CMakeLists.txt new file mode 100644
index 00000000..3cab6349
--- /dev/null
+++ b/3rdparty/ext_sqlcipher/CMakeLists.txt
@@ -0,0 +1,17 @@
+SET(PREFIX_ext_sqlcipher "${EXTPREFIX}" )
+
+ExternalProject_Add(
+ ext_sqlcipher
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://github.com/sqlcipher/sqlcipher/archive/v3.4.2.zip
+ 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 + BUILD_COMMAND \
make + INSTALL_COMMAND make install
+
+ UPDATE_COMMAND ""
+ BUILD_IN_SOURCE 1
+ DEPENDS ext_tcl
+)
diff --git a/3rdparty/ext_tcl/CMakeLists.txt b/3rdparty/ext_tcl/CMakeLists.txt
new file mode 100644
index 00000000..a4fb6573
--- /dev/null
+++ b/3rdparty/ext_tcl/CMakeLists.txt
@@ -0,0 +1,16 @@
+SET(PREFIX_ext_tcl "${EXTPREFIX}" )
+
+ExternalProject_Add(
+ ext_tcl
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL https://github.com/tcltk/tcl/archive/core-8-6-8.zip
+ URL_MD5 8fd508d3d2216b9c75895d6141219eab
+
+ INSTALL_DIR ${PREFIX_ext_tcl}
+ CONFIGURE_COMMAND ./unix/configure --prefix=${PREFIX_ext_tcl} --disable-static \
--enable-shared --enable-threads --enable-64bit + BUILD_COMMAND make
+ INSTALL_COMMAND make install
+
+ UPDATE_COMMAND ""
+ BUILD_IN_SOURCE 1
+)
diff --git a/3rdparty/ext_xml/CMakeLists.txt b/3rdparty/ext_xml/CMakeLists.txt
index 9b670a58..7dd26887 100644
--- a/3rdparty/ext_xml/CMakeLists.txt
+++ b/3rdparty/ext_xml/CMakeLists.txt
@@ -7,7 +7,7 @@ ExternalProject_Add(
URL_MD5 896608641a08b465098a40ddf51cefba
INSTALL_DIR ${PREFIX_ext_xml}
- CONFIGURE_COMMAND LIBS="-liconv" && ./configure --prefix=${PREFIX_ext_xml} \
--without-python + CONFIGURE_COMMAND ./configure --prefix=${PREFIX_ext_xml} \
--without-python BUILD_COMMAND make
INSTALL_COMMAND make install
diff --git a/3rdparty/ext_xslt/CMakeLists.txt b/3rdparty/ext_xslt/CMakeLists.txt
index c962ea3f..260577c9 100644
--- a/3rdparty/ext_xslt/CMakeLists.txt
+++ b/3rdparty/ext_xslt/CMakeLists.txt
@@ -13,4 +13,5 @@ ExternalProject_Add(
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
+ DEPENDS ext_xml
)
diff --git a/packaging/linux/appimage/build-deps.sh \
b/packaging/linux/appimage/build-deps.sh index e9ad662d..6c0d7fc6 100755
--- a/packaging/linux/appimage/build-deps.sh
+++ b/packaging/linux/appimage/build-deps.sh
@@ -64,8 +64,8 @@ cmake $KMYMONEY_SOURCES/3rdparty \
-DCMAKE_INSTALL_PREFIX=$DEPS_INSTALL_PREFIX -DI cmake --build . --config \
RelWithDebInfo --target ext_boost # cmake --build . --config RelWithDebInfo --target \
ext_png # cmake --build . --config RelWithDebInfo --target ext_icu
-# cmake --build . --config RelWithDebInfo --target ext_xml
-# cmake --build . --config RelWithDebInfo --target ext_xslt
+cmake --build . --config RelWithDebInfo --target ext_xml
+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
@@ -75,9 +75,13 @@ cmake --build . --config RelWithDebInfo --target ext_kio
cmake --build . --config RelWithDebInfo --target ext_kcmutils
cmake --build . --config RelWithDebInfo --target ext_kwallet
cmake --build . --config RelWithDebInfo --target ext_kitemmodels
+cmake --build . --config RelWithDebInfo --target ext_kholidays
+cmake --build . --config RelWithDebInfo --target ext_kidentitymanagement
+cmake --build . --config RelWithDebInfo --target ext_kcontacts
cmake --build . --config RelWithDebInfo --target ext_gmp
cmake --build . --config RelWithDebInfo --target ext_alkimia
cmake --build . --config RelWithDebInfo --target ext_kdiagram
-# cmake --build . --config RelWithDebInfo --target ext_aqbanking
+cmake --build . --config RelWithDebInfo --target ext_aqbanking
cmake --build . --config RelWithDebInfo --target ext_gpgme
+cmake --build . --config RelWithDebInfo --target ext_sqlcipher
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic