summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
2 files changed, 10 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ddf385970c91..3addd9cc5753 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qt6-base-headless
pkgdesc = A cross-platform application and UI framework - headless build, no QtGui or QtWidgets
- pkgver = 6.7.0
+ pkgver = 6.7.1
pkgrel = 1
url = https://www.qt.io
arch = x86_64
@@ -30,14 +30,12 @@ pkgbase = qt6-base-headless
optdepends = shared-mime-info: Freedesktop.org Shared MIME Info
provides = qt6-base
conflicts = qt6-base
- 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-headless
optdepends = postgresql-libs: PostgreSQL driver
diff --git a/PKGBUILD b/PKGBUILD
index 072600a20534..8fabdd6659ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=qt6-base-headless
-_qtver=6.7.0
+_qtver=6.7.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@@ -36,17 +36,17 @@ provides=(qt6-base)
_pkgfn=qtbase
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 f05cf3f11f4e42e05d069b5d9249d4b9aff41ffe # Fix locale issues
}
build() {