diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-Ensure-static-plugins-are-exported.patch | 4 | ||||
| -rw-r--r-- | 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch | 4 | ||||
| -rw-r--r-- | 0003-Disable-d3d12-requiring-fxc.exe.patch | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | PKGBUILD | 12 | ||||
| -rw-r--r-- | PKGBUILD.sh.ep | 2 | ||||
| -rw-r--r-- | qtdeclarative-sha256.txt | 2 |
7 files changed, 19 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-declarative pkgdesc = Classes for QML and JavaScript languages (mingw-w64) - pkgver = 5.15.3+kde+r20 + pkgver = 5.15.4+kde+r17 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -19,13 +19,13 @@ pkgbase = mingw-w64-qt5-declarative options = !strip options = !buildflags options = staticlibs - source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=02105099301450c890e1caba977ef44efdc43da7 + source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=51efb2ed2f071beda188270a23ac450fe4b318f7 source = 0001-Ensure-static-plugins-are-exported.patch source = 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch source = 0003-Disable-d3d12-requiring-fxc.exe.patch sha256sums = SKIP - sha256sums = e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926 - sha256sums = 75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef - sha256sums = 7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1 + sha256sums = a27f544db7c19991ef1ba785b3faaa159f71e035c05009467155c59ffcee95d7 + sha256sums = da409a2ce953a69545cf27294d4de042bd66fda42c9442a0922192b452321a83 + sha256sums = 142eb48c75dcd6b707550bf978b8f4125ea8ef2333fc6dd6b50e7de43f6eecd3 pkgname = mingw-w64-qt5-declarative diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch index 222143990fdd..8df9d2973c8f 100644 --- a/0001-Ensure-static-plugins-are-exported.patch +++ b/0001-Ensure-static-plugins-are-exported.patch @@ -1,4 +1,4 @@ -From 0120487a66bef4b95249517d3d1d16d58e569f82 Mon Sep 17 00:00:00 2001 +From e6e8b269ace9857c3ca487201bbd3566cd6f39a6 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 23 Oct 2016 01:18:13 +0200 Subject: [PATCH 1/3] Ensure static plugins are exported @@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.35.1 +2.36.1 diff --git a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch index 463e93b4bd3c..1c9bf5a89010 100644 --- a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,4 +1,4 @@ -From b47eb78bd39a2db8eaebe9c21359c114ea66bf17 Mon Sep 17 00:00:00 2001 +From 7177e5dad754a9266d2dd8a6d4485e5fc35437d9 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 4 Feb 2017 01:59:59 +0100 Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.35.1 +2.36.1 diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch index 9022d877dd81..5eda25d3ad62 100644 --- a/0003-Disable-d3d12-requiring-fxc.exe.patch +++ b/0003-Disable-d3d12-requiring-fxc.exe.patch @@ -1,4 +1,4 @@ -From dc60d4a4ece8c116e8d03bf876d27eee2d67cf51 Mon Sep 17 00:00:00 2001 +From dfb96194f58dd199ade22c34fcdd9b93c53d4739 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 20 Nov 2020 18:32:31 +0100 Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe @@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644 qtConfig(openvg): SUBDIRS += openvg -- -2.35.1 +2.36.1 diff --git a/PKGBUILD b/PKGBUILD index fc164ee36f9f..fb7dd3c2a98a 100644..100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,16 +14,16 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.15.3 +pkgver=5.15.4 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=02105099301450c890e1caba977ef44efdc43da7 +_commit=51efb2ed2f071beda188270a23ac450fe4b318f7 _basever=$pkgver -pkgver+=+kde+r20 +pkgver+=+kde+r17 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' '0003-Disable-d3d12-requiring-fxc.exe.patch') sha256sums=('SKIP' - 'e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926' - '75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef' - '7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1') + 'a27f544db7c19991ef1ba785b3faaa159f71e035c05009467155c59ffcee95d7' + 'da409a2ce953a69545cf27294d4de042bd66fda42c9442a0922192b452321a83' + '142eb48c75dcd6b707550bf978b8f4125ea8ef2333fc6dd6b50e7de43f6eecd3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index 1555219b0a2c..cc8a8b73c14e 100644 --- a/PKGBUILD.sh.ep +++ b/PKGBUILD.sh.ep @@ -6,7 +6,7 @@ # Contributor: ohmyarch % end \ -pkgver=5.15.3 +pkgver=5.15.4 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt index d9d8a92dcd14..cc2ecb636e3a 100644 --- a/qtdeclarative-sha256.txt +++ b/qtdeclarative-sha256.txt @@ -1 +1 @@ -c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 +SKIP |