Skip to content

Commit

Permalink
kde-apps/rocs: backport patch from upstream solving build failure wit…
Browse files Browse the repository at this point in the history
…h Qt 5.7

Gentoo-bug: 591396

Package-Manager: portage-2.3.0
  • Loading branch information
kensington committed Aug 21, 2016
1 parent fd7f5d5 commit 3971180
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
28 changes: 28 additions & 0 deletions kde-apps/rocs/files/rocs-16.04.3-qt57.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From a3194c96250e4325c6af9b75a36d09516fe82420 Mon Sep 17 00:00:00 2001
From: Heiko Becker <[email protected]>
Date: Tue, 21 Jun 2016 11:29:51 +0200
Subject: [PATCH] Pass -fext-numeric-literals to fix the build with Qt 5.7

Otherwise I get "error: unable to find numeric literal operator
'operator""Q' BOOST_DEFINE_MATH_CONSTANT(half, 5.000000000000000..."

REVIEW: 128275
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e2c4e8..5fec78a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
)

+add_definitions(-fext-numeric-literals)
add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
--
2.7.3

2 changes: 2 additions & 0 deletions kde-apps/rocs/rocs-16.04.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ DEPEND="${RDEPEND}
"

RESTRICT=test # 1/10 tests currently fails

PATCHES=( "${FILESDIR}/${P}-qt57.patch" )

0 comments on commit 3971180

Please sign in to comment.