From 0dcce4f7b31a4eaf2d44003be664a58d855edbd5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 23 Mar 2016 21:01:33 +0100 Subject: [PATCH] updated version of mingw-w64-qt5-* to 5.6.0 --- qt5-3d/mingw-w64/PKGBUILD | 8 +- qt5-activeqt/mingw-w64/PKGBUILD | 6 +- qt5-base/mingw-w64-opengl/PKGBUILD | 12 +- qt5-base/mingw-w64-static/PKGBUILD | 12 +- qt5-base/mingw-w64/PKGBUILD | 14 +- ...erge-static-and-shared-library-trees.patch | 26 +- qt5-base/mingw-w64/qtbase-1-fixes.patch | 247 ++++++++++++++++++ qt5-canvas3d/mingw-w64/PKGBUILD | 53 ++++ qt5-connectivity/mingw-w64/PKGBUILD | 53 ++++ qt5-declarative/mingw-w64/PKGBUILD | 8 +- qt5-graphicaleffects/mingw-w64/PKGBUILD | 6 +- qt5-imageformats/mingw-w64/PKGBUILD | 6 +- qt5-location/mingw-w64/PKGBUILD | 6 +- qt5-multimedia/mingw-w64/PKGBUILD | 6 +- qt5-quickcontrols/mingw-w64/PKGBUILD | 6 +- qt5-quickcontrols2/mingw-w64/PKGBUILD | 43 +++ qt5-script/mingw-w64/PKGBUILD | 6 +- qt5-sensors/mingw-w64/PKGBUILD | 6 +- qt5-serialport/mingw-w64/PKGBUILD | 14 +- qt5-svg/mingw-w64/PKGBUILD | 6 +- qt5-tools/mingw-w64/PKGBUILD | 12 +- qt5-translations/mingw-w64/PKGBUILD | 6 +- qt5-webchannel/mingw-w64/PKGBUILD | 6 +- qt5-webengine/mingw-w64-git/PKGBUILD | 2 +- qt5-webengine/mingw-w64/PKGBUILD | 4 +- qt5-webkit/mingw-w64/PKGBUILD | 11 +- qt5-websockets/mingw-w64/PKGBUILD | 6 +- qt5-webview/default/PKGBUILD | 4 +- qt5-webview/git/PKGBUILD | 2 +- qt5-webview/mingw-w64-git/PKGBUILD | 2 +- qt5-winextras/mingw-w64/PKGBUILD | 8 +- qt5-xmlpatterns/mingw-w64/PKGBUILD | 6 +- 32 files changed, 493 insertions(+), 120 deletions(-) create mode 100644 qt5-base/mingw-w64/qtbase-1-fixes.patch create mode 100644 qt5-canvas3d/mingw-w64/PKGBUILD create mode 100644 qt5-connectivity/mingw-w64/PKGBUILD create mode 100644 qt5-quickcontrols2/mingw-w64/PKGBUILD diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index ee40327d..cbb7be7d 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -3,18 +3,18 @@ _qt_module=qt3d pkgname="mingw-w64-qt5-3d" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" -depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative' 'mingw-w64-qt5-quick1') +depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') 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") -md5sums=('872dfbe166154c2e0e89317ab23d2cd6') +md5sums=('fba04c921d53fc3ec6794e2a2a75ca60') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index 4422a765..059c069e 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtactiveqt pkgname=mingw-w64-qt5-activeqt -pkgver=5.5.1 -pkgrel=2 +pkgver=5.6.0 +pkgrel=1 arch=(any) pkgdesc="ActiveX integration framework (mingw-w64)" depends=(mingw-w64-qt5-base) @@ -18,7 +18,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub "qt5-activeqt-fix-compilation.patch" "qtactiveqt-fix-build.patch" "qtactiveqt-win64.patch") -md5sums=('be5e0a79decc87d02c574348d9663e6a' +md5sums=('791e40d20fed235b42029aa54d6f0634' '86c63b9808b0c8c7a8c2203bee73c42b' '7a7ba436452aa56613b3fbb15684e094' '1264d0274586aec14f96a978b416b048') diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD index fa5c4563..8fe406a3 100644 --- a/qt5-base/mingw-w64-opengl/PKGBUILD +++ b/qt5-base/mingw-w64-opengl/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: jellysheep pkgname=mingw-w64-qt5-base-opengl -pkgver=5.5.1 -pkgrel=2 +pkgver=5.6.0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) url="https://www.qt.io/" @@ -56,7 +56,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub "qt5-disable-angle-opengl-testcode.patch" "qt5-fix-QSemaphore-problem.patch" "a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff") -md5sums=('687e2b122fa2c3390b5e20a166d38038' +md5sums=('d6b6cfd333c22829c6c85fc52ceed019' 'f51eb2b176b10af943831d33925c1251' 'bab00ccc19d888997f323c80354a7c3f' 'ec25d1ff4033383cd5d2414d8189c228' @@ -168,7 +168,7 @@ prepare() { # Build host libs with system zlib. This patch cannot be upstreamed as-is # due to the other host-libs patches. patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch - + # Workaround a compatibility issue because we are using an older version of ANGLE in Fedora # Upgrading the mingw-angleproject package isn't possible for now because mingw-qt5-qtwebkit doesn't support the latest ANGLE yet.. # @@ -248,7 +248,7 @@ build() { -sysconfdir /usr/${_arch}/etc \ -translationdir /usr/${_arch}/share/qt/translations \ -device-option CROSS_COMPILE=${_arch}-" - + # fix include directory of dbus qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)" @@ -353,7 +353,7 @@ package() { if ! isStatic; then strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver} fi - + # keeping prl files for base build since qbs seems to need them. if isStatic; then rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index ab84c7dd..50d5a32c 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: jellysheep pkgname=mingw-w64-qt5-base-static -pkgver=5.5.1 -pkgrel=2 +pkgver=5.6.0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) url="https://www.qt.io/" @@ -56,7 +56,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub "qt5-disable-angle-opengl-testcode.patch" "qt5-fix-QSemaphore-problem.patch" "a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff") -md5sums=('687e2b122fa2c3390b5e20a166d38038' +md5sums=('d6b6cfd333c22829c6c85fc52ceed019' 'f51eb2b176b10af943831d33925c1251' 'bab00ccc19d888997f323c80354a7c3f' 'ec25d1ff4033383cd5d2414d8189c228' @@ -168,7 +168,7 @@ prepare() { # Build host libs with system zlib. This patch cannot be upstreamed as-is # due to the other host-libs patches. patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch - + # Workaround a compatibility issue because we are using an older version of ANGLE in Fedora # Upgrading the mingw-angleproject package isn't possible for now because mingw-qt5-qtwebkit doesn't support the latest ANGLE yet.. # @@ -248,7 +248,7 @@ build() { -sysconfdir /usr/${_arch}/etc \ -translationdir /usr/${_arch}/share/qt/translations \ -device-option CROSS_COMPILE=${_arch}-" - + # fix include directory of dbus qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)" @@ -353,7 +353,7 @@ package() { if ! isStatic; then strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver} fi - + # keeping prl files for base build since qbs seems to need them. if isStatic; then rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index c8809529..1976bfc5 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: jellysheep pkgname=mingw-w64-qt5-base -pkgver=5.5.1 -pkgrel=2 +pkgver=5.6.0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) url="https://www.qt.io/" @@ -56,8 +56,8 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub "qt5-disable-angle-opengl-testcode.patch" "qt5-fix-QSemaphore-problem.patch" "a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff") -md5sums=('687e2b122fa2c3390b5e20a166d38038' - 'f51eb2b176b10af943831d33925c1251' +md5sums=('d6b6cfd333c22829c6c85fc52ceed019' + '085faf5796ab9e8c7edde416ba631150' 'bab00ccc19d888997f323c80354a7c3f' 'ec25d1ff4033383cd5d2414d8189c228' 'bc99c4cc6998295d76f37ed681c20d47' @@ -168,7 +168,7 @@ prepare() { # Build host libs with system zlib. This patch cannot be upstreamed as-is # due to the other host-libs patches. patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch - + # Workaround a compatibility issue because we are using an older version of ANGLE in Fedora # Upgrading the mingw-angleproject package isn't possible for now because mingw-qt5-qtwebkit doesn't support the latest ANGLE yet.. # @@ -248,7 +248,7 @@ build() { -sysconfdir /usr/${_arch}/etc \ -translationdir /usr/${_arch}/share/qt/translations \ -device-option CROSS_COMPILE=${_arch}-" - + # fix include directory of dbus qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)" @@ -354,7 +354,7 @@ package() { if ! isStatic; then strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver} fi - + # keeping prl files for base build since qbs seems to need them. if isStatic; then rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl diff --git a/qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch b/qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch index 130e6400..021a4404 100644 --- a/qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch +++ b/qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch @@ -1,29 +1,7 @@ ---- mkspecs/features/qt_functions.prf.orig 2012-09-05 23:30:01.612735271 +0200 -+++ mkspecs/features/qt_functions.prf 2012-09-05 23:32:40.030869399 +0200 -@@ -134,6 +134,19 @@ - } - - $$2 += $$LINKAGE -+ -+ win32:CONFIG(static) { -+ isEqual(MODULE_NAME, Qt5Core) { -+ $$2 += $$QMAKE_LIBS_CORE -+ } else:isEqual(MODULE_NAME, Qt5Gui) { -+ $$2 += $$QMAKE_LIBS_GUI -+ } else:isEqual(MODULE_NAME, Qt5Network) { -+ $$2 += $$QMAKE_LIBS_NETWORK -+ } else:isEqual(MODULE_NAME, Qt5OpenGL) { -+ $$2 += $$QMAKE_LIBS_OPENGL -+ } -+ } -+ - export($$2) - - !isEmpty(QMAKE_LSB) { --- mkspecs/features/default_post.prf.orig 2012-09-05 23:28:56.827501401 +0200 +++ mkspecs/features/default_post.prf 2012-09-05 23:29:31.617923080 +0200 @@ -47,3 +50,8 @@ - + QMAKE_INCDIR += $$QMAKE_INCDIR_POST QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST + @@ -36,7 +14,7 @@ @@ -6193,6 +6193,12 @@ } QT_CONFIG += $QT_CONFIG - + +contains(CONFIG, static) { + CONFIG -= shared + QT_CONFIG += static jpeg gif diff --git a/qt5-base/mingw-w64/qtbase-1-fixes.patch b/qt5-base/mingw-w64/qtbase-1-fixes.patch new file mode 100644 index 00000000..e7541357 --- /dev/null +++ b/qt5-base/mingw-w64/qtbase-1-fixes.patch @@ -0,0 +1,247 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 6 Aug 2015 23:35:08 +0200 +Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE + specific) + +Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 + +diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri +index 39280de..e152b0d 100644 +--- a/src/3rdparty/freetype_dependency.pri ++++ b/src/3rdparty/freetype_dependency.pri +@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { + } else:contains(QT_CONFIG, system-freetype) { + # pull in the proper freetype2 include directory + include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) ++ win32:shared:LIBS_PRIVATE += -lfreetype + } +-- +2.5.0 + + +From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sat, 21 Jun 2014 13:12:49 +0200 +Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) + +Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 + +diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro +index 32edd6e..a7f2c28 100644 +--- a/config.tests/unix/harfbuzz/harfbuzz.pro ++++ b/config.tests/unix/harfbuzz/harfbuzz.pro +@@ -1,3 +1,4 @@ + SOURCES = harfbuzz.cpp + CONFIG -= qt dylib +-LIBS += -lharfbuzz ++CONFIG += link_pkgconfig ++PKGCONFIG += harfbuzz +diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri +index 7443368..c24e684 100644 +--- a/src/3rdparty/harfbuzz_dependency.pri ++++ b/src/3rdparty/harfbuzz_dependency.pri +@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { + INCLUDEPATH += $$PWD/harfbuzz-ng/include + LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() + } else:contains(QT_CONFIG, system-harfbuzz) { +- LIBS_PRIVATE += -lharfbuzz ++ CONFIG += link_pkgconfig ++ PKGCONFIG += harfbuzz + } +-- +2.5.0 + + +From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 8 Dec 2014 14:15:12 +0100 +Subject: [PATCH 3/8] fix oci config test on windows + +Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 + +diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro +index 3ffda1d..39b6f3759 100644 +--- a/config.tests/unix/oci/oci.pro ++++ b/config.tests/unix/oci/oci.pro +@@ -1,3 +1,3 @@ + SOURCES = oci.cpp + CONFIG -= qt dylib +-LIBS += -lclntsh ++!win32:LIBS += -lclntsh +-- +2.5.0 + + +From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 6 Aug 2015 13:24:56 +0200 +Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows + +Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa + +diff --git a/configure b/configure +index 7651e29..4a4b478 100755 +--- a/configure ++++ b/configure +@@ -4575,7 +4575,7 @@ fi + [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" + + # check IPC support +-if ! compileTest unix/ipc_sysv "ipc_sysv" ; then ++if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then + # SYSV IPC is not supported - check POSIX IPC + if compileTest unix/ipc_posix "ipc_posix" ; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" +-- +2.5.0 + + +From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Tue, 6 Oct 2015 09:53:20 +0200 +Subject: [PATCH 5/8] fix building mysql driver under mingw + +Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 + +diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri +index 3cfb614..8b7063f 100644 +--- a/src/sql/drivers/mysql/qsql_mysql.pri ++++ b/src/sql/drivers/mysql/qsql_mysql.pri +@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp + QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL + LIBS += $$QT_LFLAGS_MYSQL + +-unix { ++if (unix|mingw) { + isEmpty(QT_LFLAGS_MYSQL) { + !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { + use_libmysqlclient_r:LIBS += -lmysqlclient_r +-- +2.5.0 + + +From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 18 Oct 2015 23:11:28 +0300 +Subject: [PATCH 6/8] configure: fix log corruption with option -v + +This bug occurs if ./configure is called with -v on systems on +which fd proc entries point to the files/devices they are open +on instead of being magic nodes which would basically dup() the +actual fds (e.g., Linux). + +In this case, the command "tee $tty" appends to /dev/stderr, which +may be already opened by the parent process. This breaks the log file. + +Normally, the log file starts with + + This is the Qt Open Source Edition. + ... + +but with `-v` flag it would start with output of awkprog and maybe +some zero bytes. Zero bytes are observed on Debian Wheezy. + + DEFAULT_INCDIRS=... + ... + ^@^@^@^@^@^@^@^@^@^@^@^@... + Done running configuration tests. + ... + +To fix this problem, the output of `...` is saved to a variable, and +then eval'd and echo'd (if -v). + +This solution was found by Tony Theodore. +https://github.com/mxe/mxe/issues/938#issuecomment-149770348 + +Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77 +Reviewed-by: Oswald Buddenhagen +Reviewed-by: Thiago Macieira +(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36) + +diff --git a/configure b/configure +index 4a4b478..a5c0fd5 100755 +--- a/configure ++++ b/configure +@@ -3639,10 +3639,9 @@ END { + print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n"; + }' + +-unset tty +-[ "$OPT_VERBOSE" = "yes" ] && tty=/dev/stderr +-eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`" +-unset tty ++awkprog_result=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog"` ++eval "$awkprog_result" ++[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result" + + echo "Done running configuration tests." + +-- +2.5.0 + + +From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Wed, 26 Aug 2015 12:45:43 +0100 +Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets + +Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) +for header-only modules when building Qt5 statically. + +Source: https://git.io/vzWJz +See also: https://github.com/mxe/mxe/issues/1185 + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index d2358ca..6b1dc95 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + endif() + !!ENDIF + ++!!IF equals(TEMPLATE, aux) ++ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) ++!!ELSE + !!IF !isEmpty(CMAKE_STATIC_TYPE) + add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ELSE +-!!IF equals(TEMPLATE, aux) +- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) +-!!ELSE + add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) + !!ENDIF + !!ENDIF +-- +2.5.0 + + +From e74803bac8aa2fd2106f678b2b11584fdb582bc3 Mon Sep 17 00:00:00 2001 +From: Boris Pek +Date: Wed, 24 Feb 2016 19:39:46 +0300 +Subject: [PATCH 8/8] Fix ar error: `u' modifier ignored since `D' is the + default (see `U') + + +diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf +index 61963c7..25cf750 100644 +--- a/mkspecs/win32-g++/qmake.conf ++++ b/mkspecs/win32-g++/qmake.conf +@@ -104,7 +104,7 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2 + QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain + + QMAKE_IDL = midl +-QMAKE_LIB = $${CROSS_COMPILE}ar -ru ++QMAKE_LIB = $${CROSS_COMPILE}ar -rc + QMAKE_RC = $${CROSS_COMPILE}windres + + QMAKE_STRIP = $${CROSS_COMPILE}strip +-- +2.5.0 + diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD new file mode 100644 index 00000000..4caa3c08 --- /dev/null +++ b/qt5-canvas3d/mingw-w64/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Martchus + +_qt_module=qtcanvas3d +pkgname="mingw-w64-qt5-canvas3d" +pkgver=5.6.0 +pkgrel=1 +arch=('any') +pkgdesc="A JavaScript 3D rendering API for Qt Quick (mingw-w64)" +depends=('mingw-w64-qt5-declarative') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +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") +md5sums=('73ca1057b64bc99299d2e55c1a35f469') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD new file mode 100644 index 00000000..21a4d2c5 --- /dev/null +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Martchus + +_qt_module=connectivity +pkgname="mingw-w64-qt5-connectivity" +pkgver=5.6.0 +pkgrel=1 +arch=('any') +pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +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") +md5sums=('38589e8f50dbf835db4fdb5da32a7114') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index 8ccbc8a9..fd46b5f2 100755 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=(any) pkgdesc="Classes for QML and JavaScript languages (mingw-w64)" depends=(mingw-w64-qt5-base) @@ -16,14 +16,14 @@ 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" "qt5-build-qmldevtools-as-shared-library.patch") -md5sums=('b7997c9d8df4ea60945229883f9ce8ed' +md5sums=('5eb41d468d88a70574ddc5237b68f7e8' '6c445ba7713b69d90f52bb2242303853') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/${_pkgfqn}" - patch -p1 -i "${srcdir}"/qt5-build-qmldevtools-as-shared-library.patch + patch -p1 -i "${srcdir}"/qt5-build-qmldevtools-as-shared-library.patch } build() { diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index b81b5d86..d09dc570 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qtgraphicaleffects pkgname="mingw-w64-qt5-graphicaleffects" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" depends=('mingw-w64-qt5-declarative') @@ -15,7 +15,7 @@ license=('LGPL') 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") -md5sums=('2fb95cecb2ab0542cb0b5847c65600c3') +md5sums=('6132524e7dbceb3ea634200d4d7cf235') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index 297eba6c..dca2918f 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qtimageformats pkgname="mingw-w64-qt5-imageformats" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" depends=('mingw-w64-qt5-base') @@ -15,7 +15,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('f935b629184200b155a3048ee67c81ab') +md5sums=('bb57c1db37e89a47f3513859ef04ae97') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index 0f6c1548..718ec8ea 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtlocation pkgname=mingw-w64-qt5-location -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=(any) pkgdesc="Provides access to position, satellite and area monitoring classes (mingw-w64)" depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative) @@ -15,7 +15,7 @@ license=("custom, FDL, GPL3, LGPL") 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") -md5sums=('9e0c0ad76f520ba89da730b8ff601cc2') +md5sums=('eee764d337854424a30f0356ba04ae6b') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index 2caffcd0..7bcb4d37 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -2,8 +2,8 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=(any) pkgdesc="Classes for audio, video, radio and camera functionality (mingw-w64)" depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative) @@ -16,7 +16,7 @@ _pkgfqn="${_qt_module}-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" "qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch" "qtmultimedia-dont-use-case-sensitive-headers.patch") -md5sums=('244baff13a02ebc697e5b5e2290088d0' +md5sums=('c66e500f6d5be693231718cccf997c30' 'c21ff895212a17dc0a748aeadb67601d' '7ecd5ee2735440472fae4b7d7a32879e') diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index 60c72930..dc06c317 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qtquickcontrols pkgname="mingw-w64-qt5-quickcontrols" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" depends=('mingw-w64-qt5-declarative') @@ -15,7 +15,7 @@ license=('LGPL') 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") -md5sums=('01ace647bda006b61200f61ebe6ef93b') +md5sums=('f1af1f72ee2860c683a05558d261eece') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD new file mode 100644 index 00000000..0ab5dffa --- /dev/null +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtquickcontrols2 +pkgname="mingw-w64-qt5-quickcontrols2" +pkgver=5.6.0 +pkgrel=1 +arch=('any') +pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" +depends=('mingw-w64-qt5-declarative') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('LGPL') +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") +md5sums=('122dd81824cecaa7e327c003469d0df8') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="${pkgdir}" install + popd + + find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \; + done +} diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index 5ed02a43..694d4772 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qtscript pkgname="mingw-w64-qt5-script" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" depends=('mingw-w64-qt5-base') @@ -15,7 +15,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('7abbe43ec935004a9312387b4aa6b07f') +md5sums=('779e6083f0adc075b132c2706241e491') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index 9fc064ac..2d19e603 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=(any) pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative) @@ -16,7 +16,7 @@ groups=(mingw-w64-qt mingw-w64-qt5) 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") -md5sums=('25250d66b0f21d41711dbf8648fe21e6') +md5sums=('1c9a2958e108e8393dbb4427831df647') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index 55cf128b..c7388cf3 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtserialport pkgname="mingw-w64-qt5-serialport" -pkgver=5.5.1 -pkgrel=2.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" depends=('mingw-w64-qt5-base') @@ -14,13 +14,13 @@ license=('LGPL') url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/$pkgver/submodules/qtserialport-opensource-src-$pkgver.tar.xz") -md5sums=('1065424ad9be54f7635a9a50f35bc187') +md5sums=('a9dfcfbf88034ada5b75f0be59030a37') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" build() { cd "${srcdir}/${_pkgfqn}" - + # don't build examples or tests. sed -i 's/ examples tests//' qtserialport.pro @@ -29,7 +29,7 @@ build() { ${_arch}-qmake-qt5 ../${_qt_module}.pro make popd - + #mkdir -p static-${_arch}/include/QtSerialPort && pushd static-${_arch} #${_arch}-qmake-qt5 ../${_qt_module}.pro CONFIG+=static #make @@ -44,9 +44,9 @@ package() { pushd build-${_arch} make INSTALL_ROOT="${pkgdir}" install - + popd - + #pushd static-${_arch} #make INSTALL_ROOT="${pkgdir}" install #popd diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index 08bfa7f4..4c6f6d20 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtsvg pkgname="mingw-w64-qt5-svg" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" depends=('mingw-w64-qt5-base') @@ -14,7 +14,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('505fb8ba483818e53f759edbf735456e') +md5sums=('ab86dafed92185a2f98190fc37afceab') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD index 73d7ab59..81fc7cc9 100755 --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qttools pkgname="mingw-w64-qt5-tools" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=('mingw-w64-qt5-base') @@ -15,7 +15,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('535ff9df9d83e9bde08ee3913b751d07') +md5sums=('5dd6204df7c81c684607f2fc8a5d351a') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" @@ -27,10 +27,10 @@ build() mkdir -p build-${_arch} && pushd build-${_arch} ${_arch}-qmake-qt5 ../${_qt_module}.pro - + # Something is messed up with Qt5Bootstrap make qmake_all - + find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \; find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5QmlDevTools|/usr/lib/libstdc++.so.6 -L/usr/${_arch}/lib -lQt5QmlDevTools|g" {} \; make @@ -62,7 +62,7 @@ package() { for tool in lconvert lupdate lrelease; do ln -s ../${_arch}/lib/qt/bin/${tool} "${pkgdir}/usr/bin/${_arch}-$tool-qt5" done - + ${_arch}-strip --strip-all "${pkgdir}/usr/${_arch}/bin/"*.exe ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index c2f3f44c..4a861a52 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -4,8 +4,8 @@ _qt_module=qttranslations pkgname="mingw-w64-qt5-translations" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" depends=('mingw-w64-qt5-base') @@ -15,7 +15,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('1f89d53fe759db123b4b6d9de9d9e8c9') +md5sums=('62b3b6191f902466d97e09df48c27534') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index d1820114..c253e08e 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -2,8 +2,8 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' depends=('mingw-w64-qt5-declarative') @@ -14,7 +14,7 @@ url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -md5sums=('f2e15d52c1b7732c2afbfb7e843091cf') +md5sums=('1ba293366dcf67f8b8181be2682ee81a') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { diff --git a/qt5-webengine/mingw-w64-git/PKGBUILD b/qt5-webengine/mingw-w64-git/PKGBUILD index fac4c3e2..cbe85705 100644 --- a/qt5-webengine/mingw-w64-git/PKGBUILD +++ b/qt5-webengine/mingw-w64-git/PKGBUILD @@ -4,7 +4,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine-git -pkgver=5.5.1 +pkgver=5.6.0 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64, git version)' diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index 06013d2f..33dfe412 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine -pkgver=5.5.1 +pkgver=5.6.0 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' @@ -17,7 +17,7 @@ _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch') -md5sums=('2a548bde706e8639cdec2cbe31d85545' +md5sums=('a8be84d642a78724d84b27c20adee14c' '27e0f474f66f05f3911c71621b24636d') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD index 3a7bc689..6b09a5c0 100644 --- a/qt5-webkit/mingw-w64/PKGBUILD +++ b/qt5-webkit/mingw-w64/PKGBUILD @@ -4,12 +4,11 @@ _qt_module=qtwebkit pkgname=mingw-w64-qt5-webkit -pkgver=5.5.1 -pkgrel=2 +pkgver=5.6.0 +pkgrel=1 arch=(any) pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)" -depends=('mingw-w64-qt5-base' - 'mingw-w64-qt5-declarative' +depends=('mingw-w64-qt5-declarative' 'mingw-w64-qt5-sensors' 'mingw-w64-qt5-location' 'mingw-w64-qt5-multimedia' @@ -28,7 +27,7 @@ license=("custom, FDL, GPL3, LGPL") url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) -source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +source=("https://download.qt.io/community_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" qt5-qtwebkit-dont-depend-on-icu.patch qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch qt5-qtwebkit-fix-compatibility-with-latest-angle.patch @@ -39,7 +38,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub qtwebkit-opensource-src-5.0.1-debuginfo.patch revert-qt4-unicode-removal.patch webkit-commit-151422.patch) -md5sums=('681328edb539b8fa3a273b38c90b3e31' +md5sums=('eba1382587add1c9b1293a532e7dd161' 'ce7d257e2b5b94fe3affd98f52d99d09' 'ac574de962545d6a9e975b4db63c3e09' '4ad37c7d4dda8e77bb0a25c671f79adc' diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 099cfc2a..b2fc5148 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtwebsockets pkgname="mingw-w64-qt5-websockets" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" depends=('mingw-w64-qt5-base') @@ -14,7 +14,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('cd4083945b76b075bc67dcc38e411d04') +md5sums=('266d9b8b0fca6839a57ed2b17f4a8984') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-webview/default/PKGBUILD b/qt5-webview/default/PKGBUILD index cb6cee4e..928cd504 100644 --- a/qt5-webview/default/PKGBUILD +++ b/qt5-webview/default/PKGBUILD @@ -2,11 +2,11 @@ _qt_module=qtwebview pkgname=qt5-webview -pkgver=5.5.1 +pkgver=5.6.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides a way to display web content in an application by using native APIs' -depends=('qt5-quick1' 'qt5-quickcontrols' 'qt5-webengine') +depends=('qt5-quickcontrols' 'qt5-webengine') makedepends=('git') provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) diff --git a/qt5-webview/git/PKGBUILD b/qt5-webview/git/PKGBUILD index 7e2ca954..b18188ad 100644 --- a/qt5-webview/git/PKGBUILD +++ b/qt5-webview/git/PKGBUILD @@ -6,7 +6,7 @@ pkgver=107.ea82d77 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides a way to display web content in an application by using native APIs (git version)' -depends=('qt5-quick1' 'qt5-quickcontrols' 'qt5-webengine') +depends=('qt5-quickcontrols' 'qt5-webengine') makedepends=('git') provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) diff --git a/qt5-webview/mingw-w64-git/PKGBUILD b/qt5-webview/mingw-w64-git/PKGBUILD index 84144744..65d3008c 100644 --- a/qt5-webview/mingw-w64-git/PKGBUILD +++ b/qt5-webview/mingw-w64-git/PKGBUILD @@ -8,7 +8,7 @@ pkgver=107.ea82d77 pkgrel=1 arch=('any') pkgdesc='Provides a way to display web content in an application by using native APIs (mingw-w64, git version)' -depends=('mingw-w64-qt5-declarative' 'mingw-w64-qt5-quickcontrols' 'mingw-w64-qtwebengine') +depends=('mingw-w64-qt5-quickcontrols' 'mingw-w64-qtwebengine') makedepends=('mingw-w64-gcc' 'git') provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index a222be16..2165651b 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtwinextras pkgname="mingw-w64-qt5-winextras" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') @@ -14,7 +14,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('7bfdeb968681e75108dd1c661b6f42c1') +md5sums=('4e40054a0ec59061d0da2fbc23fc69f1') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" @@ -42,7 +42,7 @@ package() { popd done - + # .prl files aren't interesting for us find "${pkgdir}" -name "*.prl" -delete } diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index a9b3f34f..0f7f018a 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -3,8 +3,8 @@ _qt_module=qtxmlpatterns pkgname="mingw-w64-qt5-xmlpatterns" -pkgver=5.5.1 -pkgrel=1.1 +pkgver=5.6.0 +pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" depends=('mingw-w64-qt5-base') @@ -14,7 +14,7 @@ license=('GPL3' 'LGPL') 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") -md5sums=('17b9ee5031262b5b875ce0e1045e6bdc') +md5sums=('b511b49ab76a1da11b25802861d5688c') _architectures="i686-w64-mingw32 x86_64-w64-mingw32"