diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-10-20 18:08:58 +0200 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-10-21 08:03:19 +1100 |
| commit | 70e630f611892ce91504a3dc5abd7d1d0c3adcfc (patch) | |
| tree | 9d530dc0c978ae3df749273c6626dfb43916a7c5 /kde-base | |
| parent | media-gfx/digikam: version bump (diff) | |
| download | gentoo-70e630f611892ce91504a3dc5abd7d1d0c3adcfc.tar.gz gentoo-70e630f611892ce91504a3dc5abd7d1d0c3adcfc.tar.bz2 gentoo-70e630f611892ce91504a3dc5abd7d1d0c3adcfc.zip | |
kde-base/kdelibs: Fix build w/ GCC-6.2
Gentoo-bug: 582480
Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch | 51 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.25.ebuild | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch b/kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch new file mode 100644 index 000000000000..5bec01792047 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch @@ -0,0 +1,51 @@ +From: Albert Astals Cid <aacid@kde.org> +Date: Wed, 19 Oct 2016 12:44:03 +0000 +Subject: Fix HAVE_TRUNC cmake check +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=0c642ae95dacf894e50630ffcc1961ad1e4e0322 +--- +Fix HAVE_TRUNC cmake check + +On newer distros the check fails because trunc is ambiguous, so tell sizeof exactly which trunc we're speaking about. + +REVIEW: 129119 +--- + + +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -244,7 +244,7 @@ + check_prototype_exists(usleep unistd.h HAVE_USLEEP_PROTO) + check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO) + check_prototype_exists(setreuid unistd.h HAVE_SETREUID_PROTO) +-check_prototype_exists(trunc math.h HAVE_TRUNC) ++check_prototype_exists(trunc math.h HAVE_TRUNC "(double (*)(double))") + + # check for existing datatypes + + +--- a/cmake/modules/CheckPrototypeExists.cmake ++++ b/cmake/modules/CheckPrototypeExists.cmake +@@ -21,6 +21,13 @@ + INCLUDE(CheckCXXSourceCompiles) + + MACRO (CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT) ++ SET(extra_macro_args ${ARGN}) ++ LIST(LENGTH extra_macro_args num_extra_args) ++ SET(_PROTOTYPE "") ++ IF (${num_extra_args} EQUAL 1) ++ LIST(GET extra_macro_args 0 _PROTOTYPE) ++ ENDIF () ++ + SET(_INCLUDE_FILES) + FOREACH (it ${_HEADER}) + SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n") +@@ -31,7 +38,7 @@ + int main() + { + #ifndef ${_SYMBOL} +- int i = sizeof(&${_SYMBOL}); ++ int i = sizeof(${_PROTOTYPE}&${_SYMBOL}); + #endif + return 0; + } + diff --git a/kde-base/kdelibs/kdelibs-4.14.25.ebuild b/kde-base/kdelibs/kdelibs-4.14.25.ebuild index 430c9104c029..9e506d7be2f1 100644 --- a/kde-base/kdelibs/kdelibs-4.14.25.ebuild +++ b/kde-base/kdelibs/kdelibs-4.14.25.ebuild @@ -132,6 +132,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.10.0-udisks.patch" "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" "${FILESDIR}/${PN}-4.14.22-webkit.patch" + "${FILESDIR}/${PN}-4.14.25-gcc62.patch" ) pkg_pretend() { |