extra/qt6-base to 6.7.1-2

This commit is contained in:
Kevin Mihelich 2024-05-26 03:36:50 +00:00
parent ba41c87027
commit 939fcf15c9
2 changed files with 12 additions and 20 deletions

View file

@ -1,7 +1,7 @@
pkgbase = qt6-base
pkgdesc = A cross-platform application and UI framework
pkgver = 6.7.0
pkgrel = 7
pkgver = 6.7.1
pkgrel = 2
url = https://www.qt.io
arch = x86_64
groups = qt6
@ -76,14 +76,12 @@ pkgbase = qt6-base
optdepends = postgresql-libs: PostgreSQL driver
optdepends = qt6-wayland: to run Qt6 applications in a Wayland session
optdepends = unixodbc: ODBC driver
source = git+https://code.qt.io/qt/qtbase#tag=v6.7.0
source = git+https://code.qt.io/qt/qtbase#tag=v6.7.1
source = qt6-base-cflags.patch
source = qt6-base-nostrip.patch
source = fix-wrong-cpp-if.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=68102202
sha256sums = ee87abbfdf2d5bb204056bcb6c53e21c03e1abd779e3669faa56db7249c5e39e
sha256sums = bc68440a69a331b6b79b3c36acc8346b5dc0aad1b53536fe363860af31dd494b
sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78
sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094
sha256sums = 81c4821fb1c258603474771a267d450aa8b5d1d298443bc04620d70719c7eab7
pkgname = qt6-base
pkgdesc = A cross-platform application and UI framework
@ -135,5 +133,5 @@ pkgname = qt6-base
pkgname = qt6-xcb-private-headers
pkgdesc = Private headers for Qt6 Xcb
groups =
depends = qt6-base=6.7.0
depends = qt6-base=6.7.1
optdepends =

View file

@ -9,9 +9,8 @@
pkgbase=qt6-base
pkgname=(qt6-base
qt6-xcb-private-headers)
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=7
pkgver=6.7.1
pkgrel=2
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@ -87,22 +86,17 @@ groups=(qt6)
_pkgfn=${pkgbase/6-/}
source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$pkgver
qt6-base-cflags.patch
qt6-base-nostrip.patch
fix-wrong-cpp-if.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=68102202)
sha256sums=('ee87abbfdf2d5bb204056bcb6c53e21c03e1abd779e3669faa56db7249c5e39e'
qt6-base-nostrip.patch)
sha256sums=('bc68440a69a331b6b79b3c36acc8346b5dc0aad1b53536fe363860af31dd494b'
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
'81c4821fb1c258603474771a267d450aa8b5d1d298443bc04620d70719c7eab7')
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
prepare() {
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
patch -d $_pkgfn -p1 < fix-wrong-cpp-if.patch # https://bugreports.qt.io/browse/QTBUG-123937
cd $_pkgfn
git cherry-pick -n 7c4e1357e49baebdd2d20710fccb5604cbb36c0d # CVE-2024-33861
git cherry-pick -n a8ef8ea55014546e0e835cd0eacf694919702a11 # https://bugreports.qt.io/browse/QTBUG-124386
git cherry-pick -n 062f701a11d2c46660f5c5edd73f245477918a47 # Fix dependencies in pc files
git cherry-pick -n 5ee9da89af7efe31ac45858bf1eb04e5155a3b50 # Fix dependencies in pc files
git cherry-pick -n f05cf3f11f4e42e05d069b5d9249d4b9aff41ffe # Fix locale issues
}
build() {