From 31db75e1af7b3b099c66f8325da912ae59a7f534 Mon Sep 17 00:00:00 2001 From: toluschr 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 | 33 +++++++++++++++++++ 6 files changed, 80 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..fba3dc09674 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..ad95ecc9604 --- /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 ++#include + #include + #include + diff --git a/srcpkgs/gammaray/template b/srcpkgs/gammaray/template new file mode 100644 index 00000000000..1d3458bce07 --- /dev/null +++ b/srcpkgs/gammaray/template @@ -0,0 +1,33 @@ +# Template file for 'gammaray' +pkgname=gammaray +version=2.11.1 +revision=1 +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 " +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 + } +}