From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-966609-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1B9731396D0
for <garchives@archives.gentoo.org>; Sat, 12 Aug 2017 08:20:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4B0FBE0E62;
Sat, 12 Aug 2017 08:20:34 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 181C6E0E62
for <gentoo-commits@lists.gentoo.org>; Sat, 12 Aug 2017 08:20:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A6A963417D2
for <gentoo-commits@lists.gentoo.org>; Sat, 12 Aug 2017 08:20:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 25CB47675
for <gentoo-commits@lists.gentoo.org>; Sat, 12 Aug 2017 08:20:31 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1502526018.807894ae54d9743b03088f9315d492e286c352d1.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
X-VCS-Directories: app-office/kmymoney/files/ app-office/kmymoney/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 807894ae54d9743b03088f9315d492e286c352d1
X-VCS-Branch: master
Date: Sat, 12 Aug 2017 08:20:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5929e047-c9bb-4108-b313-f569f0bba9e7
X-Archives-Hash: fe2d383ec209988d0a8ff280b290f315
commit: 807894ae54d9743b03088f9315d492e286c352d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 08:19:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 08:20:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807894ae
app-office/kmymoney: Fix build with cmake-3.9
Tested-by: David Zaslavsky <diazona <AT> ellipsix.net>
Gentoo-bug: 627672
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch | 38 ++++++++++++++++++++++
app-office/kmymoney/kmymoney-4.8.0-r2.ebuild | 1 +
2 files changed, 39 insertions(+)
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 00000000000..93e8809d824
--- /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 757dc00ef9c..b49b40c1df4 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() {