public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/rocs/, kde-apps/rocs/files/
@ 2016-08-21 19:47 Michael Palimaka
  0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-08-21 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     3971180dcc133af2808dbe3512440775e4eb4f07
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 19:45:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 19:47:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3971180d

kde-apps/rocs: backport patch from upstream solving build failure with Qt 5.7

Gentoo-bug: 591396

Package-Manager: portage-2.3.0

 kde-apps/rocs/files/rocs-16.04.3-qt57.patch | 28 ++++++++++++++++++++++++++++
 kde-apps/rocs/rocs-16.04.3.ebuild           |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/kde-apps/rocs/files/rocs-16.04.3-qt57.patch b/kde-apps/rocs/files/rocs-16.04.3-qt57.patch
new file mode 100644
index 0000000..bd2c020
--- /dev/null
+++ b/kde-apps/rocs/files/rocs-16.04.3-qt57.patch
@@ -0,0 +1,28 @@
+From a3194c96250e4325c6af9b75a36d09516fe82420 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+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
+

diff --git a/kde-apps/rocs/rocs-16.04.3.ebuild b/kde-apps/rocs/rocs-16.04.3.ebuild
index 38ff889..0b560a8 100644
--- a/kde-apps/rocs/rocs-16.04.3.ebuild
+++ b/kde-apps/rocs/rocs-16.04.3.ebuild
@@ -45,3 +45,5 @@ DEPEND="${RDEPEND}
 "
 
 RESTRICT=test	# 1/10 tests currently fails
+
+PATCHES=( "${FILESDIR}/${P}-qt57.patch" )


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-08-21 19:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-21 19:47 [gentoo-commits] repo/gentoo:master commit in: kde-apps/rocs/, kde-apps/rocs/files/ Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox