gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 14:49:30 -07:00
Code Issues Projects Releases Wiki Activity

kde-base: Add >=cmake-3.4 configure fix for KDE PIM

Browse Source 
See also: https://bugs.gentoo.org/show_bug.cgi?id=566058
Tested-by: Vadim

Package-Manager: portage-2.2.24
This commit is contained in:
Andreas Sturmlechner
2015-12-13 19:54:59 +01:00
committed by Michael Palimaka
parent b1bea265b2
commit b6eb841a21
6 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kde-base/kmail/files/kdepim-4.14.10-fix-cmake-3.4.patch Normal file
View File

@@ -0,0 +1,23 @@
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 13 Dec 2015 09:20:24 +0000
Subject: Fix configure with >=cmake-3.4
X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=91275a772e51a4031b8f34bc83652b5e60478624
---
Fix configure with >=cmake-3.4
REVIEW: 126334
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@
# where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+include(CheckIncludeFiles)
############### Build Options ###############

2
kde-base/kmail/kmail-4.14.10.ebuild
View File

@@ -74,6 +74,8 @@ KMEXTRA="
KMLOADLIBS="kdepim-common-libs"
PATCHES=( "${FILESDIR}/kdepim-4.14.10-fix-cmake-3.4.patch" )
src_configure() {
# Bug 308903
use ppc64 && append-flags -mminimal-toc

23
kde-base/konsolekalendar/files/kdepim-4.14.10-fix-cmake-3.4.patch Normal file
View File

@@ -0,0 +1,23 @@
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 13 Dec 2015 09:20:24 +0000
Subject: Fix configure with >=cmake-3.4
X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=91275a772e51a4031b8f34bc83652b5e60478624
---
Fix configure with >=cmake-3.4
REVIEW: 126334
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@
# where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+include(CheckIncludeFiles)
############### Build Options ###############

2
kde-base/konsolekalendar/konsolekalendar-4.14.10.ebuild
View File

@@ -46,3 +46,5 @@ KMEXTRACTONLY="
"
KMLOADLIBS="kdepim-common-libs"
PATCHES=( "${FILESDIR}/kdepim-4.14.10-fix-cmake-3.4.patch" )

23
kde-base/korganizer/files/kdepim-4.14.10-fix-cmake-3.4.patch Normal file
View File

@@ -0,0 +1,23 @@
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 13 Dec 2015 09:20:24 +0000
Subject: Fix configure with >=cmake-3.4
X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=91275a772e51a4031b8f34bc83652b5e60478624
---
Fix configure with >=cmake-3.4
REVIEW: 126334
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@
# where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+include(CheckIncludeFiles)
############### Build Options ###############

6
kde-base/korganizer/korganizer-4.14.10.ebuild
View File

@@ -68,6 +68,8 @@ src_unpack() {
}
src_prepare() {
epatch "${FILESDIR}/kdepim-4.14.10-fix-cmake-3.4.patch"
use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
kde4-meta_src_prepare
@@ -76,8 +78,8 @@ src_prepare() {
src_install() {
kde4-meta_src_install
# colliding with kdepim-common-libs
rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
rm -rf "${ED}"usr/share/kde4/servicetypes/calendarplugin.desktop || die
rm -rf "${ED}"usr/share/kde4/servicetypes/calendardecoration.desktop || die
}
pkg_postinst() {