commit: 3ffe12570c91438e1705211a00485af2ae6cc947 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 22 15:53:48 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 22 16:14:03 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3ffe1257
app-office/libalkimia: 8.0.1 version bump This version *introduces* new dependencies on Qt5WebKit and KDELibs4Support, which are both deprecated. Therefore keeping it in overlay until really required. Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../libalkimia/files/libalkimia-8.0.1-cmake.patch | 54 ++++++++++++++++++ ...libalkimia-8.0.1-limit-knewstuff-profiles.patch | 37 +++++++++++++ .../files/libalkimia-8.0.1-plasma-optional.patch | 60 ++++++++++++++++++++ app-office/libalkimia/libalkimia-8.0.1.ebuild | 64 ++++++++++++++++++++++ 4 files changed, 215 insertions(+) diff --git a/app-office/libalkimia/files/libalkimia-8.0.1-cmake.patch b/app-office/libalkimia/files/libalkimia-8.0.1-cmake.patch new file mode 100644 index 0000000000..1b99061e6b --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.0.1-cmake.patch @@ -0,0 +1,54 @@ +From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 12 Jun 2019 19:44:12 +0200 +Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for + alkimia target + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7c0f0f7..0774032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) + + install(TARGETS alkimia + EXPORT alkimiaTargets +- ${INSTALL_TARGETS_DEFAULT_ARGS} ++ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} + ) + + if(BUILD_QT4) +-- +2.23.0 + + +From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 12 Jun 2019 16:43:54 +0200 +Subject: [PATCH 2/2] Fix pkgconfig libdir path + +--- + src/libalkimia.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in +index c2087c9..6ada277 100644 +--- a/src/libalkimia.pc.in ++++ b/src/libalkimia.pc.in +@@ -4,8 +4,8 @@ + # General installation directories + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@KDE4_LIB_DIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + # Human-readable name + Name: Alkimia +-- +2.23.0 + diff --git a/app-office/libalkimia/files/libalkimia-8.0.1-limit-knewstuff-profiles.patch b/app-office/libalkimia/files/libalkimia-8.0.1-limit-knewstuff-profiles.patch new file mode 100644 index 0000000000..b1cbc52542 --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.0.1-limit-knewstuff-profiles.patch @@ -0,0 +1,37 @@ +From 2e1ed56acd4d70b2d7ec99a6605068891d1857ef Mon Sep 17 00:00:00 2001 +From: Ralf Habacker <[email protected]> +Date: Sat, 27 Apr 2019 19:28:28 +0200 +Subject: Limit profiles selectable in the online quotes editor to the recent + KDE major version + +Due to a restriction within the knewstuff library it is currently +not possible to access the installation status of GHNS quotes of +the other KDE version. +--- + tools/onlinequoteseditor/mainwindow.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp +index 7571531..bb5bc0f 100644 +--- a/tools/onlinequoteseditor/mainwindow.cpp ++++ b/tools/onlinequoteseditor/mainwindow.cpp +@@ -75,12 +75,15 @@ MainWindow::MainWindow(QWidget *parent) + manager.setWebPageEnabled(true); + + manager.addProfile(new AlkOnlineQuotesProfile("no-config-file", AlkOnlineQuotesProfile::Type::None)); ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + manager.addProfile(new AlkOnlineQuotesProfile("alkimia4", AlkOnlineQuotesProfile::Type::Alkimia4, "alkimia-quotes.knsrc")); +- manager.addProfile(new AlkOnlineQuotesProfile("alkimia5", AlkOnlineQuotesProfile::Type::Alkimia5, "alkimia-quotes.knsrc")); + manager.addProfile(new AlkOnlineQuotesProfile("skrooge4", AlkOnlineQuotesProfile::Type::Skrooge4, "skrooge-quotes.knsrc")); +- manager.addProfile(new AlkOnlineQuotesProfile("skrooge5", AlkOnlineQuotesProfile::Type::Skrooge5, "skrooge-quotes.knsrc")); + manager.addProfile(new AlkOnlineQuotesProfile("kmymoney4", AlkOnlineQuotesProfile::Type::KMyMoney4, "kmymoney-quotes.knsrc")); ++#else ++ manager.addProfile(new AlkOnlineQuotesProfile("alkimia5", AlkOnlineQuotesProfile::Type::Alkimia5, "alkimia-quotes.knsrc")); ++ manager.addProfile(new AlkOnlineQuotesProfile("skrooge5", AlkOnlineQuotesProfile::Type::Skrooge5, "skrooge-quotes.knsrc")); + manager.addProfile(new AlkOnlineQuotesProfile("kmymoney5", AlkOnlineQuotesProfile::Type::KMyMoney5, "kmymoney-quotes.knsrc")); ++#endif + d->ui.setupUi(this); + + d->quotesWidget = new AlkOnlineQuotesWidget(true, true); +-- +cgit v1.1 diff --git a/app-office/libalkimia/files/libalkimia-8.0.1-plasma-optional.patch b/app-office/libalkimia/files/libalkimia-8.0.1-plasma-optional.patch new file mode 100644 index 0000000000..3b7c1ae221 --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.0.1-plasma-optional.patch @@ -0,0 +1,60 @@ +From 420756a78f783099ddd77b0966d593491d64a767 Mon Sep 17 00:00:00 2001 +From: Ralf Habacker <[email protected]> +Date: Wed, 24 Apr 2019 14:05:27 +0200 +Subject: Make building plasma applets optional + +--- + CMakeLists.txt | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c7833b..8e830ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ project(alkimia VERSION 8.0.0) + + option(BUILD_QT4 "Build for Qt4" OFF) + option(BUILD_DOXYGEN_DOCS "Build api docs" ON) ++option(BUILD_APPLETS "Build plasma applets" ON) + + find_package(ECM 0.0.11 REQUIRED NO_MODULE) + +@@ -70,6 +71,9 @@ else() + WebKitWidgets + Qml + ) ++ if(BUILD_APPLETS) ++ set(PLASMA_COMPONENT Package Plasma) ++ endif() + # search packages used by KDE + find_package(KF5 REQUIRED COMPONENTS + Config +@@ -77,8 +81,7 @@ else() + KDELibs4Support + #I18n + #WebKit +- Package +- Plasma ++ ${PLASMA_COMPONENT} + NewStuff + ) + +@@ -143,10 +146,12 @@ include_directories( + add_subdirectory(src) + add_subdirectory(autotests) + add_subdirectory(qml) +-if(BUILD_QT4) +- add_subdirectory(plasma/applets/onlinequote) +-else() +- add_subdirectory(plasma/applets/ForeignCurrencies) ++if(BUILD_APPLETS) ++ if(BUILD_QT4) ++ add_subdirectory(plasma/applets/onlinequote) ++ else() ++ add_subdirectory(plasma/applets/ForeignCurrencies) ++ endif() + endif() + add_subdirectory(tests) + add_subdirectory(tools) +-- +cgit v1.1 diff --git a/app-office/libalkimia/libalkimia-8.0.1.ebuild b/app-office/libalkimia/libalkimia-8.0.1.ebuild new file mode 100644 index 0000000000..368281c787 --- /dev/null +++ b/app-office/libalkimia/libalkimia-8.0.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_TEST="forceoptional" +KMNAME="alkimia" +inherit kde5 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/${KMNAME}-${PV}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Library with common classes and functionality used by KDE finance applications" +HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"; +LICENSE="LGPL-2.1" +SLOT="0/8" +IUSE="doc gmp plasma" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + >=dev-qt/qtwebkit-5.212.0_pre20180120:5 + !gmp? ( sci-libs/mpir:=[cxx] ) + gmp? ( dev-libs/gmp:0=[cxx] ) + plasma? ( + $(add_frameworks_dep kpackage) + $(add_frameworks_dep plasma) + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-plasma-optional.patch" + "${FILESDIR}/${P}-limit-knewstuff-profiles.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_DOXYGEN_DOCS=$(usex doc) + $(cmake-utils_use_find_package !gmp MPIR) + -DBUILD_APPLETS=$(usex plasma) + ) + kde5_src_configure +}
