summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--0001-Build-QML-dev-tools-as-shared-library.patch4
-rw-r--r--0002-Ensure-static-plugins-are-exported.patch4
-rw-r--r--0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch4
-rwxr-xr-xPKGBUILD12
5 files changed, 19 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a211e0908e1..23bdd1f67ca6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Jul 6 21:13:09 UTC 2017
+# Mon Oct 16 17:36:25 UTC 2017
pkgbase = mingw-w64-qt5-declarative
pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
- pkgver = 5.9.1
+ pkgver = 5.9.2
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -21,14 +21,14 @@ pkgbase = mingw-w64-qt5-declarative
options = !strip
options = !buildflags
options = staticlibs
- source = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz
source = 0001-Build-QML-dev-tools-as-shared-library.patch
source = 0002-Ensure-static-plugins-are-exported.patch
source = 0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
- sha256sums = d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff
- sha256sums = 8fa21b0a800c998cd6789652646280b4d91bf8733b92886ffcf98afe05709e84
- sha256sums = d93731901616f494b5474cf78ec938c4c7e9e79a088457275b97f1f65cc82fe3
- sha256sums = bb3e8cf9783d20e4ac3b9a5a16bfbfebcc27702765ea42848c6dd2dcfc00da7c
+ sha256sums = 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08
+ sha256sums = 0a9cca3ab4a5cded2a5b13f398cce19cbe8e84bb8c1d99bc3f3bb7715b1f4cb0
+ sha256sums = c3fa3cb98077531c373c8232c5b3b03e548aefbfecc11dd3a03cbf4ec3100838
+ sha256sums = d865f272436b47e027e9ad380fff1c134fe0396e446e7601cb5a59445aba79c4
pkgname = mingw-w64-qt5-declarative
diff --git a/0001-Build-QML-dev-tools-as-shared-library.patch b/0001-Build-QML-dev-tools-as-shared-library.patch
index 3cace021fec2..946ca5a444e3 100644
--- a/0001-Build-QML-dev-tools-as-shared-library.patch
+++ b/0001-Build-QML-dev-tools-as-shared-library.patch
@@ -1,4 +1,4 @@
-From 46e617adb37f99121639ee8047b203dea3857bd8 Mon Sep 17 00:00:00 2001
+From 4924f5854a96eda470551762f90b64102de2a9cf Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 21:24:15 +0200
Subject: [PATCH 1/3] Build QML dev tools as shared library
@@ -23,5 +23,5 @@ index a21988b91..fc5c4d05d 100644
MODULE_INCNAME = QtQml
--
-2.13.2
+2.14.2
diff --git a/0002-Ensure-static-plugins-are-exported.patch b/0002-Ensure-static-plugins-are-exported.patch
index 1f199c061074..b6076725ea1e 100644
--- a/0002-Ensure-static-plugins-are-exported.patch
+++ b/0002-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From d974e620811a07888c0205d5ca7940c6d1f9be5b Mon Sep 17 00:00:00 2001
+From 0c0ffb778f79e2345dd6f0bbcdae8a374a34848c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 23 Oct 2016 01:18:13 +0200
Subject: [PATCH 2/3] Ensure static plugins are exported
@@ -18,5 +18,5 @@ index 9ddb9885c..9775d85e0 100644
foreach(_other_plugin ${_qt5qml_other_plugins})
include(${_other_plugin} OPTIONAL)
--
-2.13.2
+2.14.2
diff --git a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index d1bd0b185dd8..3c2624ffc4d1 100644
--- a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,4 +1,4 @@
-From 6a34e383816f0ef74241980e7d712fd51974b40d Mon Sep 17 00:00:00 2001
+From dca2e22e736445ae2acf463236bb66e60a072632 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 4 Feb 2017 01:59:59 +0100
Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build
@@ -33,5 +33,5 @@ index 0e195994b..8aa451e9d 100644
# define QML_PARSER_EXPORT
# elif defined(QT_BUILD_QML_LIB)
--
-2.13.2
+2.14.2
diff --git a/PKGBUILD b/PKGBUILD
index e37539e2b3c7..583db4700ce9 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
_qt_module=qtdeclarative
pkgname=mingw-w64-qt5-declarative
-pkgver=5.9.1
+pkgver=5.9.2
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
@@ -27,16 +27,16 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
'0001-Build-QML-dev-tools-as-shared-library.patch'
'0002-Ensure-static-plugins-are-exported.patch'
'0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff'
- '8fa21b0a800c998cd6789652646280b4d91bf8733b92886ffcf98afe05709e84'
- 'd93731901616f494b5474cf78ec938c4c7e9e79a088457275b97f1f65cc82fe3'
- 'bb3e8cf9783d20e4ac3b9a5a16bfbfebcc27702765ea42848c6dd2dcfc00da7c')
+sha256sums=('0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08'
+ '0a9cca3ab4a5cded2a5b13f398cce19cbe8e84bb8c1d99bc3f3bb7715b1f4cb0'
+ 'c3fa3cb98077531c373c8232c5b3b03e548aefbfecc11dd3a03cbf4ec3100838'
+ 'd865f272436b47e027e9ad380fff1c134fe0396e446e7601cb5a59445aba79c4')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \
makedepends+=('mingw-w64-qt5-base-static') \
optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
- _configurations+=('CONFIG+=static')
+ _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
[[ $NO_SHARED_LIBS ]] || \
_configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')