diff --git a/extra/qt6-base/.SRCINFO b/extra/qt6-base/.SRCINFO index 3dbff4f1b..7a6422f54 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.3 - pkgrel = 2 + pkgver = 6.8.0 + pkgrel = 1 url = https://www.qt.io arch = x86_64 groups = qt6 @@ -76,10 +76,10 @@ 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.3 + source = git+https://code.qt.io/qt/qtbase#tag=v6.8.0 source = qt6-base-cflags.patch source = qt6-base-nostrip.patch - sha256sums = 3da3df07b4bbd6a963af0c975ab6ff18c8c0aa73454048b0318899362c4adab9 + sha256sums = 3ec5b25b078190b46cb4ce83f7d8967649c0a786c4d2fddd65715e60c751cdc6 sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 @@ -133,5 +133,5 @@ pkgname = qt6-base pkgname = qt6-xcb-private-headers pkgdesc = Private headers for Qt6 Xcb groups = - depends = qt6-base=6.7.3 + depends = qt6-base=6.8.0 optdepends = diff --git a/extra/qt6-base/.nvchecker.toml b/extra/qt6-base/.nvchecker.toml index 15106b64d..8f766fe0e 100644 --- a/extra/qt6-base/.nvchecker.toml +++ b/extra/qt6-base/.nvchecker.toml @@ -2,4 +2,6 @@ source = 'git' git = 'git://code.qt.io/qt/qtbase.git' prefix = 'v' -exclude_regex = '.*(alpha|beta|rc).*' +include_regex = '.*(alpha|beta|rc).*' +from_pattern = '-' +to_pattern = '' diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD index ecbc83a93..c2b3f8a8f 100644 --- a/extra/qt6-base/PKGBUILD +++ b/extra/qt6-base/PKGBUILD @@ -9,8 +9,9 @@ pkgbase=qt6-base pkgname=(qt6-base qt6-xcb-private-headers) -pkgver=6.7.3 -pkgrel=2 +_pkgver=6.8.0 +pkgver=6.8.0 +pkgrel=1 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -84,19 +85,16 @@ optdepends=('freetds: MS SQL driver' 'unixodbc: ODBC driver') groups=(qt6) _pkgfn=${pkgbase/6-/} -source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$pkgver +source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$_pkgver qt6-base-cflags.patch qt6-base-nostrip.patch) -sha256sums=('3da3df07b4bbd6a963af0c975ab6ff18c8c0aa73454048b0318899362c4adab9' +sha256sums=('3ec5b25b078190b46cb4ce83f7d8967649c0a786c4d2fddd65715e60c751cdc6' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' '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 - - cd $_pkgfn - git revert -n 9c1f39b93e6fd5261da4324d17a5ecd40db5f05b # Fix https://bugreports.qt.io/browse/QTBUG-129509 } build() {