diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-12 10:19:50 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-12 10:20:18 +0200 |
| commit | 807894ae54d9743b03088f9315d492e286c352d1 (patch) | |
| tree | 09a793797bd13859879c0ef662ae9ace5a116d24 /app-office | |
| parent | Revert "net-misc/icaclient: fix RevDep webkit-gtk:2 to SLOT 4" (diff) | |
| download | gentoo-807894ae54d9743b03088f9315d492e286c352d1.tar.gz gentoo-807894ae54d9743b03088f9315d492e286c352d1.tar.bz2 gentoo-807894ae54d9743b03088f9315d492e286c352d1.zip | |
app-office/kmymoney: Fix build with cmake-3.9
Tested-by: David Zaslavsky <diazona@ellipsix.net>
Gentoo-bug: 627672
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch | 38 | ||||
| -rw-r--r-- | app-office/kmymoney/kmymoney-4.8.0-r2.ebuild | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch b/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch new file mode 100644 index 000000000000..93e8809d824a --- /dev/null +++ b/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch @@ -0,0 +1,38 @@ +From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001 +From: Ralf Habacker <ralf.habacker@freenet.de> +Date: Thu, 10 Aug 2017 13:45:04 +0200 +Subject: 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 5aacbea..b007dfb 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 +-- +cgit v0.11.2 + diff --git a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild index 757dc00ef9c3..b49b40c1df49 100644 --- a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild +++ b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}/${P}-gpgmepp.patch" "${FILESDIR}/${P}-kdepimlibs-optional.patch" "${FILESDIR}/${P}-drop-national-onlinetasks.patch" + "${FILESDIR}/${P}-cmake-3.9.patch" ) src_prepare() { |