diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-Fix-linguist-macro.patch | 6 | ||||
| -rw-r--r-- | 0002-Prevent-linking-qhelpconverter-against-static-bearer.patch | 31 | ||||
| -rwxr-xr-x | PKGBUILD | 10 |
4 files changed, 11 insertions, 46 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-tools pkgdesc = A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64) - pkgver = 5.11.2 + pkgver = 5.12.0 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -20,12 +20,10 @@ pkgbase = mingw-w64-qt5-tools options = !strip options = !buildflags options = staticlibs - source = https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz + source = https://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz source = 0001-Fix-linguist-macro.patch - source = 0002-Prevent-linking-qhelpconverter-against-static-bearer.patch - sha256sums = f0e8332c771958b4aa373ac643d35e2fabb1a2dcdbaca756ebf3d1ace7c631b8 - sha256sums = 5f01a22de256ca8476fdb156f15f28c9199b7b18d4d3749c9d14cd1bcf104830 - sha256sums = 75f309093b05283d5bc5edd9c9e340feae05b8b6ebd7c9016b3a688ed419e5cb + sha256sums = 574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3 + sha256sums = eb660bed7b18fdbfc3922b0c5b2809ed9cb9a9e22c7b6aa89e8699cc20a2f2ec pkgname = mingw-w64-qt5-tools diff --git a/0001-Fix-linguist-macro.patch b/0001-Fix-linguist-macro.patch index 88821253afe3..3f05e743f749 100644 --- a/0001-Fix-linguist-macro.patch +++ b/0001-Fix-linguist-macro.patch @@ -1,7 +1,7 @@ -From d655bfeecb094524604864e9e265e55aaef037d3 Mon Sep 17 00:00:00 2001 +From a96b4b4b52f6458c5ca626c05cbe064349b6bb4a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 25 Sep 2016 21:44:42 +0200 -Subject: [PATCH 1/2] Fix linguist macro +Subject: [PATCH] Fix linguist macro - Prevent CMake appending extra 'Qt5::lupdate'/'Qt5::lrelease' to command line when invoking lupdate/lrelease @@ -38,5 +38,5 @@ index b9959730..75776e0e 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.19.0 +2.19.2 diff --git a/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch b/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch deleted file mode 100644 index 5dca01aa73c3..000000000000 --- a/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 00b29f3d19d3ed06cedf4cbec43a365025318025 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 15 Oct 2017 22:25:22 +0200 -Subject: [PATCH 2/2] Prevent linking qhelpconverter against static bearer - plugins - -This would lead to linker errors since Qt Network isn't used -by qhelpconverter and hence its dependencies aren't pulled. - -FIXME: -* Find out why qmake attempts to link against plugins - by default which are from a module which isn't even used. -* Fix pulling dependencies of static modules when only - the plugin, but not the related module itself, is used. ---- - src/assistant/qhelpconverter/qhelpconverter.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro -index d60aae7c..99943618 100644 ---- a/src/assistant/qhelpconverter/qhelpconverter.pro -+++ b/src/assistant/qhelpconverter/qhelpconverter.pro -@@ -1,4 +1,5 @@ - QT += help widgets -+QTPLUGIN.bearer=- - - SOURCES += conversionwizard.cpp \ - inputpage.cpp \ --- -2.19.0 - @@ -16,7 +16,7 @@ _qt_module=qttools pkgname="mingw-w64-qt5-tools" -pkgver=5.11.2 +pkgver=5.12.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" @@ -28,11 +28,9 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" - '0001-Fix-linguist-macro.patch' - '0002-Prevent-linking-qhelpconverter-against-static-bearer.patch') -sha256sums=('f0e8332c771958b4aa373ac643d35e2fabb1a2dcdbaca756ebf3d1ace7c631b8' - '5f01a22de256ca8476fdb156f15f28c9199b7b18d4d3749c9d14cd1bcf104830' - '75f309093b05283d5bc5edd9c9e340feae05b8b6ebd7c9016b3a688ed419e5cb') + '0001-Fix-linguist-macro.patch') +sha256sums=('574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3' + 'eb660bed7b18fdbfc3922b0c5b2809ed9cb9a9e22c7b6aa89e8699cc20a2f2ec') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' # can not use static MySQL plugin because mariadb-connector-c comes with its own pthread implementation |