From 91fea1614b86b3cfac87cd97e9da22ebba8e8c8a Mon Sep 17 00:00:00 2001 From: John Date: Thu, 2 Apr 2020 20:17:46 +0200 Subject: [PATCH] qt5: update to 5.14.2 --- srcpkgs/qt5/template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 245dc3d83cc..9a4744ee63e 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -43,13 +43,13 @@ fi _cleanup_wrksrc_leak() { if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then # 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;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" fi if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then # 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;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" fi @@ -172,9 +172,9 @@ do_configure() { # Cross build patches if [ "$CROSS_BUILD" ]; then # 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 - 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 # Create symbolic links for private include directories @@ -183,15 +183,15 @@ do_configure() { done else # qmake {CXX,L}FLAGS patches - sed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \ + vsed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \ -e "s|^\(LFLAGS =.*\)|\1 ${LDFLAGS}|" \ ${wrksrc}/qtbase/qmake/Makefile.unix # Build qmake using Void {C,LD}FLAGS # 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 - 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 fi @@ -317,7 +317,7 @@ do_install() { _msg_cross " Building ${base}" cd ${wrksrc}/${dir}/${base} [ -f "${base}.pro" ] && cp -a ${base}.pro{,.orig} - sed -i ${base}.pro \ + vsed -i ${base}.pro \ -e "/option(host_build)/d" \ -e "/include(..\/3rdparty\/masm\/masm-defs.pri)/i include(../3rdparty/masm/masm.pri)" make clean @@ -329,7 +329,7 @@ do_install() { [ -f "${base}.pro.orig" ] && mv -v ${base}.pro{.orig,} mv -v Makefile{.orig,} # 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 @@ -376,7 +376,7 @@ do_install() { cp ${FILESDIR}/${base}.pro ${base}.pro else # 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 # Create the Makefile [ -f Makefile ] && mv -v Makefile{,.orig} @@ -396,7 +396,7 @@ do_install() { -e "s;^\(RANLIB\\s*=\).*;\1 $RANLIB;" \ \; # 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;^\(TARGET\\s*=\).*;\1 ${DESTDIR}/usr/lib/qt5/bin/${base}-target;" make ${makejobs} @@ -404,8 +404,8 @@ do_install() { [ -f "${base}.pro.orig" ] && mv -v ${base}.pro{.orig,} [ -f Makefile.orig ] && mv -v Makefile{.orig,} # Avoid rebuilding the Makefile by changing the rule - sed -i Makefile -e 's;^all:.*;all:;' - sed -i Makefile -e "s;^Makefile:;Makefile.host:;" + vsed -i Makefile -e 's;^all:.*;all:;' + vsed -i Makefile -e "s;^Makefile:;Makefile.host:;" if [ -x "${wrksrc}/${dir}/bin/${base}-host" ]; then mv -v ${wrksrc}/${dir}/bin/${base}{-host,} touch ${wrksrc}/${dir}/bin/${base}