Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qtractor: update to 0.9.21. #29509

Closed
wants to merge 1 commit into from
Closed

Conversation

Clyybber
Copy link
Contributor

@Clyybber Clyybber commented Mar 16, 2021

General

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

@sgn
Copy link
Member

sgn commented Mar 16, 2021

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 9c868ea8b0..fa64e6de8a 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -4,8 +4,9 @@ version=0.9.20
 revision=1
 wrksrc="qtractor-qtractor_${version//./_}"
 build_style=gnu-configure
-configure_args="--enable-debug"
-hostmakedepends="automake pkg-config"
+build_helper=qmake
+configure_args="--enable-debug ac_qmake=${XBPS_WRAPPERDIR}/qmake"
+hostmakedepends="automake pkg-config qt5-qmake qt5-host-tools"
 makedepends="dssi-devel jack-devel ladspa-sdk liblo-devel libmad-devel
  libsamplerate-devel lilv-devel qt5-tools-devel qt5-x11extras-devel
  rubberband-devel sratom-devel suil-devel vamp-plugin-sdk-devel"
@@ -18,9 +19,6 @@ changelog="https://raw.githubusercontent.com/rncbc/qtractor/master/ChangeLog"
 distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.tar.gz"
 checksum=6b317e1b24ce99f354fc083aa0055228c6a9bd90c5a3d8abcb280af5014fd5c3
 
-# configure fails to find qt5 headers
-nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/3458/steps/shell_3/logs/stdio"
-
 pre_configure() {
 	autoreconf -if
 }

RPATH is still there! @-@

@sgn
Copy link
Member

sgn commented Mar 16, 2021

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 9c868ea8b0..5a76db16ca 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -4,8 +4,10 @@ version=0.9.20
 revision=1
 wrksrc="qtractor-qtractor_${version//./_}"
 build_style=gnu-configure
-configure_args="--enable-debug"
-hostmakedepends="automake pkg-config"
+build_helper=qmake
+configure_args="--enable-debug ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake
+ ac_cv_libsuil_gtk2_in_qt5=yes ac_cv_libsuil_x11_in_qt5=yes"
+hostmakedepends="automake pkg-config qt5-qmake qt5-host-tools"
 makedepends="dssi-devel jack-devel ladspa-sdk liblo-devel libmad-devel
  libsamplerate-devel lilv-devel qt5-tools-devel qt5-x11extras-devel
  rubberband-devel sratom-devel suil-devel vamp-plugin-sdk-devel"
@@ -18,9 +20,6 @@ changelog="https://raw.githubusercontent.com/rncbc/qtractor/master/ChangeLog"
 distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.tar.gz"
 checksum=6b317e1b24ce99f354fc083aa0055228c6a9bd90c5a3d8abcb280af5014fd5c3
 
-# configure fails to find qt5 headers
-nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/3458/steps/shell_3/logs/stdio"
-
 pre_configure() {
 	autoreconf -if
 }

@ericonr
Copy link
Member

ericonr commented Apr 11, 2021

@Clyybber ping

@Clyybber Clyybber changed the title qtractor: update to 0.9.20. qtractor: update to 0.9.21. Apr 12, 2021
@Clyybber Clyybber marked this pull request as ready for review April 12, 2021 14:45
@ericonr ericonr closed this in 360affa Apr 14, 2021
@ericonr
Copy link
Member

ericonr commented Apr 14, 2021

Had to rebase locally, thanks!

hazayan pushed a commit to hazayan/void-packages that referenced this pull request Apr 15, 2021
Closes: void-linux#29509 [via git-merge-pr]
Logarithmus pushed a commit to Logarithmus/void-packages that referenced this pull request May 5, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 13, 2021
@Clyybber Clyybber deleted the qtractor branch April 21, 2022 12:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants