[neon/extras/gammaray/Neon/release] debian: drop the plugin packages
Carlos De Maine
null at kde.org
Mon Dec 30 22:49:13 GMT 2024
Git commit b8d64661a2263b4f8532871cdee6e51aed2f8358 by Carlos De Maine.
Committed on 30/12/2024 at 22:49.
Pushed by carlosdem into branch 'Neon/release'.
drop the plugin packages
M +41 -81 debian/control
D +0 -1 debian/gammaray-plugin-bluetooth.install
D +0 -1 debian/gammaray-plugin-kjobtracker.install
D +0 -2 debian/gammaray-plugin-positioning.install
D +0 -3 debian/gammaray-plugin-quickinspector.install
D +0 -1 debian/gammaray-plugin-waylandinspector.install
D +0 -23 debian/patches/qt-system-paths.patch
M +11 -8 debian/rules
https://invent.kde.org/neon/extras/gammaray/-/commit/b8d64661a2263b4f8532871cdee6e51aed2f8358
diff --git a/debian/control b/debian/control
index b004102e..800138d0 100644
--- a/debian/control
+++ b/debian/control
@@ -20,20 +20,12 @@ Build-Depends: cmake,
kf6-kcoreaddons-dev,
kf6-syntax-highlighting-dev,
pkg-kde-tools-neon,
+ mold,
ninja-build,
- qml6-module-qtquick,
- qtchooser,
- qt6-3d-assimpsceneimport-plugin,
- qt6-3d-defaultgeometryloader-plugin,
- qt6-3d-gltfsceneio-plugin,
- qt6-3d-scene2d-plugin,
qt6-3d-dev,
qt6-base-dev,
- qt6-base-private-dev,
qt6-connectivity-dev,
qt6-declarative-dev,
- qt6-declarative-dev-tools,
- qt6-declarative-private-dev,
qt6-doc-dev,
qt6-location-dev,
qt6-positioning-dev,
@@ -41,7 +33,6 @@ Build-Depends: cmake,
qt6-shadertools-dev,
qt6-svg-dev,
qt6-tools-dev,
- qt6-tools-dev-tools,
qt6-translations-l10n,
qt6-wayland-dev,
qt6-webengine-dev [amd64 arm64 armhf i386 mipsel],
@@ -55,12 +46,16 @@ Homepage: https://www.kdab.com/development-resources/qt-tools/gammaray/
Package: gammaray
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: qml6-module-qt3d-extras,
- qml6-module-qtquick-controls,
- qml6-module-qtquick-scene3d,
+Depends: qt6-3d,
${misc:Depends},
${shlibs:Depends}
-Recommends: gdb
+Breaks: gammaray-plugin-bluetooth,
+ gammaray-plugin-kjobtracker,
+ gammaray-plugin-positioning,
+ gammaray-plugin-objectvisualizer,
+ gammaray-plugin-quickinspector,
+ gammaray-plugin-waylandinspector,
+Recommends: gdb, lldb
Description: Tool for examining the internals of Qt application
GammaRay is a tool for examining the internals of a Qt application and
to some extent also manipulate it. GammaRay uses injection methods to
@@ -69,66 +64,12 @@ Description: Tool for examining the internals of Qt application
the complex internal structures you find in some Qt frameworks, such as
QGraphicsView, model/view, QTextDocument, state machines and more.
-Package: gammaray-plugin-quickinspector
-Architecture: any
-Depends: gammaray (= ${binary:Version}),
- qml6-module-qtquick-controls,
- qml6-module-qtquick,
- ${misc:Depends},
- ${shlibs:Depends}
-Enhances: gammaray
-Description: GammaRay plugin for inspecting QtQuick2 applications
- This plugin provides the user with the following inspection and debugging
- facilities:
- .
- * Tree view of all QQuickItems in the scene, marking invisible items
- and items having focus.
- * Object inspector allowing to see all the properties, inspect
- signal-slot connections, and directly invoke slots and Q_INVOKABLE
- methods.
- * Live-preview of the QtQuick scene inside the GammaRay window.
- * Qt Quick scene graph inspector.
-
-Package: gammaray-plugin-waylandinspector
-Architecture: any
-Depends: gammaray (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: gammaray
-Description: Wayland compositor inspector plugin for GammaRay
- The Wayland compositor inspector allows one to browse QWaylandClient
- instances and their associated resources, as well as observe Wayland
- events.
-
-Package: gammaray-plugin-kjobtracker
-Architecture: any
-Depends: gammaray (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: gammaray
-Description: KJob tracker plugin for GammaRay
- This plugin can be used to monitor KJob instances within a KDE-based
- application.
-
-Package: gammaray-plugin-bluetooth
-Architecture: any
-Depends: gammaray (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: gammaray
-Description: QtBluetooth type support for GammaRay
- This plugin adds support for QtBluetooth types into GammaRay.
-
-Package: gammaray-plugin-positioning
-Architecture: any
-Depends: gammaray (= ${binary:Version}),
- qml6-module-qtlocation,
- qml6-module-qtpositioning,
- qml6-module-qtquick,
- ${misc:Depends},
- ${shlibs:Depends}
-Enhances: gammaray
-Description: Qt6Positioning type support for GammaRay
- This plugin adds support for Qt6Positioning types into GammaRay.
-
Package: gammaray-dev
Architecture: any
Section: libdevel
-Depends: gammaray (= ${binary:Version}), ${misc:Depends}
+Depends: gammaray (= ${binary:Version}),
+ qt6-base-dev,
+ ${misc:Depends}
Description: GammaRay plugin development files
GammaRay is a tool for examining the internals of a Qt application and
to some extent also manipulate it. GammaRay uses injection methods to
@@ -140,14 +81,33 @@ Description: GammaRay plugin development files
This package contains header files used for building 3rd party GammaRay
plugins.
+Package: gammaray-plugin-bluetooth
+Architecture: all
+Depends: gammaray, ${misc:Depends},
+Description: Dummy transitional package
+
+Package: gammaray-plugin-kjobtracker
+Architecture: all
+Depends: gammaray, ${misc:Depends},
+Description: Dummy transitional package
+
Package: gammaray-plugin-objectvisualizer
-Architecture: any
-Depends: gammaray (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: gammaray
-Description: QObject hierarchy visualization plugin for GammaRay
- This plugin can visualize parent-child relationships of QObjects in a
- form of planar or 3D acyclic graph. Multiple graph layout algorihtms
- are available.
- .
- Also, for use with 3D glasses, various types of stereoscopic rendering
- are supported.
+Architecture: all
+Depends: gammaray, ${misc:Depends},
+Description: Dummy transitional package
+
+Package: gammaray-plugin-positioning
+Architecture: all
+Depends: gammaray, ${misc:Depends},
+Description: Dummy transitional package
+
+Package: gammaray-plugin-quickinspector
+Architecture: all
+Depends: gammaray, ${misc:Depends},
+Description: Dummy transitional package
+
+Package: gammaray-plugin-waylandinspector
+Architecture: all
+Depends: gammaray, ${misc:Depends},
+Description: Dummy transitional package
+
diff --git a/debian/gammaray-plugin-bluetooth.install b/debian/gammaray-plugin-bluetooth.install
deleted file mode 100644
index d16a537e..00000000
--- a/debian/gammaray-plugin-bluetooth.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/gammaray/*/qt*/gammaray_bluetooth*
diff --git a/debian/gammaray-plugin-kjobtracker.install b/debian/gammaray-plugin-kjobtracker.install
deleted file mode 100644
index ac469f92..00000000
--- a/debian/gammaray-plugin-kjobtracker.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/gammaray/*/qt*/gammaray_kjobtracker*
diff --git a/debian/gammaray-plugin-positioning.install b/debian/gammaray-plugin-positioning.install
deleted file mode 100644
index dee0356e..00000000
--- a/debian/gammaray-plugin-positioning.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/gammaray/*/qt*/gammaray_positioning*
-usr/lib/*/gammaray/*/qt*/target/position/libgammaray_geopositioninfosource.so
diff --git a/debian/gammaray-plugin-quickinspector.install b/debian/gammaray-plugin-quickinspector.install
deleted file mode 100644
index 7e9fd4c8..00000000
--- a/debian/gammaray-plugin-quickinspector.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/gammaray/*/qt*/gammaray_qmlsupport.so
-usr/lib/*/gammaray/*/qt*/gammaray_quickinspector*
-usr/lib/*/gammaray/*/qt*/gammaray_quickwidgetsupport*
diff --git a/debian/gammaray-plugin-waylandinspector.install b/debian/gammaray-plugin-waylandinspector.install
deleted file mode 100644
index 4ba89205..00000000
--- a/debian/gammaray-plugin-waylandinspector.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/gammaray/*/qt*/gammaray_wlcompositorinspector*
diff --git a/debian/patches/qt-system-paths.patch b/debian/patches/qt-system-paths.patch
deleted file mode 100644
index 002a8376..00000000
--- a/debian/patches/qt-system-paths.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dmitry Shachnev <mitya57 at debian.org>
-Date: Mon, 26 Aug 2019 17:31:09 +0300
-Subject: Use system Qt installation paths
-
-Otherwise the mkspecs are installed to /usr/mkspecs, not to
-/usr/lib/*/qt5/mkspecs.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd07623..6a039d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -102,7 +102,7 @@ include(CTest)
- include(GammaRayMacros)
- include(GammaRayMacrosInternal)
- include(FeatureSummary)
--set(KDE_INSTALL_USE_QT_SYS_PATHS OFF)
-+set(KDE_INSTALL_USE_QT_SYS_PATHS ON)
- include(ECMGeneratePriFile)
- include(ECMEnableSanitizers)
- include(GenerateExportHeader)
diff --git a/debian/rules b/debian/rules
index 36f67b7f..4b95bdc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,18 +23,21 @@ override_dh_auto_configure:
-DQT_VERSION_MAJOR=6 \
-DECM_MKSPECS_INSTALL_DIR=/usr/lib/*/qt6/mkspecs/modules \
-DPLUGIN_INSTALL_DIR=/usr/lib/*/qt6/plugins/gammaray \
- -DGAMMARAY_BUILD_DOCS=FALSE
-
-override_dh_auto_test:
- :
+ -DGAMMARAY_BUILD_DOCS=TRUE \
+ -DGAMMARAY_USE_PCH=TRUE \
+ -DQT_VERSION_MAJOR=6
+# -DENABLE_GOLD_LINKER=TRUE
override_dh_auto_install:
dh_auto_install
rm -f debian/tmp/usr/share/doc/gammaray/LICENSE.*
+execute_after_dh_auto_install:
+ # Reproducible builds: remove build paths from .prl files
+ sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
+
+override_dh_auto_test:
+ :
+
override_dh_installdocs:
dh_installdocs --link-doc=gammaray
-
-#execute_after_dh_auto_install:
-# # Reproducible builds: remove build paths from .prl files
-# sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
More information about the Neon-commits
mailing list