dev-games/openscenegraph-qt: Fix build with Qt 5.11_beta3

Package-Manager: Portage-2.3.29, Repoman-2.3.9
This commit is contained in:
Andreas Sturmlechner
2018-04-17 13:55:14 +02:00
parent 17c9422f29
commit 4a0816c225
2 changed files with 37 additions and 0 deletions

View File

@@ -0,0 +1,36 @@
From 91ba61ff69dc02a412eebae6222793e803b13ec2 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 17 Apr 2018 13:47:27 +0200
Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
---
CMakeLists.txt | 1 +
src/osgQt/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaea748..4345ea2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -487,6 +487,7 @@ ENDIF()
#If we have found Qt5, let's try to top off by getting the webkit as well
IF ( Qt5Widgets_FOUND )
+ FIND_PACKAGE(Qt5OpenGL REQUIRED)
FIND_PACKAGE(Qt5WebKitWidgets QUIET)
IF(COMMAND cmake_policy)
diff --git a/src/osgQt/CMakeLists.txt b/src/osgQt/CMakeLists.txt
index 60f3250..e4523e0 100644
--- a/src/osgQt/CMakeLists.txt
+++ b/src/osgQt/CMakeLists.txt
@@ -85,5 +85,5 @@ ENDIF( QT4_FOUND )
SETUP_LIBRARY(${LIB_NAME})
IF ( Qt5Widgets_FOUND )
- qt5_use_modules( ${LIB_NAME} Widgets OpenGL )
+ TARGET_LINK_LIBRARIES( ${LIB_NAME} Qt5::Widgets Qt5::OpenGL )
ENDIF ( Qt5Widgets_FOUND )
--
2.17.0

View File

@@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-3.5.5-cmake.patch
"${FILESDIR}"/${PN}-3.5.5-qt-5.11b3.patch
)
src_configure() {