From 55a3d2d1a042c4a18771acdd1b2bc7132dfb9865 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 8 Apr 2024 18:32:50 +0000 Subject: [PATCH] extra/qt5-base to 5.15.13+kde+r145-1 --- extra/qt5-base/.SRCINFO | 8 ++++---- extra/qt5-base/PKGBUILD | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extra/qt5-base/.SRCINFO b/extra/qt5-base/.SRCINFO index 9438a67ab..27a1eb202 100644 --- a/extra/qt5-base/.SRCINFO +++ b/extra/qt5-base/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = qt5-base pkgdesc = A cross-platform application and UI framework - pkgver = 5.15.13+kde+r142 + pkgver = 5.15.13+kde+r145 pkgrel = 1 url = https://www.qt.io arch = x86_64 @@ -51,11 +51,11 @@ pkgbase = qt5-base optdepends = gtk3: GTK platform plugin optdepends = perl: for fixqt4headers and syncqt conflicts = qtchooser - source = git+https://invent.kde.org/qt/qt/qtbase#commit=2b71429330544809ff5f95111a020e7ceec643fd + source = kde-qtbase::git+https://invent.kde.org/qt/qt/qtbase#commit=8d30c21cfb529edbdcfd32a928f97b4f861d20e2 source = work-around-pyside2-brokenness.patch source = qmake-cflags.patch source = qmake-config.patch - sha256sums = SKIP + sha256sums = 4f73f7214737f8d50b5a4bfeb80717b9ff2399ae4b065f3de028677d139b38b2 sha256sums = 6a4ec2bfcf4e7cff73346762b252cc28be5ca0ed79fde5e69350efe229b43adc sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 sha256sums = 4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa @@ -87,6 +87,6 @@ pkgname = qt5-base pkgname = qt5-xcb-private-headers pkgdesc = Private headers for Qt5 Xcb groups = - depends = qt5-base=5.15.13+kde+r142 + depends = qt5-base=5.15.13+kde+r145 optdepends = conflicts = diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD index f9870f1e0..ae6078fbc 100644 --- a/extra/qt5-base/PKGBUILD +++ b/extra/qt5-base/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) _basever=5.15.13 -pkgver=5.15.13+kde+r142 +pkgver=5.15.13+kde+r145 pkgrel=1 -_commit=2b71429330544809ff5f95111a020e7ceec643fd +_commit=8d30c21cfb529edbdcfd32a928f97b4f861d20e2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -34,22 +34,22 @@ optdepends=('qt5-svg: to use SVG icon themes' conflicts=('qtchooser') groups=('qt5') _pkgfqn=${pkgbase/5-/} -source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit +source=(kde-$_pkgfqn::git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit work-around-pyside2-brokenness.patch qmake-cflags.patch qmake-config.patch) -sha256sums=('SKIP' +sha256sums=('4f73f7214737f8d50b5a4bfeb80717b9ff2399ae4b065f3de028677d139b38b2' '6a4ec2bfcf4e7cff73346762b252cc28be5ca0ed79fde5e69350efe229b43adc' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' '4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa') pkgver() { - cd $_pkgfqn + cd kde-$_pkgfqn echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` | sed -e 's|+kde+r0||' } prepare() { - cd ${_pkgfqn} + cd kde-$_pkgfqn patch -p1 < ../work-around-pyside2-brokenness.patch patch -p1 < ../qmake-cflags.patch # Use system CFLAGS in qmake patch -p1 < ../qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834 @@ -58,7 +58,7 @@ prepare() { } build() { - cd ${_pkgfqn} + cd kde-$_pkgfqn ./configure -confirm-license -opensource -v \ -prefix /usr \ @@ -99,7 +99,7 @@ package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends+=(qt5-translations) - cd ${_pkgfqn} + cd kde-$_pkgfqn make INSTALL_ROOT="${pkgdir}" install install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase @@ -126,7 +126,7 @@ package_qt5-xcb-private-headers() { groups=() conflicts=() - cd ${_pkgfqn} + cd kde-$_pkgfqn install -d -m755 "$pkgdir"/usr/include/qtxcb-private cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/ }