aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-09-06 22:38:32 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-09-06 22:38:32 +0200
commitfca36a2ec39f55a37e8d3cf66af6fabc22bd7f84 (patch)
tree5a377d636bfd124ea9e830fcfdcea0accd5db52d
parentmedia-gfx/krita: Drop x11-libs/libxcb from DEPENDs (diff)
downloadkde-fca36a2e.tar.gz
kde-fca36a2e.tar.bz2
kde-fca36a2e.zip
app-office/libalkimia: 8.0.2 version bump
Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--app-office/libalkimia/Manifest2
-rw-r--r--app-office/libalkimia/files/libalkimia-8.0.1-limit-knewstuff-profiles.patch37
-rw-r--r--app-office/libalkimia/files/libalkimia-8.0.1-plasma-optional.patch60
-rw-r--r--app-office/libalkimia/libalkimia-8.0.2.ebuild (renamed from app-office/libalkimia/libalkimia-8.0.1.ebuild)6
4 files changed, 2 insertions, 103 deletions
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 5285b69fdf..a05d3c2f0f 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1 +1 @@
-DIST alkimia-8.0.1.tar.xz 209148 BLAKE2B 9be356a3c47b6819f3f18aa20f231b027f32ac25c8d007f7435621380c9562eb8b99c65ae08ec91a06cbc25d1fc70b095836552bf58a524b91bcdd3b4082868d SHA512 be943e854c6c2d3f85332b456be9fb3c3528fac403228a7d4ab9362856d53ea622ba9e96b70f7be47058aa0016eec78381dc7649db3b06938d4547ba1e181517
+DIST alkimia-8.0.2.tar.xz 210540 BLAKE2B ca100c04580e9cc9dde3ecddd8e9d9715ae919521d1640638f7bbca3decfb8981aa3289890c0afa29ccd568396a1e696a2892cf034352d240a1675e5fbafd7ba SHA512 5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6
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
deleted file mode 100644
index b1cbc52542..0000000000
--- a/app-office/libalkimia/files/libalkimia-8.0.1-limit-knewstuff-profiles.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2e1ed56acd4d70b2d7ec99a6605068891d1857ef Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-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
deleted file mode 100644
index 3b7c1ae221..0000000000
--- a/app-office/libalkimia/files/libalkimia-8.0.1-plasma-optional.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 420756a78f783099ddd77b0966d593491d64a767 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-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.2.ebuild
index 368281c787..c070d6c533 100644
--- a/app-office/libalkimia/libalkimia-8.0.1.ebuild
+++ b/app-office/libalkimia/libalkimia-8.0.2.ebuild
@@ -48,11 +48,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-plasma-optional.patch"
- "${FILESDIR}/${P}-limit-knewstuff-profiles.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-8.0.1-cmake.patch" )
src_configure() {
local mycmakeargs=(