Hello community,

here is the log from the commit of package kmymoney for openSUSE:Factory 
checked in at 2017-06-05 18:50:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmymoney (Old)
 and      /work/SRC/openSUSE:Factory/.kmymoney.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kmymoney"

Mon Jun  5 18:50:14 2017 rev:51 rq:500918 version:4.8.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes        2017-02-06 
15:21:26.530339524 +0100
+++ /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney.changes   2017-06-05 
18:50:15.585914388 +0200
@@ -1,0 +2,5 @@
+Fri Jun  2 17:57:31 UTC 2017 - wba...@tmo.at
+
+- Add fix-build.patch to fix build with latest cmake in Factory
+
+-------------------------------------------------------------------

New:
----
  fix-build.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kmymoney.spec ++++++
--- /var/tmp/diff_new_pack.m66890/_old  2017-06-05 18:50:16.497785855 +0200
+++ /var/tmp/diff_new_pack.m66890/_new  2017-06-05 18:50:16.497785855 +0200
@@ -26,6 +26,8 @@
 Source0:        
http://download.kde.org/stable/kmymoney/%{version}/src/%{name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM kmymoney-4.8.0-fix-csv-import-account-type.patch 
kde#364425
 Patch1:         kmymoney-4.8.0-fix-csv-import-account-type.patch
+# PATCH-FIX-UPSTREAM fix-build.patch -- fix build with latest cmake in Factory
+Patch2:         fix-build.patch
 BuildRequires:  aqbanking-devel
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_headers-devel
@@ -87,6 +89,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %cmake_kde4 -d build

++++++ fix-build.patch ++++++
>From 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habac...@freenet.de>
Date: Tue, 23 May 2017 19:52:20 +0200
Subject: 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
-- 
cgit v0.11.2


Reply via email to