- remove obsolete patches

- fix unknown annotation
- update install
- disabled designer support (dev only, needs kde4(?) and broken)

diff --git a/0240-Fix-duplicated-symbol-compile-error-on-Windows.patch b/0240-Fix-duplicated-symbol-compile-error-on-Windows.patch
deleted file mode 100644 (file)
index c952196..0000000
--- a/0240-Fix-duplicated-symbol-compile-error-on-Windows.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Tue, 23 May 2017 19:52:20 +0200
-Subject: [PATCH 240/258] Fix 'duplicated symbol' compile error on Windows.
-
-Because the whole project uses cmake automoc support additional
-calls to automoc4 causes 'duplicated symbol' errors on Windows.
----
- kmymoney/plugins/onlinetasks/national/CMakeLists.txt | 1 -
- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt     | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/kmymoney/plugins/onlinetasks/national/CMakeLists.txt b/kmymoney/plugins/onlinetasks/national/CMakeLists.txt
-index d3e7c44..5710c70 100644
---- a/kmymoney/plugins/onlinetasks/national/CMakeLists.txt
-+++ b/kmymoney/plugins/onlinetasks/national/CMakeLists.txt
-@@ -20,7 +20,6 @@ kde4_add_ui_files( konlinetasks_national_SCRS
- )
- 
- # Make this plugin unit testable
--automoc4(konlinetasks_national_OBJECTS konlinetasks_national_SCRS)
- add_library( konlinetasks_national_OBJECTS OBJECT ${konlinetasks_national_SCRS} )
- 
- # Add plugin which is not allowed in the unit test
-diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-index 3c2d9db..8415c69 100644
---- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-+++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-@@ -12,7 +12,6 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS
-   ui/sepacredittransferedit.ui
- )
- 
--automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS)
- add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} )
- 
- # Add actual plugin here it is not part of the objects
--- 
-2.9.4
-

diff --git a/kmymoney.spec b/kmymoney.spec
index b00fc4f93197a7d3a170577e5516d1ba71bfe965..36e2b0447edf09477960e70b101128f427fe02ed 100644 (file)
--- a/kmymoney.spec
+++ b/kmymoney.spec
@@ -15,10 +15,7 @@ Group:               X11/Applications
 Source0:       https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
 # Source0-md5: 386a53cac09052aba2a343badabe4256
 URL:           https://kmymoney.org/
-#Patch0:               %{name}-desktop.patch
-#Patch1:               %{name}-man.patch
-#Patch2:               %{name}-types.patch
-#Patch3:               0240-Fix-duplicated-symbol-compile-error-on-Windows.patch
+Patch0:                qt-deprecated.patch
 BuildRequires: Qt5Core-devel
 BuildRequires: Qt5DBus-devel
 BuildRequires: Qt5Widgets-devel
@@ -134,17 +131,14 @@ Biblioteka widgetów KMyMoney dla QtDesignera.
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%patch0 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
        %{?with_kbanking:-DENABLE_KBANKING=ON} \
-       -DUSE_QT_DESIGNER=ON
+       -DUSE_QT_DESIGNER=OFF
 
 %{__make}
 
@@ -155,13 +149,7 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/apps/appdata \
-       $RPM_BUILD_ROOT%{_datadir}
-
-%find_lang %{real_name} --with-kde
-
-# not supported in pld
-%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/locolor
+%find_lang %{name} --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -169,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f %{real_name}.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS README.Fileformats TODO
 %attr(755,root,root) %{_bindir}/kmymoney

diff --git a/kmymoney2-desktop.patch b/kmymoney2-desktop.patch
deleted file mode 100644 (file)
index 2277a1f..0000000
--- a/kmymoney2-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- kmymoney-4.8.0/kmymoney/kmymoney.desktop.orig      2016-06-14 21:16:15.571035117 +0200
-+++ kmymoney-4.8.0/kmymoney/kmymoney.desktop   2017-02-09 20:51:56.676477194 +0100
-@@ -109,5 +109,5 @@
- Type=Application
- X-DocPath=kmymoney/index.html
- Icon=kmymoney
--Categories=Office;Finance;
-+Categories=Qt;KDE;Office;Finance;
- StartupWMClass=Kmymoney

diff --git a/kmymoney2-man.patch b/kmymoney2-man.patch
deleted file mode 100644 (file)
index a15eae1..0000000
--- a/kmymoney2-man.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- kmymoney-4.8.0/doc/en_US/CMakeLists.txt.orig       2016-06-14 21:17:17.537030935 +0200
-+++ kmymoney-4.8.0/doc/en_US/CMakeLists.txt    2017-02-09 21:21:41.597329522 +0100
-@@ -1 +1,2 @@
- kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney )
-+kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})

diff --git a/kmymoney2-types.patch b/kmymoney2-types.patch
deleted file mode 100644 (file)
index e951f61..0000000
--- a/kmymoney2-types.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- kmymoney-4.8.0/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp.orig   2016-06-14 21:16:15.585035116 +0200
-+++ kmymoney-4.8.0/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp        2017-02-10 22:14:40.088737421 +0100
-@@ -41,6 +41,11 @@
-   delete m;
- }
- 
-+inline size_t sz(unsigned val)
-+{
-+  return static_cast<size_t>(val);
-+}
-+
- void MyMoneySeqAccessMgrTest::testEmptyConstructor()
- {
-   MyMoneyPayee user = m->user();
-@@ -58,13 +63,13 @@
-   QCOMPARE(m->m_nextPayeeID, 0ul);
-   QCOMPARE(m->m_nextScheduleID, 0ul);
-   QCOMPARE(m->m_nextReportID, 0ul);
--  QCOMPARE(m->m_institutionList.count(), 0ul);
--  QCOMPARE(m->m_accountList.count(), 5ul);
--  QCOMPARE(m->m_transactionList.count(), 0ul);
--  QCOMPARE(m->m_transactionKeys.count(), 0ul);
--  QCOMPARE(m->m_payeeList.count(), 0ul);
--  QCOMPARE(m->m_tagList.count(), 0ul);
--  QCOMPARE(m->m_scheduleList.count(), 0ul);
-+  QCOMPARE(m->m_institutionList.count(), sz(0u));
-+  QCOMPARE(m->m_accountList.count(), sz(5u));
-+  QCOMPARE(m->m_transactionList.count(), sz(0u));
-+  QCOMPARE(m->m_transactionKeys.count(), sz(0u));
-+  QCOMPARE(m->m_payeeList.count(), sz(0u));
-+  QCOMPARE(m->m_tagList.count(), sz(0u));
-+  QCOMPARE(m->m_scheduleList.count(), sz(0u));
- 
-   QCOMPARE(m->m_dirty, false);
-   QCOMPARE(m->m_creationDate, QDate::currentDate());

diff --git a/qt-deprecated.patch b/qt-deprecated.patch
new file mode 100644 (file)
index 0000000..e15d3f4
--- /dev/null
+++ b/qt-deprecated.patch
@@ -0,0 +1,11 @@
+--- kmymoney-5.1.2/kmymoney/plugins/kbanking/kbanking.h~       2021-06-23 17:49:12.000000000 +0200
++++ kmymoney-5.1.2/kmymoney/plugins/kbanking/kbanking.h        2021-10-27 00:48:05.130776795 +0200
+@@ -158,7 +158,7 @@
+       *
+       * @deprecated
+       */
+-    bool updateAccount(const MyMoneyAccount& acc) DEPRECATED;
++    bool updateAccount(const MyMoneyAccount& acc) QT_DEPRECATED;
+ 
+     /**
+       * Trigger the password cache timer