diff --git a/extra/qt6-base/.SRCINFO b/extra/qt6-base/.SRCINFO index 460403b5c..9f6c96657 100644 --- a/extra/qt6-base/.SRCINFO +++ b/extra/qt6-base/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = qt6-base pkgdesc = A cross-platform application and UI framework pkgver = 6.7.0 - pkgrel = 3 + pkgrel = 4 url = https://www.qt.io arch = x86_64 groups = qt6 diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD index aedba6f2b..c9880ce37 100644 --- a/extra/qt6-base/PKGBUILD +++ b/extra/qt6-base/PKGBUILD @@ -7,10 +7,11 @@ # - removed -DFEATURE_no_direct_extern_access=ON pkgbase=qt6-base -pkgname=(qt6-base qt6-xcb-private-headers) +pkgname=(qt6-base + qt6-xcb-private-headers) _qtver=6.7.0 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=4 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -97,6 +98,8 @@ 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 } build() {