jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qt5: update to 5.14.2

Browse source
This commit is contained in:
John 2020-04-02 20:17:46 +02:00 committed by John Zimmermann
parent dd4f7cc6ef
commit 91fea1614b
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
srcpkgs/qt5/template
View file

@ -43,13 +43,13 @@ fi
_cleanup_wrksrc_leak() { _cleanup_wrksrc_leak() {
if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then
# Replace references to ${wrksrc} in cmake files # Replace references to ${wrksrc} in cmake files
sed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \ vsed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \
-e "s;${wrksrc}/host;/usr/lib/qt5;g" \ -e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
fi fi
if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then
# Replace references to ${wrksrc} in pkgconfig files # Replace references to ${wrksrc} in pkgconfig files
sed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \ vsed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \
-e "s;${wrksrc}/host;/usr/lib/qt5;g" \ -e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
fi fi
@ -172,9 +172,9 @@ do_configure() {
# Cross build patches # Cross build patches
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# This also sets default {C,CXX,LD}FLAGS for projects built using qmake # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${XBPS_CFLAGS}|" \ vsed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${XBPS_CFLAGS}|" \
${wrksrc}/qtbase/mkspecs/common/gcc-base.conf ${wrksrc}/qtbase/mkspecs/common/gcc-base.conf
sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${XBPS_LDFLAGS}|" \ vsed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${XBPS_LDFLAGS}|" \
${wrksrc}/qtbase/mkspecs/common/g++-unix.conf ${wrksrc}/qtbase/mkspecs/common/g++-unix.conf
# Create symbolic links for private include directories # Create symbolic links for private include directories
@ -183,15 +183,15 @@ do_configure() {
done done
else else
# qmake {CXX,L}FLAGS patches # qmake {CXX,L}FLAGS patches
sed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \ vsed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \
-e "s|^\(LFLAGS =.*\)|\1 ${LDFLAGS}|" \ -e "s|^\(LFLAGS =.*\)|\1 ${LDFLAGS}|" \
${wrksrc}/qtbase/qmake/Makefile.unix ${wrksrc}/qtbase/qmake/Makefile.unix
# Build qmake using Void {C,LD}FLAGS # Build qmake using Void {C,LD}FLAGS
# This also sets default {C,CXX,LD}FLAGS for projects built using qmake # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \ vsed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
${wrksrc}/qtbase/mkspecs/common/gcc-base.conf ${wrksrc}/qtbase/mkspecs/common/gcc-base.conf
sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ vsed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
${wrksrc}/qtbase/mkspecs/common/g++-unix.conf ${wrksrc}/qtbase/mkspecs/common/g++-unix.conf
fi fi
@ -317,7 +317,7 @@ do_install() {
_msg_cross " Building ${base}" _msg_cross " Building ${base}"
cd ${wrksrc}/${dir}/${base} cd ${wrksrc}/${dir}/${base}
[ -f "${base}.pro" ] && cp -a ${base}.pro{,.orig} [ -f "${base}.pro" ] && cp -a ${base}.pro{,.orig}
sed -i ${base}.pro \ vsed -i ${base}.pro \
-e "/option(host_build)/d" \ -e "/option(host_build)/d" \
-e "/include(..\/3rdparty\/masm\/masm-defs.pri)/i include(../3rdparty/masm/masm.pri)" -e "/include(..\/3rdparty\/masm\/masm-defs.pri)/i include(../3rdparty/masm/masm.pri)"
make clean make clean
@ -329,7 +329,7 @@ do_install() {
[ -f "${base}.pro.orig" ] && mv -v ${base}.pro{.orig,} [ -f "${base}.pro.orig" ] && mv -v ${base}.pro{.orig,}
mv -v Makefile{.orig,} mv -v Makefile{.orig,}
# Avoid rebuilding the Makefile by changing the rule # Avoid rebuilding the Makefile by changing the rule
sed -i Makefile -e "s;^Makefile:;Makefile.host:;" vsed -i Makefile -e "s;^Makefile:;Makefile.host:;"
# #
# Build various tools for the target # Build various tools for the target
@ -376,7 +376,7 @@ do_install() {
cp ${FILESDIR}/${base}.pro ${base}.pro cp ${FILESDIR}/${base}.pro ${base}.pro
else else
# Otherwise strip the option(host_build) # Otherwise strip the option(host_build)
sed -i ${base}.pro -e "/option(host_build)/d" vsed -i ${base}.pro -e "/option(host_build)/d"
fi fi
# Create the Makefile # Create the Makefile
[ -f Makefile ] && mv -v Makefile{,.orig} [ -f Makefile ] && mv -v Makefile{,.orig}
@ -396,7 +396,7 @@ do_install() {
-e "s;^\(RANLIB\\s*=\).*;\1 $RANLIB;" \ -e "s;^\(RANLIB\\s*=\).*;\1 $RANLIB;" \
\; \;
# Set a different destination directory and target name # Set a different destination directory and target name
sed -i Makefile \ vsed -i Makefile \
-e "s;^\(DESTDIR\\s*=\).*;\1 ${DESTDIR}/usr/lib/qt5/bin/;" \ -e "s;^\(DESTDIR\\s*=\).*;\1 ${DESTDIR}/usr/lib/qt5/bin/;" \
-e "s;^\(TARGET\\s*=\).*;\1 ${DESTDIR}/usr/lib/qt5/bin/${base}-target;" -e "s;^\(TARGET\\s*=\).*;\1 ${DESTDIR}/usr/lib/qt5/bin/${base}-target;"
make ${makejobs} make ${makejobs}
@ -404,8 +404,8 @@ do_install() {
[ -f "${base}.pro.orig" ] && mv -v ${base}.pro{.orig,} [ -f "${base}.pro.orig" ] && mv -v ${base}.pro{.orig,}
[ -f Makefile.orig ] && mv -v Makefile{.orig,} [ -f Makefile.orig ] && mv -v Makefile{.orig,}
# Avoid rebuilding the Makefile by changing the rule # Avoid rebuilding the Makefile by changing the rule
sed -i Makefile -e 's;^all:.*;all:;' vsed -i Makefile -e 's;^all:.*;all:;'
sed -i Makefile -e "s;^Makefile:;Makefile.host:;" vsed -i Makefile -e "s;^Makefile:;Makefile.host:;"
if [ -x "${wrksrc}/${dir}/bin/${base}-host" ]; then if [ -x "${wrksrc}/${dir}/bin/${base}-host" ]; then
mv -v ${wrksrc}/${dir}/bin/${base}{-host,} mv -v ${wrksrc}/${dir}/bin/${base}{-host,}
touch ${wrksrc}/${dir}/bin/${base} touch ${wrksrc}/${dir}/bin/${base}