Accepting request 889053 from home:susnux:branches:KDE:Extra
- Update to version 8.1.0 OBS-URL: https://build.opensuse.org/request/show/889053 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/alkimia?expand=0&rev=32
This commit is contained in:
Christophe Giboudeaux
Git OBS Bridge
parent
0684d0b518
commit
f2e2834ea8
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0004a7068dff0aa2cb6f47f70d21c129073be11f2edb21f14512bc4470487d1f
|
||||
size 221108
|
||||
3
alkimia-8.1.0.tar.xz
Normal file
3
alkimia-8.1.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c
|
||||
size 230804
|
||||
BIN
alkimia-8.1.0.tar.xz.sig
Normal file
BIN
alkimia-8.1.0.tar.xz.sig
Normal file
Binary file not shown.
@ -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>
|
||||
|
||||
|
||||
13
alkimia.spec
13
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user