rev 20926 - in kde-extras/kmymoney2/trunk/debian: . patches
Pino Toscano
pino at moszumanska.debian.org
Thu Dec 21 10:34:06 UTC 2017
Author: pino
Date: 2017-12-21 10:34:06 +0000 (Thu, 21 Dec 2017)
New Revision: 20926
Added:
kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-Compile-error-on-Fedora-26.patch
kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-compilation-with-CMake-3.9.patch
kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-duplicated-symbol-compile-error-on-Windows.patch
Modified:
kde-extras/kmymoney2/trunk/debian/changelog
kde-extras/kmymoney2/trunk/debian/patches/series
Log:
fix build with newer cmake (#871373)
Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog 2017-12-21 10:09:20 UTC (rev 20925)
+++ kde-extras/kmymoney2/trunk/debian/changelog 2017-12-21 10:34:06 UTC (rev 20926)
@@ -5,6 +5,12 @@
* Replace patch soname.diff with the backport of the upstream commit
1b818335b4242ad5096489ab4f8e3e7c3fc62d55; patch
upstream_Added-versioning-to-kmm_payeeidentifier-library.patch.
+ * Backport upstream commits 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5,
+ b0a68ca075928aa29ee1e0007bfb14d714f5a948 and
+ 79176db9fa18a7486f4c1194ea3377eb6637a023 to fix build with newer cmake;
+ patches upstream_Fix-duplicated-symbol-compile-error-on-Windows.patch,
+ upstream_Fix-Compile-error-on-Fedora-26.patch and
+ upstream_Fix-compilation-with-CMake-3.9.patch. (Closes: #871373)
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Thu, 21 Dec 2017 10:53:53 +0100
Modified: kde-extras/kmymoney2/trunk/debian/patches/series
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/series 2017-12-21 10:09:20 UTC (rev 20925)
+++ kde-extras/kmymoney2/trunk/debian/patches/series 2017-12-21 10:34:06 UTC (rev 20926)
@@ -1,3 +1,6 @@
upstream_cmake-do-not-install-the-appdata-as-executable.patch
upstream_cmake-fix-appdata-installation-directory.patch
upstream_Added-versioning-to-kmm_payeeidentifier-library.patch
+upstream_Fix-duplicated-symbol-compile-error-on-Windows.patch
+upstream_Fix-Compile-error-on-Fedora-26.patch
+upstream_Fix-compilation-with-CMake-3.9.patch
Added: kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-Compile-error-on-Fedora-26.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-Compile-error-on-Fedora-26.patch (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-Compile-error-on-Fedora-26.patch 2017-12-21 10:34:06 UTC (rev 20926)
@@ -0,0 +1,38 @@
+From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker at freenet.de>
+Date: Thu, 10 Aug 2017 13:45:04 +0200
+Subject: [PATCH] Fix 'Compile error on Fedora 26'
+
+CMake build system used some outdated variables which has been replaced
+by cmake build in variables to fix the issue.
+
+FIXED-IN:4.8.1
+BUG:383351
+---
+ kmymoney/dialogs/settings/CMakeLists.txt | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/settings/CMakeLists.txt
+index 5aacbea7..b007dfb9 100644
+--- a/kmymoney/dialogs/settings/CMakeLists.txt
++++ b/kmymoney/dialogs/settings/CMakeLists.txt
+@@ -1,12 +1,11 @@
+ add_custom_command(
+- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
+- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
+- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
++ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
++ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
+ )
+
+-
+ set (libsettings_a_SOURCES
+- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
++ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
+ ksettingscolors.cpp
+ ksettingsfonts.cpp
+ ksettingsforecast.cpp
+--
+2.15.1
+
Added: kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-compilation-with-CMake-3.9.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-compilation-with-CMake-3.9.patch (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-compilation-with-CMake-3.9.patch 2017-12-21 10:34:06 UTC (rev 20926)
@@ -0,0 +1,44 @@
+From 79176db9fa18a7486f4c1194ea3377eb6637a023 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker at freenet.de>
+Date: Sun, 3 Sep 2017 14:57:12 +0200
+Subject: [PATCH] Fix compilation with CMake 3.9
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>
+(cherry picked from commit 747762d138682be9abbe7307680013cd643da8cb)
+
+# Conflicts:
+# kmymoney/mymoney/CMakeLists.txt
+# kmymoney/mymoney/storage/tests/CMakeLists.txt
+# kmymoney/mymoney/tests/CMakeLists.txt
+
+FIXED-IN:4.8.1
+BUG:384258
+---
+ kmymoney/mymoney/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.txt
+index cd6771d4..6389cadb 100644
+--- a/kmymoney/mymoney/CMakeLists.txt
++++ b/kmymoney/mymoney/CMakeLists.txt
+@@ -62,12 +62,13 @@ target_link_libraries(kmm_mymoney LINK_PUBLIC
+ ${LIBALKIMIA_LIBRARIES}
+ kmm_storage
+ # onlinetask_interfaces
+- onlinetask_unavailabletask
+ kmm_payeeidentifier_loader
+ kmm_payeeidentifier
+ payeeidentifier_iban_bic
+ payeeidentifier_nationalAccount
+ kmm_config
++ LINK_PRIVATE
++ onlinetask_unavailabletask
+ )
+
+ set_target_properties(kmm_mymoney PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+--
+2.15.1
+
Added: kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-duplicated-symbol-compile-error-on-Windows.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-duplicated-symbol-compile-error-on-Windows.patch (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/upstream_Fix-duplicated-symbol-compile-error-on-Windows.patch 2017-12-21 10:34:06 UTC (rev 20926)
@@ -0,0 +1,39 @@
+From 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker at freenet.de>
+Date: Tue, 23 May 2017 19:52:20 +0200
+Subject: [PATCH] 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 d3e7c44f..5710c705 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 3c2d9db1..8415c69d 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.15.1
+
More information about the pkg-kde-commits
mailing list