diff --git a/0001-Use-new-KNS-install-location.patch b/0001-Use-new-KNS-install-location.patch new file mode 100644 index 0000000..3220eb7 --- /dev/null +++ b/0001-Use-new-KNS-install-location.patch @@ -0,0 +1,44 @@ +From 9f2ec226ec0952e45d4cc5de2643f3865f7334c0 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +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 + diff --git a/alkimia-8.0.3.tar.xz b/alkimia-8.0.3.tar.xz deleted file mode 100644 index 066db87..0000000 --- a/alkimia-8.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e57ed9279557d8e3575e7556a81b08dff4e882e9f5ad8502da63bfc98c7b33e -size 212780 diff --git a/alkimia-8.0.4.tar.xz b/alkimia-8.0.4.tar.xz new file mode 100644 index 0000000..d41287a --- /dev/null +++ b/alkimia-8.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0004a7068dff0aa2cb6f47f70d21c129073be11f2edb21f14512bc4470487d1f +size 221108 diff --git a/alkimia.changes b/alkimia.changes index 79ea56c..4995f0f 100644 --- a/alkimia.changes +++ b/alkimia.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Feb 7 08:45:57 UTC 2021 - Christophe Giboudeaux + +- Add upstream patch: + * 0001-Use-new-KNS-install-location.patch + +------------------------------------------------------------------- +Fri Feb 05 08:16:29 UTC 2021 - Wang Jun + +- Update to version 8.0.4 + * Add initial QWebEngine support for KF5 builds + * Add debug info for running perl script in + AlkFinanceQuoteProcess::launch() + * Add file menu with entry 'quit' + * Add switch language entry to help menu + * Add option ENABLE_FINANCEQUOTE and set to false by default on Windows + * Bug and crash fixes + * Fix fatal error caused by calling i18n in another thread initiated + * Fix WebEngine/WebKit/Widgets backend choice + * Fix 'alkimia fails to find mpirxx.h + * Remove unused toolbar + ------------------------------------------------------------------- Sat Jan 11 09:28:53 UTC 2020 - Christophe Giboudeaux diff --git a/alkimia.spec b/alkimia.spec index 1ad50c2..cee497b 100644 --- a/alkimia.spec +++ b/alkimia.spec @@ -1,7 +1,7 @@ # # spec file for package alkimia # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,15 @@ %define sonum 8 %bcond_without lang Name: alkimia -Version: 8.0.3 +Version: 8.0.4 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 BuildRequires: doxygen BuildRequires: extra-cmake-modules BuildRequires: gmp-devel @@ -63,11 +65,11 @@ The development files for libalkimia. %lang_package %prep -%setup -q +%autosetup -p1 %build -%cmake_kf5 -d build -- -DBUILD_WITH_WEBKIT=0 -DBUILD_APPLETS=0 -%make_jobs +%cmake_kf5 -d build -- -DBUILD_WITH_WEBKIT=0 -DBUILD_APPLETS=0 -DENABLE_FINANCEQUOTE=1 +%cmake_build %install %kf5_makeinstall -C build @@ -89,15 +91,15 @@ mv %{buildroot}/alkimia5/misc/financequote.pl %{buildroot}%{_datadir}/alkimia5/m %{_kf5_applicationsdir}/org.kde.onlinequoteseditor5.desktop %{_kf5_bindir}/onlinequoteseditor5 %{_kf5_iconsdir}/hicolor/*/apps/onlinequoteseditor5.* +%{_kf5_knsrcfilesdir}/alkimia-quotes.knsrc +%{_kf5_knsrcfilesdir}/kmymoney-quotes.knsrc +%{_kf5_knsrcfilesdir}/skrooge-quotes.knsrc %dir %{_kf5_qmldir}/org/ %dir %{_kf5_qmldir}/org/kde %dir %{_kf5_qmldir}/org/kde/alkimia %{_kf5_qmldir}/org/kde/alkimia/libqmlalkimia.so %{_kf5_qmldir}/org/kde/alkimia/qmldir %{_kf5_sharedir}/alkimia5/ -%{_kf5_sysconfdir}/xdg/alkimia-quotes.knsrc -%{_kf5_sysconfdir}/xdg/kmymoney-quotes.knsrc -%{_kf5_sysconfdir}/xdg/skrooge-quotes.knsrc %files -n libalkimia5-devel %license COPYING.LIB