Re: [PR PATCH] [Updated] New package: gammaray-2.11.1

[toluschr <toluschr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

There is an updated pull request by toluschr against master on the void-packages repository

https://github.com/toluschr/void-packages new-gammaray
https://github.com/void-linux/void-packages/pull/23242

New package: gammaray-2.11.1
#22756

A patch file from https://github.com/void-linux/void-packages/pull/23242.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-gammaray-23242.patch --]
[-- Type: text/x-diff, Size: 5152 bytes --]

From 6e075ca0b17569a0c8de3d11838dc7a2c298bd2d Mon Sep 17 00:00:00 2001
From: toluschr <toluschr@protonmail.com>
Date: Wed, 10 Jun 2020 13:50:59 +0200
Subject: [PATCH] New package: GammaRay-2.11.1

---
 common/shlibs                                 |  2 ++
 srcpkgs/GammaRay-devel                        |  1 +
 srcpkgs/GammaRay/INSTALL.msg                  |  4 +++
 srcpkgs/GammaRay/patches/fix-probe-arch.patch | 18 ++++++++++
 srcpkgs/GammaRay/patches/fix-qt5.15.patch     | 22 ++++++++++++
 srcpkgs/GammaRay/template                     | 34 +++++++++++++++++++
 6 files changed, 81 insertions(+)
 create mode 120000 srcpkgs/GammaRay-devel
 create mode 100644 srcpkgs/GammaRay/INSTALL.msg
 create mode 100644 srcpkgs/GammaRay/patches/fix-probe-arch.patch
 create mode 100644 srcpkgs/GammaRay/patches/fix-qt5.15.patch
 create mode 100644 srcpkgs/GammaRay/template

diff --git a/common/shlibs b/common/shlibs
index 86ee9fcb734..4be14227ea2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -498,6 +498,8 @@ libfsimage.so.1.0 xen-libs-4.10.0_1
 libxenstat.so.0 xen-libs-4.10.0_1
 libfam.so.0 gamin-0.1.10_1
 libgamin-1.so.0 gamin-0.1.10_1
+libgammaray_core-qt5.so.2 GammaRay-2.11.1_1
+libgammaray_common-qt5.so.2 GammaRay-2.11.1_1
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libKF5Libkleo.so.5 libkleo-17.12.3_1
 libKF5GrantleeTheme.so.5 grantleetheme-17.12.3_1
diff --git a/srcpkgs/GammaRay-devel b/srcpkgs/GammaRay-devel
new file mode 120000
index 00000000000..bd8ae5be493
--- /dev/null
+++ b/srcpkgs/GammaRay-devel
@@ -0,0 +1 @@
+GammaRay
\ No newline at end of file
diff --git a/srcpkgs/GammaRay/INSTALL.msg b/srcpkgs/GammaRay/INSTALL.msg
new file mode 100644
index 00000000000..276435eece8
--- /dev/null
+++ b/srcpkgs/GammaRay/INSTALL.msg
@@ -0,0 +1,4 @@
+The gdb and lldb injectors require kernel.yama.ptrace_scope to be set to 0.
+This might reduce system security, as it allows regular users to inject into a non-child process.
+
+# echo "kernel.yama.ptrace_scope=0" >> /etc/sysctl.conf
diff --git a/srcpkgs/GammaRay/patches/fix-probe-arch.patch b/srcpkgs/GammaRay/patches/fix-probe-arch.patch
new file mode 100644
index 00000000000..c5b83bcf5f2
--- /dev/null
+++ b/srcpkgs/GammaRay/patches/fix-probe-arch.patch
@@ -0,0 +1,18 @@
+diff --git cmake/GammaRayProbeABI.cmake cmake/GammaRayProbeABI.cmake
+index b359067..d478482 100644
+--- cmake/GammaRayProbeABI.cmake
++++ cmake/GammaRayProbeABI.cmake
+@@ -32,6 +32,8 @@
+ 
+ # This contains all properties that define ABI compatibility of a probe with a target
+ 
++set(GAMMARAY_PROBE_ABI "qt${Qt5Core_VERSION_MAJOR}")
++if(FALSE)
+ # Qt version
+ set(GAMMARAY_PROBE_ABI "qt${Qt5Core_VERSION_MAJOR}_${Qt5Core_VERSION_MINOR}")
+ 
+@@ -125,3 +127,4 @@ else()
+ endif()
+ 
+ message(STATUS "Building probe for ABI: ${GAMMARAY_PROBE_ABI} (${CMAKE_BUILD_TYPE})")
++endif()
diff --git a/srcpkgs/GammaRay/patches/fix-qt5.15.patch b/srcpkgs/GammaRay/patches/fix-qt5.15.patch
new file mode 100644
index 00000000000..4b0f74e9c61
--- /dev/null
+++ b/srcpkgs/GammaRay/patches/fix-qt5.15.patch
@@ -0,0 +1,22 @@
+--- plugins/network/networksupport.cpp
++++ plugins/network/networksupport.cpp
+@@ -89,7 +89,9 @@ Q_DECLARE_METATYPE(QNetworkInterface::InterfaceFlags)
+ #endif
+ Q_DECLARE_METATYPE(QNetworkProxy::Capabilities)
+ Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ Q_DECLARE_METATYPE(QSocketNotifier::Type)
++#endif
+ #ifndef QT_NO_SSL
+ Q_DECLARE_METATYPE(QSsl::KeyAlgorithm)
+ Q_DECLARE_METATYPE(QSsl::KeyType)
+--- plugins/widgetinspector/overlaywidget.h
++++ plugins/widgetinspector/overlaywidget.h
+@@ -30,6 +30,7 @@
+ #define GAMMARAY_WIDGETINSPECTOR_OVERLAYWIDGET_H
+ 
+ #include <QLayout>
++#include <QPainterPath>
+ #include <QPointer>
+ #include <QWidget>
+ 
diff --git a/srcpkgs/GammaRay/template b/srcpkgs/GammaRay/template
new file mode 100644
index 00000000000..d17f73b7d97
--- /dev/null
+++ b/srcpkgs/GammaRay/template
@@ -0,0 +1,34 @@
+# Template file for 'GammaRay'
+pkgname=GammaRay
+version=2.11.1
+revision=1
+wrksrc="gammaray-${version}"
+build_style=cmake
+configure_args="-DGAMMARAY_INSTALL_QT_LAYOUT=true -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules -DPLUGIN_INSTALL_DIR=/usr/lib/qt5/plugins/gammaray"
+hostmakedepends="qt5-host-tools qt5-devel"
+makedepends="qt5-devel"
+short_desc="Tool to poke around in a Qt-application"
+maintainer="toluschr <toluschr@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/KDAB/GammaRay"
+distfiles="${homepage}/releases/download/v${version}/gammaray-${version}.tar.gz"
+checksum=87a1d72ad1ad6d1a0156c54a85b0976ab38c6a64136458ca7c4ee491566d25d0
+
+LDFLAGS=" -Wl,-no-fatal-warnings"
+
+post_patch() {
+	vsed -i CMakeLists.txt -e 's|plugins/gammaray|lib/qt5/plugins/gammaray|'
+}
+
+GammaRay-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+		cd "${DESTDIR}"
+		# unversioned probes should go in main package
+		for f in usr/lib/*.so; do [ -L "${f}" ] && { vmove "${f}"; }; done
+	}
+}