Accepting request 889064 from KDE:Extra

- Update to version 8.1.0 * Do not override the global translation domain of the application * Add support for skipping date extraction when a quote service does not provide a valid date * Fix bug not been able to rename local quote source * Many other bugfixes - Update dependencies to build with KF5 - Drop upstream merged 0001-Use-new-KNS-install-location.patch - Add patch from upstream: * 0001-Add-missing-QUrl-include-with-DBUILD_WITH_WEBENGINE.patch OBS-URL: https://build.opensuse.org/request/show/889064 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alkimia?expand=0&rev=8
2021-04-28 23:38:44 +00:00 · 2021-04-28 23:38:44 +00:00 · 3b499d53ae
commit 3b499d53ae
parent aed5526ef1 ef9bc74fd2
7 changed files with 69 additions and 51 deletions
--- a/0001-Add-missing-QUrl-include-with-DBUILD_WITH_WEBENGINE.patch
+++ b/0001-Add-missing-QUrl-include-with-DBUILD_WITH_WEBENGINE.patch
@ -0,0 +1,27 @@
+From 32360d6ec3077c0a69577ed7b8f697f81ba64800 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 5 Mar 2021 22:40:40 +0100
+Subject: [PATCH] Add missing QUrl include with -DBUILD_WITH_WEBENGINE=no
+
+Downstream report: https://bugs.gentoo.org/774321
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ tools/onlinequoteseditor/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
+index fad7e85..d5a3026 100644
+--- a/tools/onlinequoteseditor/mainwindow.cpp
+++ b/tools/onlinequoteseditor/mainwindow.cpp
+@@ -28,6 +28,7 @@
+ #include <QComboBox>
+ #include <QDockWidget>
+ #include <QLineEdit>
+#include <QUrl>
+ 
+ class MainWindow::Private
+ {
+-- 
+2.26.2
+
--- a/0001-Use-new-KNS-install-location.patch
+++ b/0001-Use-new-KNS-install-location.patch
@ -1,44 +0,0 @@
-From 9f2ec226ec0952e45d4cc5de2643f3865f7334c0 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sun, 1 Nov 2020 13:08:04 +0100
-Subject: [PATCH] Use new KNS install location
-
---
- src/CMakeLists.txt             | 6 +++++-
- src/alkonlinequotesprofile.cpp | 3 +++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3a19d34..f5f2768 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -163,7 +163,11 @@ if(BUILD_QT4)
-     set(APPDATA_INSTALL_DIR ${SHARE_INSTALL_DIR}/kde4/apps)
-     set(FQ_LOCAL_INSTALL_PATH ${CMAKE_BINARY_DIR}/share/apps/alkimia${ALKIMIA_PATH_SUFFIX}/misc)
- else()
-    set(KNSRC_INSTALL_DIR ${CONFIG_INSTALL_DIR})
-+    if(KF5NewStuff_VERSION VERSION_GREATER "5.56.0")
-+        set(KNSRC_INSTALL_DIR ${KDE_INSTALL_KNSRCDIR})
-+    else()
-+        set(KNSRC_INSTALL_DIR ${CONFIG_INSTALL_DIR})
-+    endif()
-     set(APPDATA_INSTALL_DIR ${SHARE_INSTALL_DIR})
-     set(FQ_LOCAL_INSTALL_PATH ${CMAKE_BINARY_DIR}/share/alkimia${ALKIMIA_PATH_SUFFIX}/misc)
- endif()
-diff --git a/src/alkonlinequotesprofile.cpp b/src/alkonlinequotesprofile.cpp
-index cc4b70a..d778383 100644
--- a/src/alkonlinequotesprofile.cpp
-+++ b/src/alkonlinequotesprofile.cpp
-@@ -323,6 +323,9 @@ QString AlkOnlineQuotesProfile::name() const
- QString AlkOnlineQuotesProfile::hotNewStuffConfigFile() const
- {
-     QString configFile = KStandardDirs::locate("config", d->m_GHNSFile);
-+    if (configFile.isEmpty()) {
-+         configFile = KStandardDirs::locate("data", "knsrcfiles/" + d->m_GHNSFile);
-+    }
-     if (configFile.isEmpty()) {
-         configFile = QString("%1/%2").arg(KNSRC_DIR, d->m_GHNSFile);
-     }
-- 
-2.30.0
-
--- a/alkimia-8.0.4.tar.xz
+++ b/alkimia-8.0.4.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0004a7068dff0aa2cb6f47f70d21c129073be11f2edb21f14512bc4470487d1f
-size 221108
--- a/alkimia-8.1.0.tar.xz
+++ b/alkimia-8.1.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c
+size 230804
--- a/alkimia-8.1.0.tar.xz.sig
+++ b/alkimia-8.1.0.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEjBO8FBhaZSFbWSovEkMTLNkyF3EFAmA+oxcACgkQEkMTLNky
+F3F1kw//U7/82NkWhf1BUdqoazUqTNZI1jUshj7ewN6pXGGqfAv7PQMgaPAUj4dY
+aOkEC+6pFGbs3HqJ7VT3gk/4KpYz9drtMyTvHVYfjTA4W0weyVA6dQaynRlZQc7S
+TpNsPQlBmh5YdYFHFrdP6AnDQtPIYVdvhOWHdV//KPvvrBXEOnhNB848usxzD5uq
+WnFLyTFOBNmxwIGLKQnMK3dhuLaWQPdB1PTG3qSOePkVH8hGAr+Y+W8bUcHChMRW
+DD17kbizCCvfIsNbGs2RIuAvQB9/jikM/W3QhTneHNnDtCfQVA81ccvyLExoGPlX
+9wShRd1KYp6ZDuh9Q/mCA6RN/IOGJeXD6W/KSJTP/dYKLMpAe0jOdknDEMLAxAy8
+eQrpvT+aczz8CFaCidgTwrxqzf9NnFxfo+Jc1A/2y3r4jps8bfo58D55Urgu6mau
+kwWE/k2qEa798Ql+f4rSBxErp9fbANUrTiOpWcaBBkki0/djw0yA3u9qksIIvXqS
+MIjageuQeEKTgAV20tHMku5zzp46QAUyGpGnwR0tGy/DgsSpt7MkeyB0dNrx3Ot6
+UP2LsDoW5XhusLBk6wE2dY1tIb2qEGevJJ0d7jN491eD4wXuS4rM/2sxFKMw7wE4
+tOCpH+jl2JHlR8+heVqSBti+cIFyqDpFh1YwTC9YSHpBJp7HQek=
+=/Ds+
+-----END PGP SIGNATURE-----
--- a/alkimia.changes
+++ b/alkimia.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Apr 28 14:28:53 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 8.1.0
+  * Do not override the global translation domain of the application
+  * Add support for skipping date extraction when a quote service
+    does not provide a valid date
+  * Fix bug not been able to rename local quote source
+  * Many other bugfixes
+- Update dependencies to build with KF5
+- Drop upstream merged 0001-Use-new-KNS-install-location.patch
+- Add patch from upstream:
+  * 0001-Add-missing-QUrl-include-with-DBUILD_WITH_WEBENGINE.patch
+
 -------------------------------------------------------------------
 Sun Feb  7 08:45:57 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

--- a/alkimia.spec
+++ b/alkimia.spec
@ -19,23 +19,28 @@
 %define sonum 8
 %bcond_without lang
 Name:           alkimia
-Version:        8.0.4
+Version:        8.1.0
 Release:        0
 Summary:        Library with common classes and functionality used by finance applications
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://kmymoney.org/
 Source0:        https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM
-Patch0:         0001-Use-new-KNS-install-location.patch
+Source1:        https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz.sig
+# PATCH-FIX-UPSTREAM fix took from upstream GIT
+Patch0:         0001-Add-missing-QUrl-include-with-DBUILD_WITH_WEBENGINE.patch
 BuildRequires:  doxygen
 BuildRequires:  extra-cmake-modules
 BuildRequires:  gmp-devel
+BuildRequires:  cmake(KF5Completion)
 BuildRequires:  cmake(KF5Config)
 BuildRequires:  cmake(KF5CoreAddons)
-BuildRequires:  cmake(KF5KDELibs4Support)
+BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5IconThemes)
+BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(KF5NewStuff)
 BuildRequires:  cmake(KF5Package)
+BuildRequires:  cmake(KF5TextWidgets)
 BuildRequires:  cmake(Qt5Core) >= 5.2.0
 BuildRequires:  cmake(Qt5DBus) >= 5.2.0
 BuildRequires:  cmake(Qt5Qml) >= 5.2.0