diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-08-22 05:45:04 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-08-22 05:47:05 +1000 |
| commit | 3971180dcc133af2808dbe3512440775e4eb4f07 (patch) | |
| tree | e5aba26077a88c9f2726b36335bd4096fdc0f82d /kde-apps | |
| parent | app-emulation/qemu: Drop a patch (diff) | |
| download | gentoo-3971180dcc133af2808dbe3512440775e4eb4f07.tar.gz gentoo-3971180dcc133af2808dbe3512440775e4eb4f07.tar.bz2 gentoo-3971180dcc133af2808dbe3512440775e4eb4f07.zip | |
kde-apps/rocs: backport patch from upstream solving build failure with Qt 5.7
Gentoo-bug: 591396
Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/rocs/files/rocs-16.04.3-qt57.patch | 28 | ||||
| -rw-r--r-- | kde-apps/rocs/rocs-16.04.3.ebuild | 2 |
2 files changed, 30 insertions, 0 deletions
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 000000000000..bd2c020ad48f --- /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 38ff889e625c..0b560a878b50 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" ) |