diff options
author | Martchus | 2022-05-18 11:22:09 +0200 |
---|---|---|
committer | Martchus | 2022-05-18 11:22:09 +0200 |
commit | 14a4dce3add6b06605bbdafd53d2f302732c9cef (patch) | |
tree | 5978be3fe7db2cafcd6c65b8361bcfad2b037033 | |
parent | d03ee9cbb797a9bcc6ced361506764d96c9d5027 (diff) | |
download | aur-14a4dce3add6b06605bbdafd53d2f302732c9cef.tar.gz |
Rebase against 5.15.4
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-Fix-linguist-macro.patch | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | PKGBUILD | 8 | ||||
-rw-r--r-- | PKGBUILD.sh.ep | 2 | ||||
-rw-r--r-- | qttools-sha256.txt | 2 |
5 files changed, 11 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-tools pkgdesc = A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64) - pkgver = 5.15.3+kde+r1 + pkgver = 5.15.4+kde+r0 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -20,9 +20,9 @@ pkgbase = mingw-w64-qt5-tools options = !strip options = !buildflags options = staticlibs - source = git+https://invent.kde.org/qt/qt/qttools#commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4 + source = git+https://invent.kde.org/qt/qt/qttools#commit=53ee43a51b5a3de2877dafffc78e71ff55926708 source = 0001-Fix-linguist-macro.patch sha256sums = SKIP - sha256sums = 4808f9bc8db99b2d719a0aecc4a296580f9a92b95c03ddbbd78470c1a903d082 + sha256sums = b535f1f31263e791514e784dd5d9bd93e34e6cf5da06d1a4aa2b06809421f36b pkgname = mingw-w64-qt5-tools diff --git a/0001-Fix-linguist-macro.patch b/0001-Fix-linguist-macro.patch index 7f5504f186c2..4ad04e8c882a 100644 --- a/0001-Fix-linguist-macro.patch +++ b/0001-Fix-linguist-macro.patch @@ -1,4 +1,4 @@ -From 91a31449aefc95da17c08fb11cd3d77939ff942e Mon Sep 17 00:00:00 2001 +From 0cfa1827d85c15346128940f2480ac844e97e609 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH] Fix linguist macro @@ -38,5 +38,5 @@ index 20fb14935..406d3d3a3 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.35.1 +2.36.1 diff --git a/PKGBUILD b/PKGBUILD index 0066ede7fbbe..4ae7639ef6c8 100644..100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,16 +23,16 @@ _qt_module=qttools pkgname=mingw-w64-qt5-tools -pkgver=5.15.3 +pkgver=5.15.4 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4 +_commit=53ee43a51b5a3de2877dafffc78e71ff55926708 _basever=$pkgver -pkgver+=+kde+r1 +pkgver+=+kde+r0 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -41,7 +41,7 @@ _pkgfqn=${_qt_module} source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Fix-linguist-macro.patch') sha256sums=('SKIP' - '4808f9bc8db99b2d719a0aecc4a296580f9a92b95c03ddbbd78470c1a903d082') + 'b535f1f31263e791514e784dd5d9bd93e34e6cf5da06d1a4aa2b06809421f36b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index 9069aa85ae68..ccb4b1b667ef 100644 --- a/PKGBUILD.sh.ep +++ b/PKGBUILD.sh.ep @@ -18,7 +18,7 @@ % end \ -pkgver=5.15.3 +pkgver=5.15.4 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" diff --git a/qttools-sha256.txt b/qttools-sha256.txt index 73691a3fd8a3..cc2ecb636e3a 100644 --- a/qttools-sha256.txt +++ b/qttools-sha256.txt @@ -1 +1 @@ -c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc +SKIP |