From 597cf877a96d1f9b30e77ce78de982eaa872be8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 8 Oct 2017 21:54:45 +0200 Subject: [PATCH] - fix automoc breakage - rel 4 --- ...ated-symbol-compile-error-on-Windows.patch | 39 +++++++++++++++++++ kmymoney2.spec | 4 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0240-Fix-duplicated-symbol-compile-error-on-Windows.patch diff --git a/0240-Fix-duplicated-symbol-compile-error-on-Windows.patch b/0240-Fix-duplicated-symbol-compile-error-on-Windows.patch new file mode 100644 index 0000000..c952196 --- /dev/null +++ b/0240-Fix-duplicated-symbol-compile-error-on-Windows.patch @@ -0,0 +1,39 @@ +From 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5 Mon Sep 17 00:00:00 2001 +From: Ralf Habacker +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/kmymoney2.spec b/kmymoney2.spec index 8912733..ef296d1 100644 --- a/kmymoney2.spec +++ b/kmymoney2.spec @@ -11,7 +11,7 @@ Summary: Personal finance application similar to Microsoft Money Summary(pl.UTF-8): Program do finansów osobistych, podobny do Microsoft Money Name: kmymoney2 Version: 4.8.0 -Release: 3 +Release: 4 License: GPL v2+ Group: X11/Applications Source0: http://downloads.sourceforge.net/kmymoney2/%{real_name}-%{version}.tar.xz @@ -20,6 +20,7 @@ URL: http://kmymoney2.sourceforge.net/ Patch0: %{name}-desktop.patch Patch1: %{name}-man.patch Patch2: %{name}-types.patch +Patch3: 0240-Fix-duplicated-symbol-compile-error-on-Windows.patch %{?with_kbanking:BuildRequires: aqbanking-devel >= 5.5.1} BuildRequires: automoc4 BuildRequires: boost-devel >= 1.33.1 @@ -123,6 +124,7 @@ Biblioteka widgetów KMyMoney dla QtDesignera. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build install -d build -- 2.44.0