From 8f3280c0320dc9e4cd7696bd749507bbc402961b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Apr 2021 23:36:13 +0200 Subject: [PATCH] qt5: update to 5.15.3+20210429. switch to the KDE patchset --- srcpkgs/qt5/template | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index c8e93578e94d..bbe16c76125c 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,8 +1,7 @@ # Template file for 'qt5' pkgname=qt5 -version=5.15.2 -revision=5 -wrksrc="qt-everywhere-src-${version}" +version=5.15.3+20210429 +revision=1 build_style=meta hostmakedepends="cmake clang flex perl glib-devel pkg-config python re2c ruby which" @@ -21,8 +20,12 @@ short_desc="Cross-platform application and UI framework (QT5)" maintainer="John " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://qt.io/" -distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz" -checksum=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240 +# https://pypi.org/project/git-archive-all +# tarball is generated with `git archive-all qt5-$version.tar.gz` +# to keep the size smaller qtwebengine, qtwebview, qtdocgallery, qtactiveqt and qtpim +# can be marked with the export-ignore attribute +distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz" +checksum=6936ecf7c35162832bde5b5685f24c0924868745983f030e377924c1d80f68d1 python_version=2 #unverified replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0 qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0" @@ -170,6 +173,12 @@ _msg_cross() { msg_normal "***************************************************\n" } +post_extract() { + find -maxdepth 1 -type d -exec mkdir -p {}/.git \; + # just keep module_version at 5.15.2, since some external modules are still 5.15.2 + find -maxdepth 1 -type d -exec sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i {}/.qmake.conf \; +} + do_configure() { local opts spec @@ -241,6 +250,8 @@ do_configure() { # opts+=" -v" opts+=" -skip qtwebengine" opts+=" -skip qtwebview" + opts+=" -skip qtdocgallery" + opts+=" -skip qtpim" LDFLAGS+=" -Wl,--no-keep-memory" # needs more than 8GB RAM else if [ "$CROSS_BUILD" ]; then spec=void-${XBPS_CROSS_TRIPLET}-g++