summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Ensure-static-plugins-are-exported.patch4
-rw-r--r--0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch4
-rw-r--r--0003-Disable-d3d12-requiring-fxc.exe.patch4
-rw-r--r--PKGBUILD14
-rw-r--r--qtdeclarative-sha256.txt1
6 files changed, 19 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a63e1fbf71f..d4db0584ce8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-declarative-static
pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
- pkgver = 5.15.14+kde+r28
+ pkgver = 5.15.15+kde+r25
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -19,13 +19,13 @@ pkgbase = mingw-w64-qt5-declarative-static
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=50c8def854806485d66aabcf6918e8b987032e55
+ source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=310c124dac82d711ab15309a9cb0b9d95db9ea8f
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 = 8d2459c5c63da631636503db4ee9bb30e55412d5f6fa6307b9460ac0fe0b72cb
- sha256sums = 5c4e4ce7ba93626feb3159282938065c752edd401819dccbe282bdfe4e8a7be0
- sha256sums = 6b3150f1c11b151275dc9b8e7b2b1187d47217653c2518b7be094e6726597586
- sha256sums = b828ce10d2249d3fa1f6086ee2dbeda0d78081468f8facf28355bdf693220633
+ sha256sums = SKIP
+ sha256sums = abda755efe3356b04a1f619a6dbc72a7d2e40e92c2247abb6f728af76fbde7f0
+ sha256sums = 0beadf093f9e260002ea72ed498e7797b1bc76dec15d602bb8137c02150f0663
+ sha256sums = 142e54b455aa4798d71cef1997ea42d9d1aef10a8434e33826a0aa316c31d2d8
pkgname = mingw-w64-qt5-declarative-static
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index 8bce75c84c78..334e1d93e347 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From ddf01ea69c0ed9cde736759418d007092c3601fc Mon Sep 17 00:00:00 2001
+From 3f6a0c13e08a5ba4e56e7151f1e6ab806d6f0fa8 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.45.1
+2.46.0
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 20ab25645516..b7b5b4584184 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 72eddb2d3aa8ea0b902028b9c2befb988a361a20 Mon Sep 17 00:00:00 2001
+From 954efa6a3f18df7c2bd5c3352ae99f18cccadd50 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.45.1
+2.46.0
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
index be804e71dcf5..3bdbd8e505fd 100644
--- a/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -1,4 +1,4 @@
-From 63bf8331c9970c171a1efbaf52e89b7888585961 Mon Sep 17 00:00:00 2001
+From 49725ed5454ea591a5a3a1c45e005e0a429aa529 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.45.1
+2.46.0
diff --git a/PKGBUILD b/PKGBUILD
index 1e24fc1b5cc5..33db948736bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,16 +14,16 @@
_qt_module=qtdeclarative
pkgname=mingw-w64-qt5-declarative-static
-pkgver=5.15.14
+pkgver=5.15.15
pkgrel=1
arch=('any')
pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
depends=('mingw-w64-qt5-base-static')
makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=50c8def854806485d66aabcf6918e8b987032e55
+_commit=310c124dac82d711ab15309a9cb0b9d95db9ea8f
_basever=${pkgver%%+*}
-pkgver+=+kde+r28
+pkgver+=+kde+r25
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
@@ -33,10 +33,10 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0001-Ensure-static-plugins-are-exported.patch'
'0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
'0003-Disable-d3d12-requiring-fxc.exe.patch')
-sha256sums=('8d2459c5c63da631636503db4ee9bb30e55412d5f6fa6307b9460ac0fe0b72cb'
- '5c4e4ce7ba93626feb3159282938065c752edd401819dccbe282bdfe4e8a7be0'
- '6b3150f1c11b151275dc9b8e7b2b1187d47217653c2518b7be094e6726597586'
- 'b828ce10d2249d3fa1f6086ee2dbeda0d78081468f8facf28355bdf693220633')
+sha256sums=('SKIP'
+ 'abda755efe3356b04a1f619a6dbc72a7d2e40e92c2247abb6f728af76fbde7f0'
+ '0beadf093f9e260002ea72ed498e7797b1bc76dec15d602bb8137c02150f0663'
+ '142e54b455aa4798d71cef1997ea42d9d1aef10a8434e33826a0aa316c31d2d8')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
deleted file mode 100644
index f966251ca1d7..000000000000
--- a/qtdeclarative-sha256.txt
+++ /dev/null
@@ -1 +0,0 @@
-8d2459c5c63da631636503db4ee9bb30e55412d5f6fa6307b9460ac0fe0b72cb