New package: gammaray-2.11.1 #23242

toluschr · 2020-06-26T07:53:56Z

toluschr · 2020-06-26T20:19:26Z

hm I don't know what changed. I installed the software on my pc and it built fine last time.

toluschr · 2020-06-26T20:33:18Z

Added this patch KDAB/GammaRay@7cd17bc. Should work now

ericonr · 2020-06-26T20:34:01Z

srcpkgs/gammaray/template

+distfiles="https://github.com/KDAB/GammaRay/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=87a1d72ad1ad6d1a0156c54a85b0976ab38c6a64136458ca7c4ee491566d25d0
+
+LDFLAGS+="-Wl,-no-fatal-warnings"


You probably want to put a space there " -Wl..."

ericonr · 2020-06-26T20:34:27Z

srcpkgs/gammaray/template

+LDFLAGS+="-Wl,-no-fatal-warnings"
+
+pre_build() {
+	sed -e 's|plugins/gammaray|lib/qt5/plugins/gammaray|' -i CMakeLists.txt


If possible, use the vsed wrapper.

ericonr · 2020-06-26T20:35:25Z

srcpkgs/gammaray/template

+maintainer="toluschr <toluschr@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/KDAB/GammaRay"
+distfiles="https://github.com/KDAB/GammaRay/releases/download/v${version}/${pkgname}-${version}.tar.gz"


"${homepage}/..."

ericonr · 2020-06-26T20:38:38Z

srcpkgs/gammaray/template

+		cd "${DESTDIR}"
+		for f in usr/lib/*.so; do [ -L "${f}" ] && vmove "${f}"; done


Does it ship any .so files that aren't symlinks? Ideally this line should be vmove "usr/lib/*.so".

And I'm not entirely sure that cd makes everything work normally, you should probably check the package contents afterwards.

Yes, this is necessary

And I'm not entirely sure that cd makes everything work normally

I used cd to make the glob expression use the relative path

Seems like vmove is smart enough to deal with it. Are there too many of these files, and some specific reason for them not being versioned?

I don't know why the shared libraries are not versioned. I believe they act as plugins.

I see. If you could leave a comment there, then. Like "unversioned dynamic libraries should go in main package"

ericonr · 2020-06-26T20:41:07Z

srcpkgs/gammaray/template

@@ -0,0 +1,31 @@
+# Template file for 'gammaray'
+pkgname=gammaray


Package name should probably be GammaRay. I believe repo name takes precedence over tarball.

Oh, didn't see that earlier. IMHO the package name should be gammaray since that's the name of both the program binary and the source tarball.

I'm not sure either. The name in its desktop file is GammaRay though

Please use gammaray

My preference as a user would be "least surprise". The executable is called gammaray, so the package should be called that too. The user doesn't know about repos, and the application name in the desktop file is a (possibly localized) title for presentation purposes only.

toluschr · 2020-06-26T20:51:35Z

This is also needed https://github.com/KDAB/GammaRay/commit/ec9fe40808e094b3ee6283256ae18f1a3bb95bb7.patch

toluschr · 2020-06-27T07:42:58Z

srcpkgs/GammaRay/template

+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+		# probes should go in main package
+		vmove "usr/lib/libgammaray_[^probe]*.so"


The libraries are conveniently named. This should be much better

^ is not a negative match over string. Please check if results are as expected. You may need to vmove all libgammaray them move back probe.

I wasn't sure that it is correct either, but it results in the correct libraries being moved. Perhaps moving the libraries back would be the best solution

toluschr · 2020-06-27T10:46:21Z

srcpkgs/GammaRay/template

+		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


I'll keep it like that for now. It seems to be the solution using the least characters. I hope this is ok

I prefer gammaray :p

mvf · 2020-07-03T16:46:35Z

srcpkgs/GammaRay/template

@@ -0,0 +1,34 @@
+# Template file for 'GammaRay'
+pkgname=GammaRay


The app binary is called gammaray, as is the source tarball, so the package should also be called gammaray IMO.

mvf · 2020-07-03T17:21:05Z

srcpkgs/GammaRay/template

+
+LDFLAGS+=" -Wl,-no-fatal-warnings"
+
+pre_build() {


Should be pre_configure or I'd expect the vsed substitution below to accumulate in incremental builds, i.e. if a xbps-src pkg terminates during the build phase, on the next run the result will probably be lib/qt5/lib/qt5/plugins/gammaray, etc.

In clean builds, this would save the second cmake run when it detects that the files have changed.

Good suggestion.
But configure sometimes fails, too. Let's say in next version, they add new dependencies.

For that reason, I prefer to use post_patch instead.
It matches with the action: we're patching the code.

Ah, of course, that's even better!

mvf · 2020-07-03T17:22:03Z

common/shlibs

+libgammaray_core-qt5_15-x86_64.so.2.11.1 GammaRay-2.11.1_1
+libgammaray_common-qt5_15-x86_64.so.2.11.1 GammaRay-2.11.1_1


The -qt5_15-x86_64 part should be removed or shlibs will be off on other architectures. To make the build produce sane file names, CMakeLists.txt will have to be fixed, like in the shiboken2 package (patch).

sgn · 2020-07-04T00:46:47Z

srcpkgs/GammaRay/template

+distfiles="${homepage}/releases/download/v${version}/gammaray-${version}.tar.gz"
+checksum=87a1d72ad1ad6d1a0156c54a85b0976ab38c6a64136458ca7c4ee491566d25d0
+
+LDFLAGS+=" -Wl,-no-fatal-warnings"


The first occurence of LDFLAGS doesn't need +=

LDFLAGS="-Wl,-no-fatal-warnings"

I thought it added to the environment's FLAGS, sorry! Which I now realized doesn't make sense.

The template will be sourced first. The various hooks and setup will prepend/append necessary arguments into various flags, including but not limiting to configure_args LDFLAGS

That makes sense, thanks.

toluschr · 2020-07-07T10:17:36Z

Any issues with the newest commit?

Johnnynator · 2020-07-13T16:11:56Z

Error: No probes found - GammaRay not functional.

Just wanted to test this, and it doesn't seem to work at all.
(Running gammaray --self-test on x86_64 glibc)

toluschr · 2020-07-13T16:18:55Z

Error: No probes found - GammaRay not functional.
Just wanted to test this, and it doesn't seem to work at all.
(Running gammaray --self-test on x86_64 glibc)

It seems that gammaray tries to load the wrong probe library. The patch that removes the _15-x86_64 suffix from shared libraries broke it

toluschr · 2020-07-14T08:07:47Z

@Johnnynator
Should work now. The patch to remove the arch from the shlibs was not necessary anymore, since the libraries were in common/shlibs by mistake.

$ gammaray --self-test
Found valid probe for ABI qt5_15-x86_64 at /usr/lib/libgammaray_probe-qt5_15-x86_64.so.
Injector preload successfully passed its self-test.
Error: Injector gdb failed to pass its self-test: Yama security extension is blocking runtime attaching, see /proc/sys/kernel/yama/ptrace_scope.
Error: Injector lldb failed to pass its self-test: Yama security extension is blocking runtime attaching, see /proc/sys/kernel/yama/ptrace_scope.
Injector style successfully passed its self-test.

toluschr force-pushed the new-gammaray branch from 7e28c31 to 4d1f3ee Compare June 26, 2020 20:33

ericonr reviewed Jun 26, 2020

View reviewed changes

toluschr force-pushed the new-gammaray branch from 4d1f3ee to 2352886 Compare June 26, 2020 20:46

toluschr force-pushed the new-gammaray branch 3 times, most recently from 26c7b27 to fc94546 Compare June 27, 2020 07:39

toluschr commented Jun 27, 2020

View reviewed changes

toluschr force-pushed the new-gammaray branch from fc94546 to 26b7e1a Compare June 27, 2020 10:44

toluschr commented Jun 27, 2020

View reviewed changes

mvf suggested changes Jul 3, 2020

View reviewed changes

sgn reviewed Jul 4, 2020

View reviewed changes

toluschr force-pushed the new-gammaray branch 2 times, most recently from f90c844 to 2ac3f3a Compare July 4, 2020 08:21

toluschr force-pushed the new-gammaray branch 2 times, most recently from 6e075ca to 31db75e Compare July 9, 2020 15:50

New package: gammaray-2.11.1

e2f5373

toluschr force-pushed the new-gammaray branch from 31db75e to e2f5373 Compare July 14, 2020 08:05

Johnnynator merged commit f129dce into void-linux:master Jul 14, 2020

github-actions bot locked as resolved and limited conversation to collaborators Aug 26, 2021

		cd "${DESTDIR}"
		for f in usr/lib/*.so; do [ -L "${f}" ] && vmove "${f}"; done

		@@ -0,0 +1,31 @@
		# Template file for 'gammaray'
		pkgname=gammaray

		@@ -0,0 +1,34 @@
		# Template file for 'GammaRay'
		pkgname=GammaRay

		libgammaray_core-qt5_15-x86_64.so.2.11.1 GammaRay-2.11.1_1
		libgammaray_common-qt5_15-x86_64.so.2.11.1 GammaRay-2.11.1_1


		LDFLAGS+=" -Wl,-no-fatal-warnings"

		pre_build() {

New package: gammaray-2.11.1 #23242

New package: gammaray-2.11.1 #23242

Conversation

toluschr commented Jun 26, 2020

toluschr commented Jun 26, 2020

toluschr commented Jun 26, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ericonr Jun 26, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

toluschr Jul 4, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

toluschr commented Jun 26, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

toluschr Jun 27, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ericonr Jul 4, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

toluschr commented Jul 7, 2020

Johnnynator commented Jul 13, 2020 • edited Loading

toluschr commented Jul 13, 2020 • edited Loading

toluschr commented Jul 14, 2020

ericonr Jun 26, 2020 •

edited

Loading

toluschr Jul 4, 2020 •

edited

Loading

toluschr Jun 27, 2020 •

edited

Loading

ericonr Jul 4, 2020 •

edited

Loading

Johnnynator commented Jul 13, 2020 •

edited

Loading

toluschr commented Jul 13, 2020 •

edited

Loading