From 61936a0694aba0fb66d0c2efd5332e64bcb13fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 6 Apr 2021 08:14:42 +0700 Subject: [PATCH 1/5] build-helper/qmake: respect {C,CXX,LD}FLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of it's now, package built with build-helper/qmake natively won't pick our CFLAGS CXXFLAGS and LDFLAGS. The result could be seen in no debug symbol in djview. Furthermore, cross build won't pick our hardening flags. Let's force qmake pick our flags by using the same method as build-style/qmake. --- common/build-helper/qmake.sh | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh index 9603cf5baae9..d2a38703b300 100644 --- a/common/build-helper/qmake.sh +++ b/common/build-helper/qmake.sh @@ -65,14 +65,36 @@ _EOF # create the qmake-wrapper here because it only # makes sense together with the qmake build-helper # and not to interfere with e.g. the qmake build-style + # + # XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native. + # - Cross Build: + # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS + # + hardening flags will be picked up from environment variables + # - Native Build: + # + hardening flags will be picked up first (Makefile, qt.conf?) + # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS + # Maybe there're better workaround, I don't know. cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF #!/bin/sh -exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" +exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\ + QMAKE_CFLAGS+="\${CFLAGS}" \\ + QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\ + QMAKE_LFLAGS+="\${LDFLAGS}" _EOF else cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF #!/bin/sh -exec /usr/lib/qt5/bin/qmake "\$@" CONFIG+=no_qt_rpath +exec /usr/lib/qt5/bin/qmake \ + "\$@" \ + PREFIX=/usr \ + QT_INSTALL_PREFIX=/usr \ + LIB=/usr/lib \ + QMAKE_CC=$CC QMAKE_CXX=$CXX \ + QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \ + QMAKE_CFLAGS+="${CFLAGS}" \ + QMAKE_CXXFLAGS+="${CXXFLAGS}" \ + QMAKE_LFLAGS+="${LDFLAGS}" \ + CONFIG+=no_qt_rpath _EOF fi chmod 755 ${XBPS_WRAPPERDIR}/qmake From ad469c340a3640880b538e4487c5459557bfde16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 6 Apr 2021 08:17:30 +0700 Subject: [PATCH 2/5] djview: fix dbg package --- srcpkgs/djview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template index a6af3f0188d1..76a0d1cc4103 100644 --- a/srcpkgs/djview/template +++ b/srcpkgs/djview/template @@ -1,11 +1,11 @@ # Template file for 'djview' pkgname=djview version=4.12 -revision=2 +revision=3 wrksrc="djview4-${version}" build_style=gnu-configure build_helper=qmake -configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5" +configure_args="ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5" hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool" makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel" short_desc="Portable DjVu viewer and browser plugin" From d225ba989b2dc9e3851cab31f27d2aba191513a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 6 Apr 2021 22:31:49 +0700 Subject: [PATCH 3/5] abGate: clean up template - qt5-devel isn't required in hostmakedepends - Don't rename distfiles --- srcpkgs/abGate/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template index f772f49e796a..d4fff83840b1 100644 --- a/srcpkgs/abGate/template +++ b/srcpkgs/abGate/template @@ -11,10 +11,6 @@ short_desc="LV2 Noise Gate plugin" maintainer="Orphaned " license="LGPL-3.0-or-later" homepage="http://abgate.sourceforge.net/" -distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz>${pkgname}-${versiont}.tar.gz" +distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz" checksum=ebee1cc545b088bf6e5989c114e7e34fa9f21ac7fdb1eee3fd067bcf98703b86 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-devel" -fi CXXFLAGS="-fPIC" From 77cd90485973251dc8d2c848fc4af0d4769ce5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 6 Apr 2021 22:48:56 +0700 Subject: [PATCH 4/5] smplayer: fix dbg package --- srcpkgs/smplayer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index a92e285d3c92..564da633cc17 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,7 +1,7 @@ # Template file for 'smplayer' pkgname=smplayer version=21.1.0 -revision=1 +revision=2 build_style=gnu-makefile build_helper=qmake hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar" From 5a15d287dd52f4273c042204ed8ee07ec0f6e5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 5 Apr 2021 23:01:55 +0700 Subject: [PATCH 5/5] qjackctl: update checksum --- srcpkgs/qjackctl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template index 688de6749167..8bcba9039fd7 100644 --- a/srcpkgs/qjackctl/template +++ b/srcpkgs/qjackctl/template @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://qjackctl.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=ca443646daae21c13a6bec11160fe15639ea19c919d4a5607b1d1918dddd60bc +checksum=867c088ed819f61d2eb1e550d4bb8f6330d8f247ab99843a584d81825f1a5d24 build_options="jack_session" build_options_default="jack_session"