diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-Build-QML-dev-tools-as-shared-library.patch | 8 | ||||
| -rw-r--r-- | 0002-Ensure-static-plugins-are-exported.patch (renamed from 0003-Ensure-static-plugins-are-exported.patch) | 8 | ||||
| -rw-r--r-- | 0002-Fix-i686-segfaults-with-GCC-6.patch | 27 | ||||
| -rwxr-xr-x | PKGBUILD | 14 | ||||
| -rw-r--r-- | qt5-build-qmldevtools-as-shared-library.patch | 11 | ||||
| -rw-r--r-- | qt5-declarative-gcc6.patch | 12 |
7 files changed, 22 insertions, 76 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Dec 8 19:40:56 UTC 2016 +# Sat Dec 24 12:06:45 UTC 2016 pkgbase = mingw-w64-qt5-declarative pkgdesc = Classes for QML and JavaScript languages (mingw-w64) - pkgver = 5.7.0 - pkgrel = 6 + pkgver = 5.7.1 + pkgrel = 0 url = https://www.qt.io/ arch = i686 arch = x86_64 @@ -21,14 +21,12 @@ pkgbase = mingw-w64-qt5-declarative options = !strip options = !buildflags options = staticlibs - source = https://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-opensource-src-5.7.0.tar.xz + source = https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz source = 0001-Build-QML-dev-tools-as-shared-library.patch - source = 0002-Fix-i686-segfaults-with-GCC-6.patch - source = 0003-Ensure-static-plugins-are-exported.patch - md5sums = 0d9e461aa54dba4793253fa2eb501f9b - md5sums = 1d70fdbe290a1c0d2562cd975224c219 - md5sums = a11b3a584566e144a821c66f8ec53e26 - md5sums = 8d6740a6fad763f2c42c9c56022f8567 + source = 0002-Ensure-static-plugins-are-exported.patch + md5sums = e8940f4237bcedc67c8e9e753beb10d2 + md5sums = 3fae1f1d463a55606be17d89a2ae7cc9 + md5sums = a5f0f56fd42bb72f38aac6909c860d6d 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 296655ca4f21..b422a11486ac 100644 --- a/0001-Build-QML-dev-tools-as-shared-library.patch +++ b/0001-Build-QML-dev-tools-as-shared-library.patch @@ -1,14 +1,14 @@ -From 4fb746894af3a46afcc117aa48c20b0440e002b2 Mon Sep 17 00:00:00 2001 +From fe5ec96e7fafdc589ae3c0d69c02c2b8781e565e 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 +Subject: [PATCH 1/2] Build QML dev tools as shared library --- src/qmldevtools/qmldevtools.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro -index acd5c97..8b7b999 100644 +index acd5c9729..8b7b999d0 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -1,7 +1,7 @@ @@ -21,5 +21,5 @@ index acd5c97..8b7b999 100644 # Don't use pch because the auto-generated header refers to QtBootstrap, # which doesn't exist -- -2.10.1 +2.11.0 diff --git a/0003-Ensure-static-plugins-are-exported.patch b/0002-Ensure-static-plugins-are-exported.patch index 6e9533a71a4e..e78ebb82f15b 100644 --- a/0003-Ensure-static-plugins-are-exported.patch +++ b/0002-Ensure-static-plugins-are-exported.patch @@ -1,14 +1,14 @@ -From 1229bfe0d4468f929c224e19800d690372245af0 Mon Sep 17 00:00:00 2001 +From 361ef2263f38e5c605bc7fa1c1c35aabefd0935a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 23 Oct 2016 01:18:13 +0200 -Subject: [PATCH 3/3] Ensure static plugins are exported +Subject: [PATCH 2/2] Ensure static plugins are exported --- src/qml/Qt5QmlConfigExtras.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qml/Qt5QmlConfigExtras.cmake.in b/src/qml/Qt5QmlConfigExtras.cmake.in -index 9ddb988..9775d85 100644 +index 9ddb9885c..9775d85e0 100644 --- a/src/qml/Qt5QmlConfigExtras.cmake.in +++ b/src/qml/Qt5QmlConfigExtras.cmake.in @@ -1,4 +1,4 @@ @@ -18,5 +18,5 @@ index 9ddb988..9775d85 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.10.1 +2.11.0 diff --git a/0002-Fix-i686-segfaults-with-GCC-6.patch b/0002-Fix-i686-segfaults-with-GCC-6.patch deleted file mode 100644 index 1f4fc4f5e522..000000000000 --- a/0002-Fix-i686-segfaults-with-GCC-6.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cbfa366cae825ec25d1ce5799d64cfa6b79b1ac2 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 25 Sep 2016 21:25:03 +0200 -Subject: [PATCH 2/3] Fix i686 segfaults with GCC 6 - -- Fedora patch -- See: https://bugreports.qt.io/browse/QTBUG-52057 ---- - src/qml/qml.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qml/qml.pro b/src/qml/qml.pro -index f4862a1..651afa6 100644 ---- a/src/qml/qml.pro -+++ b/src/qml/qml.pro -@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") { - - greaterThan(QT_GCC_MAJOR_VERSION, 5) { - # Our code is bad. Temporary workaround. -- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse - } - - QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf --- -2.10.1 - @@ -12,8 +12,8 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.7.0 -pkgrel=6 +pkgver=5.7.1 +pkgrel=0 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt5-base') @@ -25,12 +25,10 @@ url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Build-QML-dev-tools-as-shared-library.patch' - '0002-Fix-i686-segfaults-with-GCC-6.patch' - '0003-Ensure-static-plugins-are-exported.patch') -md5sums=('0d9e461aa54dba4793253fa2eb501f9b' - '1d70fdbe290a1c0d2562cd975224c219' - 'a11b3a584566e144a821c66f8ec53e26' - '8d6740a6fad763f2c42c9c56022f8567') + '0002-Ensure-static-plugins-are-exported.patch') +md5sums=('e8940f4237bcedc67c8e9e753beb10d2' + '3fae1f1d463a55606be17d89a2ae7cc9' + 'a5f0f56fd42bb72f38aac6909c860d6d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-build-qmldevtools-as-shared-library.patch b/qt5-build-qmldevtools-as-shared-library.patch deleted file mode 100644 index a3910e9a526c..000000000000 --- a/qt5-build-qmldevtools-as-shared-library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qtdeclarative-opensource-src-5.1.0/src/qmldevtools/qmldevtools.pro.orig 2013-08-02 01:25:48.928675488 +0200 -+++ qtdeclarative-opensource-src-5.1.0/src/qmldevtools/qmldevtools.pro 2013-08-02 01:25:58.679832023 +0200 -@@ -1,7 +1,7 @@ - option(host_build) - TARGET = QtQmlDevTools - QT = core-private --CONFIG += static internal_module qmldevtools_build -+CONFIG += internal_module qmldevtools_build - - # Don't use pch because the auto-generated header refers to QtBootstrap, - # which doesn't exist diff --git a/qt5-declarative-gcc6.patch b/qt5-declarative-gcc6.patch deleted file mode 100644 index eaf677ea552c..000000000000 --- a/qt5-declarative-gcc6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro ---- qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 2016-06-02 08:43:24.509068141 -0500 -+++ qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro 2016-06-02 10:25:28.813766581 -0500 -@@ -21,7 +21,7 @@ exists("qqml_enable_gcov") { - - greaterThan(QT_GCC_MAJOR_VERSION, 5) { - # Our code is bad. Temporary workaround. -- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse - } - - QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf |