* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/gammaray/files/, dev-util/gammaray/
@ 2025-01-25 14:59 Takuya Wakazono
0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2025-01-25 14:59 UTC (permalink / raw
To: gentoo-commits
commit: a4d83cfa18ff3c583d0875ae9c56fc7c9d05d806
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 25 14:58:36 2025 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Jan 25 14:58:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4d83cfa
dev-util/gammaray: add 3.1.0
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
dev-util/gammaray/Manifest | 1 +
.../files/gammaray-3.1.0-deselect-tests.patch | 21 +++++
dev-util/gammaray/gammaray-3.1.0.ebuild | 102 +++++++++++++++++++++
3 files changed, 124 insertions(+)
diff --git a/dev-util/gammaray/Manifest b/dev-util/gammaray/Manifest
index 51f6fd33e..6ab3d87a7 100644
--- a/dev-util/gammaray/Manifest
+++ b/dev-util/gammaray/Manifest
@@ -1 +1,2 @@
DIST gammaray-2.11.3.tar.gz 10841865 BLAKE2B 07a8c6a1257417d8daed5d7bfdd7e9aaaa353a0edfc0f20a73ac61fcf64e45030346f2268c50ecc220aeaffad38c3ecac788192c491778eca31d07ef9166329e SHA512 1fb16678ae4695567ffe6cca7870b3fcf8b82c2e9f15f005932586696a3e24f64e657ce25b0ebb87ba25646a6bdfe1c9b35a3604f341839e7c5183df859c05a0
+DIST gammaray-3.1.0.tar.gz 62728353 BLAKE2B 2adcb59ac0b9b7ae519a71ba5bcf9ae1c5162dcafcaab11028410070026e824fb0838a0aa408eca105d82ffc157d9ef9c3f334e34512d6b74ebb74bf2b38385b SHA512 efc6b075c99966e0b3f1f058b29ff9b4ad2349818e5ff71cfdccfb889807ac6b6afe95d981d033ac773fdfd965320d7644adf19a229160f545b4468d9ab53202
diff --git a/dev-util/gammaray/files/gammaray-3.1.0-deselect-tests.patch b/dev-util/gammaray/files/gammaray-3.1.0-deselect-tests.patch
new file mode 100644
index 000000000..55d8228f7
--- /dev/null
+++ b/dev-util/gammaray/files/gammaray-3.1.0-deselect-tests.patch
@@ -0,0 +1,21 @@
+https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4930f4d334fbc586c0c968e0e8159e8c28a610f2
+Remove tests that have been failing since the previous version.
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -372,16 +372,6 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD AND NOT GAMMARAY_PROBE_ONLY_BUILD)
+ target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher)
+ target_link_libraries(earlyexittest gammaray_core gammaray_launcher)
+
+- if(HAVE_QT_WIDGETS)
+- gammaray_add_test(launchertest launchertest.cpp)
+- target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher)
+- target_link_libraries(launchertest gammaray_core gammaray_launcher)
+- endif()
+-
+- if(TARGET gammaray_client)
+- gammaray_add_test(clientconnectiontest clientconnectiontest.cpp)
+- target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client)
+- endif()
+ endif()
+
+ #
diff --git a/dev-util/gammaray/gammaray-3.1.0.ebuild b/dev-util/gammaray/gammaray-3.1.0.ebuild
new file mode 100644
index 000000000..b99679d81
--- /dev/null
+++ b/dev-util/gammaray/gammaray-3.1.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake qmake-utils virtualx xdg
+
+DESCRIPTION="High-level runtime introspection tool for Qt applications"
+HOMEPAGE="
+ https://www.kdab.com/software-technologies/developer-tools/gammaray/
+ https://github.com/KDAB/GammaRay
+"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/KDAB/GammaRay.git"
+else
+ SRC_URI="https://github.com/KDAB/GammaRay/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2 GPL-2+ MIT"
+SLOT=0
+
+IUSE="3d bluetooth designer doc geolocation scxml svg test qml wayland webengine"
+RESTRICT="!test? ( test )"
+
+# TODO: fix automagic sci-libs/vtk (and many other) dependencies
+RDEPEND="
+ dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+ kde-frameworks/kitemmodels:6
+ 3d? ( dev-qt/qt3d:6 )
+ bluetooth? ( dev-qt/qtconnectivity:6[bluetooth] )
+ designer? ( dev-qt/qttools:6[designer] )
+ geolocation? ( dev-qt/qtpositioning:6 )
+ qml? ( dev-qt/qtdeclarative:6[widgets] )
+ scxml? ( dev-qt/qtscxml:6 )
+ svg? ( dev-qt/qtsvg:6 )
+ wayland? (
+ dev-libs/wayland
+ dev-qt/qtwayland:6[compositor]
+ )
+ webengine? ( dev-qt/qtwebengine:6[widgets] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ doc? (
+ app-text/doxygen[dot]
+ dev-qt/qttools:6[assistant,linguist,qdoc]
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-deselect-tests.patch )
+
+src_prepare() {
+ sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die
+ sed -i "/BackwardConfig.cmake/d" CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package 3d Qt63DAnimation)
+ $(cmake_use_find_package 3d Qt63DExtras)
+ $(cmake_use_find_package 3d Qt63DInput)
+ $(cmake_use_find_package 3d Qt63DLogic)
+ $(cmake_use_find_package 3d Qt63DRender)
+ $(cmake_use_find_package 3d Qt63DQuick)
+ $(cmake_use_find_package bluetooth Qt6Bluetooth)
+ $(cmake_use_find_package designer Qt6Designer)
+ $(cmake_use_find_package doc Doxygen)
+ $(cmake_use_find_package geolocation Qt6Positioning)
+ $(cmake_use_find_package qml Qt6Qml)
+ $(cmake_use_find_package qml Qt6Quick)
+ $(cmake_use_find_package qml Qt6QuickWidgets)
+ $(cmake_use_find_package svg Qt6Svg)
+ $(cmake_use_find_package scxml Qt6Scxml)
+ $(cmake_use_find_package scxml Qt6StateMachine)
+ $(cmake_use_find_package wayland Qt6WaylandCompositor)
+ $(cmake_use_find_package webengine Qt6WebEngineWidgets)
+ -DBUILD_TESTING=$(usex test)
+ -DECM_MKSPECS_INSTALL_DIR="$(qt6_get_mkspecsdir)"
+ -DGAMMARAY_BUILD_DOCS=ON
+ -DGAMMARAY_BUILD_UI=ON
+ -DGAMMARAY_DISABLE_FEEDBACK=ON
+ -DQT_VERSION_MAJOR=6
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+# export QT_QPA_PLATFORM=offscreen
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ rm -r "${ED}"/usr/share/doc/${PN} || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/gammaray/files/, dev-util/gammaray/
@ 2025-01-25 14:59 Takuya Wakazono
0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2025-01-25 14:59 UTC (permalink / raw
To: gentoo-commits
commit: fbd7785ebde39cf8d52ed5a34da51c14b167a573
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 25 14:58:36 2025 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Jan 25 14:58:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fbd7785e
dev-util/gammaray: drop 2.11.3
Closes: https://bugs.gentoo.org/884697 (obsolete)
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
dev-util/gammaray/Manifest | 1 -
.../files/gammaray-2.11.3-deselect-tests.patch | 45 ---------
dev-util/gammaray/gammaray-2.11.3.ebuild | 112 ---------------------
dev-util/gammaray/metadata.xml | 2 -
4 files changed, 160 deletions(-)
diff --git a/dev-util/gammaray/Manifest b/dev-util/gammaray/Manifest
index 6ab3d87a7..4986f74ce 100644
--- a/dev-util/gammaray/Manifest
+++ b/dev-util/gammaray/Manifest
@@ -1,2 +1 @@
-DIST gammaray-2.11.3.tar.gz 10841865 BLAKE2B 07a8c6a1257417d8daed5d7bfdd7e9aaaa353a0edfc0f20a73ac61fcf64e45030346f2268c50ecc220aeaffad38c3ecac788192c491778eca31d07ef9166329e SHA512 1fb16678ae4695567ffe6cca7870b3fcf8b82c2e9f15f005932586696a3e24f64e657ce25b0ebb87ba25646a6bdfe1c9b35a3604f341839e7c5183df859c05a0
DIST gammaray-3.1.0.tar.gz 62728353 BLAKE2B 2adcb59ac0b9b7ae519a71ba5bcf9ae1c5162dcafcaab11028410070026e824fb0838a0aa408eca105d82ffc157d9ef9c3f334e34512d6b74ebb74bf2b38385b SHA512 efc6b075c99966e0b3f1f058b29ff9b4ad2349818e5ff71cfdccfb889807ac6b6afe95d981d033ac773fdfd965320d7644adf19a229160f545b4468d9ab53202
diff --git a/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch b/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch
deleted file mode 100644
index 801629e8a..000000000
--- a/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -288,17 +288,6 @@
- gammaray_add_test(earlyexittest earlyexittest.cpp)
- target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher)
- target_link_libraries(earlyexittest gammaray_core gammaray_launcher)
--
-- if(HAVE_QT_WIDGETS)
-- gammaray_add_test(launchertest launchertest.cpp)
-- target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher)
-- target_link_libraries(launchertest gammaray_core gammaray_launcher)
-- endif()
--
-- if(TARGET gammaray_client)
-- gammaray_add_test(clientconnectiontest clientconnectiontest.cpp)
-- target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client)
-- endif()
- endif()
-
- #
-@@ -419,14 +408,6 @@
- endif()
-
- if(Qt5Quick_FOUND)
-- gammaray_add_quick_test(quickinspectortest
-- quickinspectortest.cpp
-- quickinspectortest.qrc
-- $<TARGET_OBJECTS:modeltestobj>
-- )
-- target_include_directories(quickinspectortest SYSTEM PRIVATE ${Qt5Quick_PRIVATE_INCLUDE_DIRS})
-- target_link_libraries(quickinspectortest gammaray_core gammaray_quickinspector_shared Qt5::Quick)
--
- gammaray_add_quick_test(quickinspectortest2
- quickinspectortest2.cpp
- quickinspectortest.qrc
-@@ -438,9 +419,6 @@
- if(NOT Qt5Quick_VERSION VERSION_LESS 5.9.3)
- add_test(NAME quickinspectortest2_softwarecontext COMMAND quickinspectortest2)
- set_tests_properties(quickinspectortest2_softwarecontext PROPERTIES ENVIRONMENT "QT_QUICK_BACKEND=softwarecontext")
--
-- add_test(NAME quickinspectortest_softwarecontext COMMAND quickinspectortest)
-- set_tests_properties(quickinspectortest_softwarecontext PROPERTIES ENVIRONMENT "QT_QUICK_BACKEND=softwarecontext")
- endif()
-
- gammaray_add_quick_test(quickinspectorpickingtest
diff --git a/dev-util/gammaray/gammaray-2.11.3.ebuild b/dev-util/gammaray/gammaray-2.11.3.ebuild
deleted file mode 100644
index 7bb932faf..000000000
--- a/dev-util/gammaray/gammaray-2.11.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( BackwardConfig )
-inherit cmake optfeature virtualx xdg
-
-DESCRIPTION="High-level runtime introspection tool for Qt applications"
-HOMEPAGE="
- https://www.kdab.com/development-resources/qt-tools/gammaray/
- https://github.com/KDAB/GammaRay
-"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/KDAB/GammaRay.git"
-else
- SRC_URI="https://github.com/KDAB/GammaRay/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD-2 GPL-2+ MIT"
-SLOT=0
-
-IUSE="3d bluetooth designer doc geolocation printsupport script scxml svg test qml wayland webengine"
-RESTRICT="!test? ( test )"
-
-# TODO: fix automagic sci-libs/vtk (and many other) dependencies
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- kde-frameworks/kitemmodels:5
- 3d? ( dev-qt/qt3d:5 )
- bluetooth? ( dev-qt/qtbluetooth:5 )
- designer? ( dev-qt/designer:5 )
- geolocation? ( dev-qt/qtpositioning:5 )
- printsupport? ( dev-qt/qtprintsupport:5 )
- qml? ( dev-qt/qtdeclarative:5[widgets] )
- script? ( dev-qt/qtscript:5[scripttools] )
- scxml? ( dev-qt/qtscxml:5 )
- svg? ( dev-qt/qtsvg:5 )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
- wayland? ( dev-qt/qtwayland:5 )
-"
-
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( CHANGES CONTRIBUTORS.txt README.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-deselect-tests.patch )
-
-src_prepare(){
- sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die
- sed -i CMakeLists.txt \
- -e "/BackwardConfig.cmake/d" \
- -e "/set(KDE_INSTALL_USE_QT_SYS_PATHS/d" || die
-
- cmake_src_prepare
-}
-
-src_configure(){
- local mycmakeargs=(
- $(cmake_use_find_package 3d Qt53DAnimation)
- $(cmake_use_find_package 3d Qt53DExtras)
- $(cmake_use_find_package 3d Qt53DInput)
- $(cmake_use_find_package 3d Qt53DLogic)
- $(cmake_use_find_package 3d Qt53DRender)
- $(cmake_use_find_package 3d Qt53DQuick)
- $(cmake_use_find_package bluetooth Qt5Bluetooth)
- $(cmake_use_find_package designer Qt5Designer)
- $(cmake_use_find_package geolocation Qt5Positioning)
- $(cmake_use_find_package printsupport Qt5PrintSupport)
- $(cmake_use_find_package qml Qt5Qml)
- $(cmake_use_find_package qml Qt5Quick)
- $(cmake_use_find_package qml Qt5QuickWidgets)
- $(cmake_use_find_package script Qt5Script)
- $(cmake_use_find_package svg Qt5Svg)
- $(cmake_use_find_package scxml Qt5Scxml)
- $(cmake_use_find_package test Qt5Test)
- $(cmake_use_find_package wayland Qt5WaylandCompositor)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DGAMMARAY_BUILD_DOCS=$(usex doc)
- -DGAMMARAY_BUILD_UI=ON
- -DGAMMARAY_DISABLE_FEEDBACK=ON
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
-# export QT_QPA_PLATFORM=offscreen
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
- rm -r "${ED}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "graphical state machine debugging support" dev-util/kdstatemachineeditor
-}
diff --git a/dev-util/gammaray/metadata.xml b/dev-util/gammaray/metadata.xml
index bbe46102d..edf7e2abd 100644
--- a/dev-util/gammaray/metadata.xml
+++ b/dev-util/gammaray/metadata.xml
@@ -23,8 +23,6 @@ the more complex Qt frameworks such as model/view, state machines or scene graph
<flag name="3d">Build support for Qt5 3D modules</flag>
<flag name="designer">Widget .ui file export</flag>
<flag name="geolocation">Physical position determination support from Qt5 framework</flag>
- <flag name="printsupport">Printing support library from the Qt5 framework. Required for widget PDF export</flag>
- <flag name="script">Enable scripting support from the Qt5 framework</flag>
<flag name="qml">Build with Qt5 Quick support</flag>
<flag name="scxml">Build support for Qt5 State Chart XML (SCXML)</flag>
<flag name="webengine">Enable support for dev-qt/qtwebengine</flag>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-25 14:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-25 14:59 [gentoo-commits] repo/proj/guru:dev commit in: dev-util/gammaray/files/, dev-util/gammaray/ Takuya Wakazono
-- strict thread matches above, loose matches on Subject: below --
2025-01-25 14:59 Takuya Wakazono
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox