[gentoo-commits] proj/kde:master commit in: app-office/libalkimia/files/, app-office/libalkimia/

[Andreas Sturmlechner]

commit:     fca36a2ec39f55a37e8d3cf66af6fabc22bd7f84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 20:38:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 20:38:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fca36a2e

app-office/libalkimia: 8.0.2 version bump

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...libalkimia-8.0.1-limit-knewstuff-profiles.patch | 37 -------------
 .../files/libalkimia-8.0.1-plasma-optional.patch   | 60 ----------------------
 ...lkimia-8.0.1.ebuild => libalkimia-8.0.2.ebuild} |  6 +--
 3 files changed, 1 insertion(+), 102 deletions(-)

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@×××××××.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@×××××××.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
similarity index 91%
rename from app-office/libalkimia/libalkimia-8.0.1.ebuild
rename to 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=(