diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-19 14:14:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-19 14:14:48 +0100 |
| commit | 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch) | |
| tree | 8f255dfacbacb657e3ac3654d01c1e11e651c066 /dev-games | |
| parent | 8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff) | |
gentoo resync : 19.04.2018
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/Manifest.gz | bin | 6395 -> 6396 bytes | |||
| -rw-r--r-- | dev-games/openscenegraph-qt/Manifest | 3 | ||||
| -rw-r--r-- | dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch | 36 | ||||
| -rw-r--r-- | dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild | 1 |
4 files changed, 39 insertions, 1 deletions
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz Binary files differindex ed43fbd2116e..704b9af49115 100644 --- a/dev-games/Manifest.gz +++ b/dev-games/Manifest.gz diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest index 750bc605504f..5f34457c3a3f 100644 --- a/dev-games/openscenegraph-qt/Manifest +++ b/dev-games/openscenegraph-qt/Manifest @@ -1,4 +1,5 @@ AUX openscenegraph-qt-3.5.5-cmake.patch 3190 BLAKE2B c8a52a2d0b626e7a12b3f683380d6d3f20973330220f53be288413616d0ccf063cd40b864b1fb77ff2762313d24624533380d20a37538b92664647fc2f42c7c0 SHA512 b5350082a9755f73274103b1bc6d5b08954cd6b23e22d15e26e617bd55016ab3df29c0712af775e4e357213456fd8daa4d443f28b06979e76e32ce0df60393a1 +AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec699490dd6b1863fc965c54cb5fac5dcfa2efc4997225563d44842c9fffa07b6b2c75d62fe9577f56fcb067966bbf1cd9031c8677f41be SHA512 9223a53ae700fc25aaa02a0feef5f69313c94d05415c0372d55f56a9996ab3edb6712ea19b07bc507d7b1c8db21e4c9dda177eeaad094d94fc04133cdeb7ac10 DIST osgQt-3.5.5.tar.gz 1003973 BLAKE2B 4646fc0d01a5fc3023acb4be9d8b9e9982faf3849b9c7dbe775ff06642b9540559ef67189f31ebcf6a2fe49d24066d744ce9cfd409e76c9143ac16867648a620 SHA512 50faee9a1539c1e29bb1c244fa32194b22cbe43f43980b7c270aa45cd225ac5e3fe9445d63b1efb767c8a2ce8e5ffa417783d1a446ed965b23a06100a241d498 -EBUILD openscenegraph-qt-3.5.5.ebuild 927 BLAKE2B 7390ab0635110dc1d24afb2b82a50356237b4fb8f079113f11ebf6d8e73402d03137e9ed8bcef94e699c1f194ec2118072449c6c2f30e10b04fe9ce7eacfb83d SHA512 668221d703c1c2748fc00758c60f0a3adf77153d8b4924e8aafc48b0fc5b2b7adb31a06ccd487d01c3804cf65bea232bbed3f304015dbec1cef0418dbc086a02 +EBUILD openscenegraph-qt-3.5.5.ebuild 970 BLAKE2B ad265f5b646fd029a3a40038fdf39262a93a3e7da58b44a09bc2a183327cd2f4e71e2c201dcb12891c141b25197616a4ff6b1f870acdc0673b76e144123ace04 SHA512 88d9a8a78277e6335dc8a064fb6f05e7f63c687cd1436c68bba56c03e9005bd42cfecdb418d87d9c82b35440d4cfcaec84c67178c02afeb8ce29b5937c3d411a MISC metadata.xml 997 BLAKE2B fbb3c9765491c15ebd269fde3aa01ef177d038f1a0f1d1f189adfb457aab8dfd69774c074235a7f95d6d02c53dfa6ba5872d50cdcbafc03141a8b5ba44d823dd SHA512 3b5f9b2f408f6f68a28f3427d463d0036d1b6286df549d189ed4d88ebe0a607a3d570f98fa11035f440e684f55f6d7d3f1383b281c37a1be3f611cfb8d530169 diff --git a/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch new file mode 100644 index 000000000000..9618fde498e9 --- /dev/null +++ b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch @@ -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 + diff --git a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild index 4426e581e4e5..2685d3688f4b 100644 --- a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild +++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild @@ -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() { |