commit: f243a22b398a98a0818f967ec4665d591db1c3d9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jun 12 22:01:38 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 22:03:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f243a22b
dev-games/openscenegraph-qt: treeclean Closes: https://bugs.gentoo.org/751184 (pkgremoved) Closes: https://bugs.gentoo.org/955654 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-games/openscenegraph-qt/Manifest | 1 - .../files/openscenegraph-qt-3.5.5-cmake.patch | 53 ---------------------- .../files/openscenegraph-qt-3.5.5-qt-5.11b3.patch | 36 --------------- dev-games/openscenegraph-qt/metadata.xml | 18 -------- .../openscenegraph-qt-3.5.7-r1.ebuild | 46 ------------------- profiles/package.mask | 4 -- 6 files changed, 158 deletions(-) diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest deleted file mode 100644 index 7da98456f9fd..000000000000 --- a/dev-games/openscenegraph-qt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST osgQt-3.5.7.tar.gz 1000217 BLAKE2B f0279b122fc9492d29ea0c55afa81376d2ad4a35c42b301312137ca6d375fd2ef519efacfaf2f77b9dc3a7a26313b3d3213fc0589359c89695835f12488e6efb SHA512 5698b824f6e747eaf19b970784dce6e38fbe50176e6c5d0cab86dab417c8831036c0f050fc52f1ab2a79925f8356dd43559aa123aab4b70a4df28273125e4d03 diff --git a/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-cmake.patch b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-cmake.patch deleted file mode 100644 index e5cac15373d8..000000000000 --- a/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-cmake.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ruN osgQt-3.5.5/CMakeLists.txt my/CMakeLists.txt ---- osgQt-3.5.5/CMakeLists.txt 2016-09-20 07:11:32.000000000 +0200 -+++ my/CMakeLists.txt 2017-05-18 04:11:06.929237731 +0200 -@@ -543,15 +543,7 @@ - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") - ENDIF() - --IF(UNIX AND NOT WIN32 AND NOT APPLE) -- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") -- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") -- MARK_AS_ADVANCED(LIB_POSTFIX) -- ENDIF() --ENDIF() --IF(NOT DEFINED LIB_POSTFIX) -- SET(LIB_POSTFIX "") --ENDIF() -+SET(LIB_POSTFIX ${LIB_SUFFIX}) - - # Here we apparantly do some funky stuff with making the bin/ and lib/ - # folders which is probably needed to work around a very old CMake bug? -@@ -877,7 +869,7 @@ - ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY - ) - #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) -- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc) -+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc) - - # now set up openthreads documentation generation - IF(BUILD_REF_DOCS_TAGFILE) -@@ -893,7 +885,7 @@ - ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY - ) - #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) -- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc) -+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc) - - # Process our other doxyfiles but don't create targets for these - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile -diff -ruN osgQt-3.5.5/CMakeModules/OsgMacroUtils.cmake my/CMakeModules/OsgMacroUtils.cmake ---- osgQt-3.5.5/CMakeModules/OsgMacroUtils.cmake 2016-09-20 07:11:32.000000000 +0200 -+++ my/CMakeModules/OsgMacroUtils.cmake 2017-05-18 04:30:26.646257926 +0200 -@@ -462,9 +462,9 @@ - IF(APPLE) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) - ELSE(APPLE) -- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) -+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples ) - IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph-examples) - ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") - ENDIF(APPLE) - 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 deleted file mode 100644 index 9618fde498e9..000000000000 --- a/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 91ba61ff69dc02a412eebae6222793e803b13ec2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -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/metadata.xml b/dev-games/openscenegraph-qt/metadata.xml deleted file mode 100644 index d4133c8dccbe..000000000000 --- a/dev-games/openscenegraph-qt/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Maciej Mrozowski</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Games Project</name> - </maintainer> - <longdescription lang="en"> - The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries. This package is a module for Qt support. - </longdescription> - <upstream> - <remote-id type="github">openscenegraph/osgQt</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7-r1.ebuild b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7-r1.ebuild deleted file mode 100644 index 958ff334b737..000000000000 --- a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="osgQt" -MY_P=${MY_PN}-${PV} -inherit cmake - -DESCRIPTION="Qt support for OpenSceneGraph" -HOMEPAGE="https://www.openscenegraph.com/"; -SRC_URI="https://github.com/openscenegraph/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="wxWinLL-3 LGPL-2.1" -SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION -KEYWORDS="amd64 ~ppc64 x86" -IUSE="examples" - -RDEPEND=" - >=dev-games/openscenegraph-3.6.3:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5.5-cmake.patch - "${FILESDIR}"/${PN}-3.5.5-qt-5.11b3.patch -) - -src_configure() { - local mycmakeargs=( - -DDYNAMIC_OPENSCENEGRAPH=ON - -DDESIRED_QT_VERSION=5 - -DBUILD_OSG_EXAMPLES=$(usex examples) - -DCMAKE_DISABLE_USE_FIND_PACKAGE_Qt5WebKitWidgets=ON - ) - cmake_src_configure -} diff --git a/profiles/package.mask b/profiles/package.mask index fad8d6e2aa7a..4e97c82c7818 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -279,10 +279,6 @@ www-misc/htdig # Removal on 2025-06-12. x11-misc/synergy -# Andreas Sturmlechner <[email protected]> (2025-05-13) -# No more revdeps, depends on Qt5. Bug #955654; removal on 2025-06-12. -dev-games/openscenegraph-qt - # Matt Turner <[email protected]> (2025-05-13) # Package is replaced by dev-util/mesa_clc. # Removal on 2025-06-12. Bug #955925.
