Builds fine with Ninja. ok rsadowski@
On Tue Aug 15, 2017 at 02:36:01PM +0200, David Coppa wrote:
>
> All these fixes come from upstream git. With somewhat misleading
> comments, but hey...
>
> OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/productivity/kmymoney/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- Makefile 27 Jul 2017 10:05:20 -0000 1.12
> +++ Makefile 15 Aug 2017 12:33:32 -0000
> @@ -66,9 +66,6 @@ CONFIGURE_ARGS = -DENABLE_KBANKING:Bool=
>
> TEST_IS_INTERACTIVE = X11
>
> -# fails to pick up something MOC-generated in
> kmymoney/plugins/onlinetasks/sepa
> -USE_NINJA = No
> -
> post-install:
> ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py
> ${PREFIX}/share/apps/kmm_weboob/weboob.py
>
> Index: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
> diff -N patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-kmymoney_dialogs_settings_CMakeLists_txt 15 Aug 2017
> 12:33:32 -0000
> @@ -0,0 +1,33 @@
> +$OpenBSD$
> +
> +commit b0a68ca075928aa29ee1e0007bfb14d714f5a948
> +Author: Ralf Habacker <[email protected]>
> +Date: Thu Aug 10 13:45:04 2017 +0200
> +
> +Fix 'Compile error on Fedora 26'
> +
> +CMake build system used some outdated variables which has been replaced
> +by cmake built-in variables to fix the issue.
> +
> +* Unbreaks Ninja builds too
> +
> +Index: kmymoney/dialogs/settings/CMakeLists.txt
> +--- kmymoney/dialogs/settings/CMakeLists.txt.orig
> ++++ 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
> Index: patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
> diff -N patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
> 15 Aug 2017 12:33:32 -0000
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +commit 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5
> +Author: Ralf Habacker <[email protected]>
> +Date: Tue May 23 19:52:20 2017 +0200
> +
> +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.
> +
> +* Unbreaks Ninja builds too
> +
> +Index: kmymoney/plugins/onlinetasks/national/CMakeLists.txt
> +--- kmymoney/plugins/onlinetasks/national/CMakeLists.txt.orig
> ++++ 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
> Index: patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt
> ===================================================================
> RCS file:
> /cvs/ports/productivity/kmymoney/patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt
> --- patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt 14 Jan
> 2017 11:19:04 -0000 1.1
> +++ patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt 15 Aug
> 2017 12:33:32 -0000
> @@ -1,7 +1,28 @@
> $OpenBSD: patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt,v 1.1
> 2017/01/14 11:19:04 zhuk Exp $
> ---- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt.orig Fri Jan 13
> 18:59:04 2017
> -+++ kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt Fri Jan 13 19:00:13 2017
> -@@ -27,21 +27,21 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-se
> +
> +commit 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5
> +Author: Ralf Habacker <[email protected]>
> +Date: Tue May 23 19:52:20 2017 +0200
> +
> +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.
> +
> +* Unbreaks Ninja builds too
> +
> +Index: kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
> +--- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt.orig
> ++++ 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
> +@@ -27,21 +26,21 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-se
>
> configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-sepastorageplugin.desktop.in
> ${CMAKE_CURRENT_BINARY_DIR}/kmymoney-sepastorageplugin.desktop)
>
> target_link_libraries( konlinetasks_sepa
