summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-30 16:37:07 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-30 16:45:40 +0200
commitee44cb64a265b662a785fdff790141ff8ab301dd (patch)
treeac00c2023008b093bcce03383564ab0f1bc8db4d
parentsys-power/tuxedo-cc-wmi: fix bug #730208 (diff)
downloadgentoo-ee44cb64a265b662a785fdff790141ff8ab301dd.tar.gz
gentoo-ee44cb64a265b662a785fdff790141ff8ab301dd.tar.bz2
gentoo-ee44cb64a265b662a785fdff790141ff8ab301dd.zip
app-office/libalkimia: 8.0.3 version bump
Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--app-office/libalkimia/Manifest1
-rw-r--r--app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch54
-rw-r--r--app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch181
-rw-r--r--app-office/libalkimia/libalkimia-8.0.3.ebuild68
4 files changed, 304 insertions, 0 deletions
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 73a2de778c4..b597a2233c2 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1 +1,2 @@
DIST alkimia-7.0.2.tar.xz 38420 BLAKE2B ea2cc8dd80e2b9b2501d26936aa7d2799d040e8cf86f9adb4785e676046f3c76d0cbe3267e4159582086d910be35020bbc634140d32cc7e5588d06cf75a115a3 SHA512 275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4
+DIST alkimia-8.0.3.tar.xz 212780 BLAKE2B 4863bd2fba7e92518618da250b08772e288697eab9e45980c72c4a29d51f3df94899ead344a9dd5f16ea73cab8dc5596c696156f7da678a030623e77c766949c SHA512 04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e
diff --git a/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch b/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch
new file mode 100644
index 00000000000..1b99061e6bf
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch
@@ -0,0 +1,54 @@
+From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+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.3-no-financequote.patch b/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch
new file mode 100644
index 00000000000..a9435906276
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch
@@ -0,0 +1,181 @@
+From 4f79ab942936c2985136575e9244aae4d9b81323 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Fri, 24 Jan 2020 09:47:28 +0100
+Subject: [PATCH] Add option ENABLE_FINANCEQUOTE and set to false by default on
+ Windows
+
+Financequote needs perl, which isn't supported on Windows yet.
+---
+ CMakeLists.txt | 10 ++++++++++
+ src/CMakeLists.txt | 15 ++++++++++-----
+ src/alkonlinequote.cpp | 7 ++++++-
+ src/alkonlinequotesprofile.cpp | 7 ++++++-
+ tools/onlinequoteseditor/mainwindow.cpp | 2 ++
+ 5 files changed, 34 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae48620..02bea7c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,16 @@ option(BUILD_QT4 "Build for Qt4" OFF)
+ option(BUILD_DOXYGEN_DOCS "Build api docs" ON)
+ option(BUILD_APPLETS "Build plasma applets" ON)
+
++if(WIN32)
++ set(ENABLE_FINANCEQUOTE_DEFAULT 0)
++else()
++ set(ENABLE_FINANCEQUOTE_DEFAULT 1)
++endif()
++option(ENABLE_FINANCEQUOTE "Enable finance quote support (requires perl)" ENABLE_FINANCEQUOTE_DEFAULT)
++if(ENABLE_FINANCEQUOTE)
++ add_definitions(-DENABLE_FINANCEQUOTE)
++endif()
++
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2692a79..b863fa1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -49,7 +49,6 @@ set(ALKIMIA_LIB_SOVERSION "${alkimia_VERSION_MAJOR}")
+
+ set(alkimia_LIB_SRCS
+ alkcompany.cpp
+- alkfinancequoteprocess.cpp
+ alkonlinequote.cpp
+ alkonlinequotesource.cpp
+ alkonlinequotesprofile.cpp
+@@ -61,7 +60,6 @@ set(alkimia_LIB_SRCS
+
+ set(alkimia_LIB_HEADERS
+ alkcompany.h
+- alkfinancequoteprocess.h
+ alkonlinequote.h
+ alkonlinequotesource.h
+ alkonlinequotesprofile.h
+@@ -70,6 +68,11 @@ set(alkimia_LIB_HEADERS
+ alkwebpage.h
+ )
+
++if(ENABLE_FINANCEQUOTE)
++ list(APPEND alkimia_LIB_SRCS alkfinancequoteprocess.cpp)
++ list(APPEND alkimia_LIB_HEADERS alkfinancequoteprocess.h)
++endif()
++
+ set(alkimia_UI
+ alkonlinequoteswidget.ui
+ )
+@@ -177,9 +180,11 @@ install(FILES
+ make_directory(${FQ_LOCAL_INSTALL_PATH})
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/financequote.pl ${FQ_LOCAL_INSTALL_PATH}/financequote.pl IMMEDIATE COPYONLY)
+
+-install(PROGRAMS financequote.pl
+- DESTINATION ${APPDATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
+-)
++if(ENABLE_FINANCEQUOTE)
++ install(PROGRAMS financequote.pl
++ DESTINATION ${APPDATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
++ )
++endif()
+
+ if (NOT WIN32)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia${ALKIMIA_PATH_SUFFIX}.pc IMMEDIATE @ONLY)
+diff --git a/src/alkonlinequote.cpp b/src/alkonlinequote.cpp
+index 5b1b6e6..83a839c 100644
+--- a/src/alkonlinequote.cpp
++++ b/src/alkonlinequote.cpp
+@@ -337,6 +337,7 @@ bool AlkOnlineQuote::Private::launchNative(const QString &_symbol, const QString
+ return result;
+ }
+
++#ifdef ENABLE_FINANCEQUOTE
+ bool AlkOnlineQuote::Private::launchFinanceQuote(const QString &_symbol, const QString &_id,
+ const QString &_sourcename)
+ {
+@@ -374,6 +375,7 @@ bool AlkOnlineQuote::Private::launchFinanceQuote(const QString &_symbol, const Q
+ }
+ return result;
+ }
++#endif
+
+ bool AlkOnlineQuote::Private::parsePrice(const QString &_pricestr)
+ {
+@@ -560,10 +562,13 @@ void AlkOnlineQuote::setAcceptLanguage(const QString &language)
+
+ bool AlkOnlineQuote::launch(const QString &_symbol, const QString &_id, const QString &_source)
+ {
++#ifdef ENABLE_FINANCEQUOTE
+ if (AlkOnlineQuoteSource::isFinanceQuote(_source) ||
+ d->m_profile->type() == AlkOnlineQuotesProfile::Type::Script) {
+ return d->launchFinanceQuote(_symbol, _id, _source);
+- } else if (_source.endsWith(".css")) {
++ } else
++#endif
++ if (_source.endsWith(".css")) {
+ return d->launchWebKitCssSelector(_symbol, _id, _source);
+ } else if (_source.endsWith(".webkit")) {
+ return d->launchWebKitHtmlParser(_symbol, _id, _source);
+diff --git a/src/alkonlinequotesprofile.cpp b/src/alkonlinequotesprofile.cpp
+index c3a6c96..637fb38 100644
+--- a/src/alkonlinequotesprofile.cpp
++++ b/src/alkonlinequotesprofile.cpp
+@@ -59,11 +59,12 @@ public:
+ , m_config(0)
+ , m_type(Type::Undefined)
+ {
+-
++#ifdef ENABLE_FINANCEQUOTE
+ if (m_financeQuoteScriptPath.isEmpty()) {
+ m_financeQuoteScriptPath = KGlobal::dirs()->findResource("appdata",
+ QString("misc/financequote.pl"));
+ }
++#endif
+ }
+
+ ~Private()
+@@ -135,6 +136,7 @@ public Q_SLOTS:
+ return groups;
+ }
+
++#ifdef ENABLE_FINANCEQUOTE
+ const QStringList quoteSourcesFinanceQuote()
+ {
+ if (m_financeQuoteSources.empty()) { // run the process one time only
+@@ -153,6 +155,7 @@ public Q_SLOTS:
+ }
+ return m_financeQuoteSources;
+ }
++#endif
+
+ const QStringList quoteSourcesSkrooge()
+ {
+@@ -391,9 +394,11 @@ const QStringList AlkOnlineQuotesProfile::quoteSources()
+ case AlkOnlineQuotesProfile::Type::KMyMoney5:
+ result << d->quoteSourcesNative();
+ break;
++#ifdef ENABLE_FINANCEQUOTE
+ case AlkOnlineQuotesProfile::Type::Script:
+ result << d->quoteSourcesFinanceQuote();
+ break;
++#endif
+ case AlkOnlineQuotesProfile::Type::None:
+ result << d->defaultQuoteSources().keys();
+ break;
+diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
+index 59af0c4..791b1e6 100644
+--- a/tools/onlinequoteseditor/mainwindow.cpp
++++ b/tools/onlinequoteseditor/mainwindow.cpp
+@@ -82,7 +82,9 @@ MainWindow::MainWindow(QWidget *parent)
+ manager.addProfile(new AlkOnlineQuotesProfile("skrooge5", AlkOnlineQuotesProfile::Type::Skrooge5, "skrooge-quotes.knsrc"));
+ manager.addProfile(new AlkOnlineQuotesProfile("kmymoney5", AlkOnlineQuotesProfile::Type::KMyMoney5, "kmymoney-quotes.knsrc"));
+ #endif
++#ifdef ENABLE_FINANCEQUOTE
+ manager.addProfile(new AlkOnlineQuotesProfile("Finance::Quote", AlkOnlineQuotesProfile::Type::Script));
++#endif
+ d->ui.setupUi(this);
+
+ d->quotesWidget = new AlkOnlineQuotesWidget(true, true);
+--
+GitLab
+
diff --git a/app-office/libalkimia/libalkimia-8.0.3.ebuild b/app-office/libalkimia/libalkimia-8.0.3.ebuild
new file mode 100644
index 00000000000..65225f91578
--- /dev/null
+++ b/app-office/libalkimia/libalkimia-8.0.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="alkimia"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${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
+https://community.kde.org/Alkimia"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8"
+IUSE="doc gmp plasma"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ !gmp? ( sci-libs/mpir:=[cxx] )
+ gmp? ( dev-libs/gmp:0=[cxx] )
+ plasma? (
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-no-financequote.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_FINANCEQUOTE=OFF
+ -DBUILD_WITH_WEBKIT=OFF
+ -DBUILD_DOXYGEN_DOCS=$(usex doc)
+ $(cmake_use_find_package !gmp MPIR)
+ -DBUILD_APPLETS=$(usex plasma)
+ )
+ ecm_src_configure
+}