From ea2fb64676d3b1c42461f825983e5bc9866abe80 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Apr 2021 23:36:13 +0200 Subject: [PATCH 1/4] qt5: update to 5.15.3+20210429. switch to the KDE patchset --- srcpkgs/qt5/template | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index c8e93578e94d..08c7badefa18 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 @@ -184,11 +193,6 @@ do_configure() { ${wrksrc}/qtbase/mkspecs/common/gcc-base.conf vsed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${XBPS_LDFLAGS}|" \ ${wrksrc}/qtbase/mkspecs/common/g++-unix.conf - - # Create symbolic links for private include directories - for d in $(ls ${wrksrc}/qtbase/include); do - ln -sfv ${version}/${d}/private qtbase/include/${d}/private - done else # qmake {CXX,L}FLAGS patches vsed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \ @@ -241,6 +245,9 @@ do_configure() { # opts+=" -v" opts+=" -skip qtwebengine" opts+=" -skip qtwebview" + opts+=" -skip qtdocgallery" + opts+=" -skip qtpim" + opts+=" -skip qtsystems" LDFLAGS+=" -Wl,--no-keep-memory" # needs more than 8GB RAM else if [ "$CROSS_BUILD" ]; then spec=void-${XBPS_CROSS_TRIPLET}-g++ From 68e2b2ec3fc12c01ebd5fb8b3e4d741d406d2d08 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 3 May 2021 12:55:04 +0200 Subject: [PATCH 2/4] kwin: rebuild against qt5.15.3 --- srcpkgs/kwin/template | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index 0306c2416f00..4f0312a39da0 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,7 +1,7 @@ # Template file for 'kwin' pkgname=kwin version=5.21.4 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext breeze pkg-config" @@ -10,7 +10,7 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel lcms2-devel kwayland-server-devel $(vopt_if pipewire pipewire-devel) krunner-devel" -depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.15.3" +depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0" short_desc="KDE Window manager" maintainer="John " license="GPL-2.0-or-later" @@ -30,19 +30,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -post_extract() { - _qt5_dep_ver="${depends#*>=}" - _qt5_dep_ver="${_qt5_dep_ver%<*}" - _qt5_version="$(xbps-uhelper version qt5-core)" - - if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then - echo - msg_red "Qt5 version doesn't match version listed in \$depends\\n" - msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n" - exit 1 - fi -} - kwin-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}-${version}_${revision}" From 91e568794ec20808744cb64db3338fdfec96dde2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 3 May 2021 12:55:15 +0200 Subject: [PATCH 3/4] telegram-desktop: rebuild against qt5.15.3 --- srcpkgs/telegram-desktop/template | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 275c91163861..30a1d2ec6eec 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=2.7.4 -revision=1 +revision=2 wrksrc="tdesktop-${version}-full" build_style=cmake build_helper="qemu" @@ -18,7 +18,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel) kwayland-devel glibmm-devel tg_owt webkit2gtk-devel" -depends="qt5-imageformats qt5-core>=5.15.2<5.15.3" +depends="qt5-imageformats qt5-core>=5.15.2<5.16.0" short_desc="Telegram Desktop messaging app" maintainer="John " license="GPL-3.0-or-later, OpenSSL" @@ -45,16 +45,3 @@ fi if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="UI doesn't go beyond initial screen, also LE specific code in networking" fi - -post_extract() { - _qt5_dep_ver="${depends#*>=}" - _qt5_dep_ver="${_qt5_dep_ver%<*}" - _qt5_version="$(xbps-uhelper version qt5-core)" - - if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then - echo - msg_red "Qt5 version doesn't match version listed in \$depends\\n" - msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n" - exit 1 - fi -} From 7ec1e4006ea4ee303b32fef94e27bac9067034fb Mon Sep 17 00:00:00 2001 From: John Date: Mon, 3 May 2021 12:55:29 +0200 Subject: [PATCH 4/4] qt5-styleplugins: rebuild against qt5.15.3 --- srcpkgs/qt5-styleplugins/template | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template index 9e6b476ff2ea..24b958640164 100644 --- a/srcpkgs/qt5-styleplugins/template +++ b/srcpkgs/qt5-styleplugins/template @@ -7,7 +7,7 @@ wrksrc="qtstyleplugins-${_gitrev}" build_style=qmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel" -depends="qt5-core>=5.15.2<5.15.3" +depends="qt5-core>=5.15.2<5.16.0" short_desc="Additional style plugins for Qt5" maintainer="Orphaned " license="LGPL-2.1-only, LGPL-3.0-only" @@ -18,19 +18,6 @@ checksum=29ec24fa8df64be161ad06d0e5af3ba1a20bfe265004f5fe4ab9f5f3abf9a5ba # Cross builds fail with -fuse-ld=gold LDFLAGS="-Wl,-fuse-ld=bfd" -pre_configure() { - _qt5_dep_ver="${depends#*>=}" - _qt5_dep_ver="${_qt5_dep_ver%<*}" - _qt5_version="$(xbps-uhelper version qt5-core)" - - if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then - echo - msg_red "Qt5 version doesn't match version listed in \$depends\\n" - msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n" - exit 1 - fi -} - qt5-styleplugins-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}"