diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch | 4 | ||||
| -rw-r--r-- | 0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
4 files changed, 16 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-activeqt pkgdesc = ActiveX integration framework (mingw-w64) - pkgver = 5.13.0 + pkgver = 5.13.1 pkgrel = 1 url = https://www.qt.io/ arch = any @@ -19,12 +19,12 @@ pkgbase = mingw-w64-qt5-activeqt options = !strip options = !buildflags options = staticlibs - source = https://download.qt.io/official_releases/qt/5.13/5.13.0/submodules/qtactiveqt-everywhere-src-5.13.0.tar.xz + source = https://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtactiveqt-everywhere-src-5.13.1.tar.xz source = 0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch source = 0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch - sha256sums = 7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323 - sha256sums = c08c642b497d551f67563342c9177006c80cb61530403ff809199f6f75e96053 - sha256sums = bcf5e261b5f65680d2d6cdff5b0f64d1d36852317852783572b1ce43e04e9cdd + sha256sums = d2ad456c4b354fa08dc6b42894453ba18db52b09ba7b7921c3f6225772099495 + sha256sums = a83a9eb308c0903de7f0f2af95c38884f89cad1e2406fac5bc19e7d83d9da651 + sha256sums = cd72e8b9680647d1ac7f5fe80b7b946c91800e528020bc5e8f5874ee9cf239a4 pkgname = mingw-w64-qt5-activeqt diff --git a/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch b/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch index 178731bcb4ea..58660e167295 100644 --- a/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch +++ b/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch @@ -1,4 +1,4 @@ -From 7d95a5d73ed3b5f1165629f8d762e934b22851da Mon Sep 17 00:00:00 2001 +From 4607785ee76a460088292dc985a10b340a45e0df Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 17:17:46 +0200 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc @@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644 SOURCES = main.cpp -- -2.22.0 +2.23.0 diff --git a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index 62f37b5cdf37..3ea7a2952c05 100644 --- a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch +++ b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch @@ -1,4 +1,4 @@ -From c21f38e09b62405086eb4099f8706a7d5debc0af Mon Sep 17 00:00:00 2001 +From 4ad7c39e29eb89539abafd7de47176530181b9be Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 17:21:08 +0200 Subject: [PATCH 2/2] Handle win64 in dumpcpp and @@ -52,5 +52,5 @@ index eb6f70a..d9d1bdf 100644 } -- -2.22.0 +2.23.0 @@ -9,7 +9,7 @@ _qt_module=qtactiveqt pkgname=mingw-w64-qt5-activeqt -pkgver=5.13.0 +pkgver=5.13.1 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" @@ -23,9 +23,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch' '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch') -sha256sums=('7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323' - 'c08c642b497d551f67563342c9177006c80cb61530403ff809199f6f75e96053' - 'bcf5e261b5f65680d2d6cdff5b0f64d1d36852317852783572b1ce43e04e9cdd') +sha256sums=('d2ad456c4b354fa08dc6b42894453ba18db52b09ba7b7921c3f6225772099495' + 'a83a9eb308c0903de7f0f2af95c38884f89cad1e2406fac5bc19e7d83d9da651' + 'cd72e8b9680647d1ac7f5fe80b7b946c91800e528020bc5e8f5874ee9cf239a4') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -87,6 +87,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ |