From d73e18d51ddd273e75ca9066361efe77332af2b3 Mon Sep 17 00:00:00 2001 From: tcberner Date: Wed, 19 Apr 2017 15:04:59 +0000 Subject: Update cmake and friends to 3.8.0 * add patch for finance/kmymoney-kde4 * change patch in irc/irssi-fish as pkgconfig handling has changed. PR: 218559 Exp-run by: antoine Reviewed by: mat, rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D9557 --- ...atch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt | 12 ++++++++++++ .../patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt create mode 100644 finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt (limited to 'finance') diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt new file mode 100644 index 000000000000..21d7fd29deee --- /dev/null +++ b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt @@ -0,0 +1,12 @@ +--- kmymoney/plugins/onlinetasks/national/CMakeLists.txt.orig 2017-04-17 10:49:10 UTC ++++ kmymoney/plugins/onlinetasks/national/CMakeLists.txt +@@ -20,7 +20,8 @@ kde4_add_ui_files( konlinetasks_national_SCRS + ) + + # Make this plugin unit testable +-automoc4(konlinetasks_national_OBJECTS konlinetasks_national_SCRS) ++# CMAKE_AUTOMOC is set to TRUE, so don't do it manually too. ++# 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/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt new file mode 100644 index 000000000000..5497d7c317c0 --- /dev/null +++ b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt @@ -0,0 +1,12 @@ +--- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt.orig 2017-04-17 10:48:39 UTC ++++ kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt +@@ -12,7 +12,8 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS + ui/sepacredittransferedit.ui + ) + +-automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS) ++# CMAKE_AUTOMOC is set to TRUE, so don't do it manually too. ++# 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