extra/qt5-base to 5.15.3+kde+r132-1

This commit is contained in:
Kevin Mihelich 2022-03-06 17:31:25 +00:00
parent 7b8fa7e8e8
commit 9e9ba2ead1

View file

@ -9,9 +9,10 @@
pkgbase=qt5-base pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers) pkgname=(qt5-base qt5-xcb-private-headers)
pkgver=5.15.2+kde+r305 _basever=5.15.3
pkgver=5.15.3+kde+r132
pkgrel=1 pkgrel=1
_commit=77c620f0a1f8a5e8e126fd00a7beba6ac8005ad0 _commit=e6c19422a25890b5e9a728f4acb9166a6a11527e
arch=('x86_64') arch=('x86_64')
url='https://www.qt.io' url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom') license=('GPL3' 'LGPL3' 'FDL' 'custom')
@ -33,7 +34,7 @@ optdepends=('qt5-svg: to use SVG icon themes'
'perl: for fixqt4headers and syncqt') 'perl: for fixqt4headers and syncqt')
conflicts=('qtchooser') conflicts=('qtchooser')
groups=('qt' 'qt5') groups=('qt' 'qt5')
_pkgfqn=qtbase _pkgfqn=${pkgbase/5-/}
source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
qmake-cflags.patch qmake-cflags.patch
qmake-config.patch) qmake-config.patch)
@ -44,14 +45,11 @@ options=(debug)
pkgver() { pkgver() {
cd $_pkgfqn cd $_pkgfqn
echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
} }
prepare() { prepare() {
cd ${_pkgfqn} cd ${_pkgfqn}
git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
patch -p1 < ../qmake-cflags.patch # Use system CFLAGS in qmake 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 patch -p1 < ../qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834