From 595179f8bc0c91ee018b566fec59809fc4fb5829 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 4 Feb 2016 00:33:39 +0100 Subject: [PATCH] minor improvements for mingw-w64-qt5-* packages --- pkgbuilds.pro | 8 + qt5-3d/mingw-w64/PKGBUILD | 4 +- qt5-activeqt/mingw-w64/PKGBUILD | 4 +- qt5-base/mingw-w64-opengl/PKGBUILD | 4 +- qt5-base/mingw-w64-static/PKGBUILD | 4 +- qt5-base/mingw-w64/PKGBUILD | 4 +- qt5-declarative/mingw-w64/PKGBUILD | 4 +- qt5-graphicaleffects/mingw-w64/PKGBUILD | 4 +- qt5-imageformats/mingw-w64/PKGBUILD | 4 +- qt5-location/mingw-w64/PKGBUILD | 4 +- qt5-multimedia/mingw-w64/PKGBUILD | 4 +- qt5-quick1/mingw-w64/PKGBUILD | 4 +- qt5-quickcontrols/mingw-w64/PKGBUILD | 4 +- qt5-script/mingw-w64/PKGBUILD | 4 +- qt5-sensors/mingw-w64/PKGBUILD | 4 +- qt5-serialport/mingw-w64/PKGBUILD | 4 +- qt5-svg/mingw-w64/PKGBUILD | 4 +- qt5-tools/mingw-w64/PKGBUILD | 4 +- qt5-translations/mingw-w64/PKGBUILD | 4 +- qt5-webchannel/mingw-w64/PKGBUILD | 4 +- qt5-webengine/mingw-w64-git/PKGBUILD | 2 +- qt5-webengine/mingw-w64/PKGBUILD | 4 +- qt5-webkit/mingw-w64/PKGBUILD | 56 ++++-- .../qt5-angleproject-dont-use-winflex.patch | 11 ++ .../qt5-qtwebkit-commit-5742b32.patch | 181 ++++++++++++++++++ .../qt5-qtwebkit-commit-b8c97e702.patch | 30 +++ ...qtwebkit-disable-3d-graphics-support.patch | 22 +++ .../qt5-qtwebkit-dont-depend-on-icu.patch | 6 +- ...-fix-compatibility-with-latest-angle.patch | 6 +- .../qt5-qtwebkit-use-correct-icu-libs.patch | 11 ++ .../qt5-qtwebkit-use-linux-shell.patch | 11 ++ .../mingw-w64/webkit-commit-142567.patch | 57 ++++++ qt5-websockets/mingw-w64/PKGBUILD | 4 +- qt5-webview/default/PKGBUILD | 2 +- qt5-webview/git/PKGBUILD | 2 +- qt5-webview/mingw-w64-git/PKGBUILD | 2 +- qt5-winextras/mingw-w64/PKGBUILD | 4 +- qt5-xmlpatterns/mingw-w64/PKGBUILD | 4 +- 38 files changed, 427 insertions(+), 72 deletions(-) create mode 100644 qt5-webkit/mingw-w64/qt5-angleproject-dont-use-winflex.patch create mode 100644 qt5-webkit/mingw-w64/qt5-qtwebkit-commit-5742b32.patch create mode 100644 qt5-webkit/mingw-w64/qt5-qtwebkit-commit-b8c97e702.patch create mode 100644 qt5-webkit/mingw-w64/qt5-qtwebkit-disable-3d-graphics-support.patch create mode 100644 qt5-webkit/mingw-w64/qt5-qtwebkit-use-correct-icu-libs.patch create mode 100644 qt5-webkit/mingw-w64/qt5-qtwebkit-use-linux-shell.patch create mode 100644 qt5-webkit/mingw-w64/webkit-commit-142567.patch diff --git a/pkgbuilds.pro b/pkgbuilds.pro index 3d65268f..7987f0c0 100644 --- a/pkgbuilds.pro +++ b/pkgbuilds.pro @@ -189,13 +189,21 @@ OTHER_FILES += \ qt5-tools/mingw-w64/PKGBUILD \ qt5-translations/mingw-w64/PKGBUILD \ qt5-webkit/mingw-w64/PKGBUILD \ + qt5-webkit/mingw-w64/qt5-angleproject-dont-use-winflex.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-angle-build-fix.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-commit-5742b32.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-commit-b8c97e702.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-disable-3d-graphics-support.patch \ qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch \ qt5-webkit/mingw-w64/qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch \ qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-use-correct-icu-libs.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-use-linux-shell.patch \ qt5-webkit/mingw-w64/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch \ qt5-webkit/mingw-w64/qtwebkit-dont-use-bundled-angle-libraries.patch \ qt5-webkit/mingw-w64/qtwebkit-opensource-src-5.0.1-debuginfo.patch \ qt5-webkit/mingw-w64/revert-qt4-unicode-removal.patch \ + qt5-webkit/mingw-w64/webkit-commit-142567.patch \ qt5-webkit/mingw-w64/webkit-commit-151422.patch \ qt5-websockets/mingw-w64/PKGBUILD \ qt5-winextras/mingw-w64/PKGBUILD \ diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index e314e0f8..1d96b774 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative' 'mingw-w64-qt5-quick1' makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('872dfbe166154c2e0e89317ab23d2cd6') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index 1c899858..1f6646c3 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ makedepends=(mingw-w64-{gcc,headers-git,crt-git,winpthreads-git} python) options=(!strip !buildflags staticlibs) groups=(mingw-w64-qt mingw-w64-qt5) license=("custom, FDL, GPL3, LGPL") -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" "qt5-activeqt-fix-compilation.patch" "qtactiveqt-fix-build.patch" "qtactiveqt-win64.patch") diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD index ceef588f..07bf17e2 100644 --- a/qt5-base/mingw-w64-opengl/PKGBUILD +++ b/qt5-base/mingw-w64-opengl/PKGBUILD @@ -8,7 +8,7 @@ pkgver=5.5.1 pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) -url="http://qt-project.org" +url="https://www.qt.io/" license=("custom, FDL, GPL3, LGPL") depends=( mingw-w64-crt @@ -35,7 +35,7 @@ makedepends=(mingw-w64-gcc mingw-w64-pkg-config) options=(!strip !buildflags staticlibs) _pkgfqn="qtbase-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" "qt5-merge-static-and-shared-library-trees.patch" "add-angle-support.patch" "use-external-angle-library.patch" diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index 913f0cd7..77518a12 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -8,7 +8,7 @@ pkgver=5.5.1 pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) -url="http://qt-project.org" +url="https://www.qt.io/" license=("custom, FDL, GPL3, LGPL") depends=( mingw-w64-crt @@ -35,7 +35,7 @@ makedepends=(mingw-w64-gcc mingw-w64-pkg-config) options=(!strip !buildflags staticlibs) _pkgfqn="qtbase-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" "qt5-merge-static-and-shared-library-trees.patch" "add-angle-support.patch" "use-external-angle-library.patch" diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 69729feb..219067fa 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ pkgver=5.5.1 pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) -url="http://qt-project.org" +url="https://www.qt.io/" license=("custom, FDL, GPL3, LGPL") depends=( mingw-w64-crt @@ -35,7 +35,7 @@ makedepends=(mingw-w64-gcc mingw-w64-pkg-config) options=(!strip !buildflags staticlibs) _pkgfqn="qtbase-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" "qt5-merge-static-and-shared-library-trees.patch" "add-angle-support.patch" "use-external-angle-library.patch" diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index d056cdb5..4eb9a32c 100755 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ makedepends=(mingw-w64-gcc python) options=(!strip !buildflags staticlibs) groups=(mingw-w64-qt mingw-w64-qt5) license=("custom, FDL, GPL3, LGPL") -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +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' '6c445ba7713b69d90f52bb2242303853') diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index 0b844f93..d2e1066b 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-$pkgver" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('2fb95cecb2ab0542cb0b5847c65600c3') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index d3d061b8..bb9c6768 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('f935b629184200b155a3048ee67c81ab') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index 9b858cc7..7e574b84 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ makedepends=(mingw-w64-gcc mingw-w64-qt5-quick1) options=(!strip !buildflags staticlibs) groups=(mingw-w64-qt mingw-w64-qt5) license=("custom, FDL, GPL3, LGPL") -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('9e0c0ad76f520ba89da730b8ff601cc2') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index 6a9d8be1..f1095f38 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ makedepends=(mingw-w64-gcc) options=(!strip !buildflags staticlibs) groups=(mingw-w64-qt mingw-w64-qt5) license=("custom, FDL, GPL3, LGPL") -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +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' diff --git a/qt5-quick1/mingw-w64/PKGBUILD b/qt5-quick1/mingw-w64/PKGBUILD index f21ff5e7..02bc241d 100644 --- a/qt5-quick1/mingw-w64/PKGBUILD +++ b/qt5-quick1/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-script' 'mingw-w64-qt5-tools') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('46a61a405844cbe88a754127422f6b6d') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index a09e2971..8dafc4b4 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('LGPL') -url="http://qt-project.org/wiki/QtSerialPort" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-$pkgver" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('01ace647bda006b61200f61ebe6ef93b') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index bbf9179c..8c47f648 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('7abbe43ec935004a9312387b4aa6b07f') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index 79e4f19a..1da302f4 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -13,9 +13,9 @@ makedepends=(mingw-w64-gcc) options=(!strip !buildflags staticlibs) license=("custom, FDL, GPL3, LGPL") groups=(mingw-w64-qt mingw-w64-qt5) -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('25250d66b0f21d41711dbf8648fe21e6') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index cd918379..f7b92f7d 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('LGPL') -url="http://qt-project.org/wiki/QtSerialPort" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-$pkgver" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/$pkgver/submodules/qtserialport-opensource-src-$pkgver.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/$pkgver/submodules/qtserialport-opensource-src-$pkgver.tar.xz") md5sums=('1065424ad9be54f7635a9a50f35bc187') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index 41a30d75..e5f42886 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('505fb8ba483818e53f759edbf735456e') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD index db52fdfe..2a960458 100755 --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('535ff9df9d83e9bde08ee3913b751d07') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index 12bfad06..680b6d33 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -12,9 +12,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('1f89d53fe759db123b4b6d9de9d9e8c9') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index ac39b0eb..cf6daee9 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -10,10 +10,10 @@ depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('custom' 'FDL' 'GPL3' 'LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('f2e15d52c1b7732c2afbfb7e843091cf') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-webengine/mingw-w64-git/PKGBUILD b/qt5-webengine/mingw-w64-git/PKGBUILD index 27fb5541..fac4c3e2 100644 --- a/qt5-webengine/mingw-w64-git/PKGBUILD +++ b/qt5-webengine/mingw-w64-git/PKGBUILD @@ -14,7 +14,7 @@ provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) options=('!strip' '!buildflags' 'staticlibs') license=('custom' 'FDL' 'GPL3' 'LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev) diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index 851bf875..06013d2f 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -12,10 +12,10 @@ depends=('mingw-w64-qt5-webchannel' 'mingw-w64-qt5-location') makedepends=('mingw-w64-gcc' 'git' 'python2' 'gperf' 'ruby' 'mingw-w64-pkg-config') options=('!strip' '!buildflags' 'staticlibs') license=('custom' 'FDL' 'GPL3' 'LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +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' '27e0f474f66f05f3911c71621b24636d') diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD index 4c4c6e83..c8356d0b 100644 --- a/qt5-webkit/mingw-w64/PKGBUILD +++ b/qt5-webkit/mingw-w64/PKGBUILD @@ -24,32 +24,51 @@ depends=('mingw-w64-qt5-base' makedepends=('mingw-w64-gcc' 'python' 'gperf' 'ruby' 'mingw-w64-pkg-config') options=('!strip' '!buildflags' 'staticlibs') license=("custom, FDL, GPL3, LGPL") -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" - 'qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch' - 'qtwebkit-dont-use-bundled-angle-libraries.patch' - 'qt5-qtwebkit-dont-depend-on-icu.patch' - 'revert-qt4-unicode-removal.patch' - 'qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch' - 'qtwebkit-opensource-src-5.0.1-debuginfo.patch' - 'webkit-commit-151422.patch' - 'qt5-qtwebkit-fix-compatibility-with-latest-angle.patch') +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + qt5-angleproject-dont-use-winflex.patch + qt5-qtwebkit-angle-build-fix.patch + qt5-qtwebkit-commit-5742b32.patch + qt5-qtwebkit-commit-b8c97e702.patch + qt5-qtwebkit-disable-3d-graphics-support.patch + qt5-qtwebkit-dont-depend-on-icu.patch + qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch + qt5-qtwebkit-fix-compatibility-with-latest-angle.patch + qt5-qtwebkit-use-correct-icu-libs.patch + qt5-qtwebkit-use-linux-shell.patch + qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch + qtwebkit-dont-use-bundled-angle-libraries.patch + qtwebkit-opensource-src-5.0.1-debuginfo.patch + revert-qt4-unicode-removal.patch + webkit-commit-142567.patch + webkit-commit-151422.patch) md5sums=('681328edb539b8fa3a273b38c90b3e31' + '445ada3000f0cc1279204b7a3efc3b4c' + 'bc1943fb276964f710b4e9f5f08bb2ec' + '645c05f212fcd9f310798f7eacd9abd4' + '87458f3ebb61bf598e4fce10ab1ccbb7' + 'b227653519ee0ea5d388bd58a21b6d66' + 'ce7d257e2b5b94fe3affd98f52d99d09' 'ac574de962545d6a9e975b4db63c3e09' + '7038206bfef2aea594f10af3bda90220' + '228f28df2b10e417a325176f7878ebe1' + '680fe925113911f6b6c36946d7294cbd' + '18b21fd8e9517f48db7748544d2aa92f' 'f452210683386f9c28f04d7dea0ecfc7' - '069f86d834bcecb7fe0937b7539d28af' - '4e374836f26853b4d82be0e87aa584a5' - '8b60ddebf01ee04a0e1180e98cdd3d52' '6aba6468efafb64943887079e258b799' - 'c36fe581e0f3b61cef19415782b257ca' - '2ef87f4b6588e92a925f42c3b9595379') + '4e374836f26853b4d82be0e87aa584a5' + 'eaac9af299b50c2f03f4c322123e6e62' + 'c36fe581e0f3b61cef19415782b257ca') + _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/${_pkgfqn}" + # note: all patches are from http://pkgs.fedoraproject.org/git/rpms/mingw-qt5-qtwebkit.git + # The ICU libraries used for cross-compilation are named exactly the same as their native Linux counterpart #patch -p0 -b -i ../qt5-qtwebkit-use-correct-icu-libs.patch @@ -93,6 +112,9 @@ prepare() { # Fix compatibility issue when using the latest ANGLE patch -p1 -b -i ../qt5-qtwebkit-fix-compatibility-with-latest-angle.patch + # Use linux shell commands instead of windows cmd commands + patch -p1 -b -i ../qt5-qtwebkit-use-linux-shell.patch + # Make sure the bundled copy of the ANGLE libraries isn't used rm -rf Source/ThirdParty/ANGLE } @@ -101,6 +123,10 @@ build() { unset PKG_CONFIG_PATH cd "${srcdir}/${_pkgfqn}" for _arch in ${_architectures}; do + # Since Source/ThirdParty/ANGLE has been removed include path for + # system library must be set + export CPATH=/usr/$_arch/include + mkdir -p build-${_arch} && pushd build-${_arch} ${_arch}-qmake-qt5 QMAKE_CXXFLAGS+=-Wno-c++0x-compat ../WebKit.pro make diff --git a/qt5-webkit/mingw-w64/qt5-angleproject-dont-use-winflex.patch b/qt5-webkit/mingw-w64/qt5-angleproject-dont-use-winflex.patch new file mode 100644 index 00000000..98c3ac1d --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-angleproject-dont-use-winflex.patch @@ -0,0 +1,11 @@ +--- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/default_pre.prf.orig 2013-01-04 22:00:45.442588676 +0100 ++++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/default_pre.prf 2013-01-04 22:01:10.427771469 +0100 +@@ -98,7 +98,7 @@ + # A newer version of flex is required on Windows. At the moment the only + # one that appears to provide binaries and is not cygwin is winflex. + FLEX = flex +-win32: FLEX = win_flex ++win32:!win32-g++*: FLEX = win_flex + + BIN_EXTENSION = + win32: BIN_EXTENSION = .exe diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-commit-5742b32.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-commit-5742b32.patch new file mode 100644 index 00000000..e1554479 --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-commit-5742b32.patch @@ -0,0 +1,181 @@ +From 5742b3288b2494d03149f439182a189ba9330a47 Mon Sep 17 00:00:00 2001 +From: Pierre Rossi +Date: Mon, 3 Dec 2012 15:16:56 +0100 +Subject: [PATCH] [Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets + +https://bugs.webkit.org/show_bug.cgi?id=103844 + +Patch by Pierre Rossi on 2012-12-03 +Reviewed by Simon Hausmann. + +Let's follow the common practice and have one export macro per library. +We can't rely on BUILDING_WEBKIT anymore in that case, so we use the +qmake defines instead. + +* Api/qwebkitglobal.h: Updated the import/export logic. +* WidgetApi/qgraphicswebview.h: s/QWEBKIT/QWEBKITWIDGETS/ +* WidgetApi/qwebframe.h: Ditto. +* WidgetApi/qwebinspector.h: Ditto. +* WidgetApi/qwebpage.h: Ditto. +* WidgetApi/qwebview.h: Ditto. +* WidgetSupport/InitWebKitQt.cpp: +(WebKit::initializeWebKitWidgets): use QWEBKITWIDGETS_EXPORT. +* WidgetSupport/InitWebKitQt.h: +(WebKit): Ditto. + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136394 268f45cc-cd09-0410-ab3c-d52691b4dbfc +Change-Id: I0030f2f17cddd66aedf24f29323579174e838303 +Reviewed-by: Pierre Rossi +--- + Source/WebKit/qt/Api/qwebkitglobal.h | 8 +++++++- + Source/WebKit/qt/ChangeLog | 22 ++++++++++++++++++++++ + Source/WebKit/qt/WidgetApi/qgraphicswebview.h | 2 +- + Source/WebKit/qt/WidgetApi/qwebframe.h | 4 ++-- + Source/WebKit/qt/WidgetApi/qwebinspector.h | 2 +- + Source/WebKit/qt/WidgetApi/qwebpage.h | 4 ++-- + Source/WebKit/qt/WidgetApi/qwebview.h | 2 +- + Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp | 2 +- + Source/WebKit/qt/WidgetSupport/InitWebKitQt.h | 4 +++- + 9 files changed, 40 insertions(+), 10 deletions(-) + +diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h +index 1d61182..5b866be 100644 +--- a/Source/WebKit/qt/Api/qwebkitglobal.h ++++ b/Source/WebKit/qt/Api/qwebkitglobal.h +@@ -27,13 +27,19 @@ + #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) + + #ifndef QT_STATIC +-# if defined(BUILDING_WEBKIT) ++# if defined(QT_BUILD_WEBKIT_LIB) + # define QWEBKIT_EXPORT Q_DECL_EXPORT + # else + # define QWEBKIT_EXPORT Q_DECL_IMPORT + # endif ++# if defined(QT_BUILD_WEBKITWIDGETS_LIB) ++# define QWEBKITWIDGETS_EXPORT Q_DECL_EXPORT ++# else ++# define QWEBKITWIDGETS_EXPORT Q_DECL_IMPORT ++# endif + #else + # define QWEBKIT_EXPORT ++# define QWEBKIT_EXPORT + #endif + + QWEBKIT_EXPORT QString qWebKitVersion(); +diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h +index 5c5b666..c9e61f7 100644 +--- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h ++++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h +@@ -37,7 +37,7 @@ class QWebSettings; + + class QGraphicsWebViewPrivate; + +-class QWEBKIT_EXPORT QGraphicsWebView : public QGraphicsWidget { ++class QWEBKITWIDGETS_EXPORT QGraphicsWebView : public QGraphicsWidget { + Q_OBJECT + + Q_PROPERTY(QString title READ title NOTIFY titleChanged) +diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h +index f3676fe..481d019 100644 +--- a/Source/WebKit/qt/WidgetApi/qwebframe.h ++++ b/Source/WebKit/qt/WidgetApi/qwebframe.h +@@ -63,7 +63,7 @@ class QWebFrameData; + class QWebHitTestResultPrivate; + class QWebFrame; + +-class QWEBKIT_EXPORT QWebHitTestResult { ++class QWEBKITWIDGETS_EXPORT QWebHitTestResult { + public: + QWebHitTestResult(); + QWebHitTestResult(const QWebHitTestResult &other); +@@ -104,7 +104,7 @@ private: + friend class QWebPage; + }; + +-class QWEBKIT_EXPORT QWebFrame : public QObject { ++class QWEBKITWIDGETS_EXPORT QWebFrame : public QObject { + Q_OBJECT + Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false) + Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) +diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.h b/Source/WebKit/qt/WidgetApi/qwebinspector.h +index 3733129..c333fa2 100644 +--- a/Source/WebKit/qt/WidgetApi/qwebinspector.h ++++ b/Source/WebKit/qt/WidgetApi/qwebinspector.h +@@ -27,7 +27,7 @@ + + class QWebInspectorPrivate; + +-class QWEBKIT_EXPORT QWebInspector : public QWidget { ++class QWEBKITWIDGETS_EXPORT QWebInspector : public QWidget { + Q_OBJECT + public: + QWebInspector(QWidget* parent = 0); +diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h +index 5624b49..6aa303b 100644 +--- a/Source/WebKit/qt/WidgetApi/qwebpage.h ++++ b/Source/WebKit/qt/WidgetApi/qwebpage.h +@@ -65,7 +65,7 @@ namespace WebCore { + struct FrameLoadRequest; + } + +-class QWEBKIT_EXPORT QWebPage : public QObject { ++class QWEBKITWIDGETS_EXPORT QWebPage : public QObject { + Q_OBJECT + + Q_PROPERTY(bool modified READ isModified) +@@ -213,7 +213,7 @@ public: + Geolocation + }; + +- class QWEBKIT_EXPORT ViewportAttributes { ++ class QWEBKITWIDGETS_EXPORT ViewportAttributes { + public: + ViewportAttributes(); + ViewportAttributes(const QWebPage::ViewportAttributes& other); +diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h +index 701fb36..43439df 100644 +--- a/Source/WebKit/qt/WidgetApi/qwebview.h ++++ b/Source/WebKit/qt/WidgetApi/qwebview.h +@@ -38,7 +38,7 @@ class QWebPage; + class QWebViewPrivate; + class QWebNetworkRequest; + +-class QWEBKIT_EXPORT QWebView : public QWidget { ++class QWEBKITWIDGETS_EXPORT QWebView : public QWidget { + Q_OBJECT + Q_PROPERTY(QString title READ title) + Q_PROPERTY(QUrl url READ url WRITE setUrl) +diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp +index 7188603..8d26375 100644 +--- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp ++++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp +@@ -30,7 +30,7 @@ + + namespace WebKit { + +-Q_DECL_EXPORT void initializeWebKitWidgets() ++QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets() + { + static bool initialized = false; + if (initialized) +diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h +index fbb2d18..772c960 100644 +--- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h ++++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h +@@ -21,9 +21,11 @@ + #ifndef InitWebKitQt_h + #define InitWebKitQt_h + ++#include ++ + namespace WebKit { + +-Q_DECL_EXPORT void initializeWebKitWidgets(); ++QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets(); + + } + #endif +-- +1.7.1 + diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-commit-b8c97e702.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-commit-b8c97e702.patch new file mode 100644 index 00000000..f0efb8ef --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-commit-b8c97e702.patch @@ -0,0 +1,30 @@ +From b8c97e702b56c60fdbd7f72add58a18a9743bf48 Mon Sep 17 00:00:00 2001 +From: Pierre Rossi +Date: Tue, 4 Dec 2012 14:27:24 +0100 +Subject: [PATCH] [Qt] Yet another unreviewed speculative windows build fix. + +WebKit2 relies on the QWEBKIT_EXPORT macro from WebKit1 as well. + +* Api/qwebkitglobal.h: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136495 268f45cc-cd09-0410-ab3c-d52691b4dbfc +Change-Id: Iadd377b766f7282688abaa6c51c94d486dbb8edd +Reviewed-by: Simon Hausmann +--- + Source/WebKit/qt/Api/qwebkitglobal.h | 2 +- + Source/WebKit/qt/ChangeLog | 8 ++++++++ + 2 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h +index 6ee30ca..44e4d45 100644 +--- a/Source/WebKit/qt/Api/qwebkitglobal.h ++++ b/Source/WebKit/qt/Api/qwebkitglobal.h +@@ -27,7 +27,7 @@ + #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) + + #ifndef QT_STATIC +-# if defined(QT_BUILD_WEBKIT_LIB) ++# if !defined(QT_BUILD_WEBKITWIDGETS_LIB) && defined(BUILDING_WEBKIT) + # define QWEBKIT_EXPORT Q_DECL_EXPORT + # else + # define QWEBKIT_EXPORT Q_DECL_IMPORT diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-disable-3d-graphics-support.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-disable-3d-graphics-support.patch new file mode 100644 index 00000000..59011b97 --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-disable-3d-graphics-support.patch @@ -0,0 +1,22 @@ +--- Tools/qmake/mkspecs/features/features.prf.orig 2013-01-04 22:56:13.465133221 +0100 ++++ Tools/qmake/mkspecs/features/features.prf 2013-01-04 22:56:39.458319734 +0100 +@@ -81,7 +81,7 @@ + # Disable on Windows CE for now, as ANGLE won't compile. + !wince*:contains(QT_CONFIG, opengl) { + # On Windows we require GLES2/EGL through ANGLE. +- !win32|contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_3d_graphics ++ #!win32|contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_3d_graphics + } + + # Temporarily disable FTPDIR on Windows CE (missing functions from time.h) +--- Tools/Scripts/webkitperl/FeatureList.pm.orig 2013-01-04 23:07:11.449912367 +0100 ++++ Tools/Scripts/webkitperl/FeatureList.pm 2013-01-04 23:07:21.360989539 +0100 +@@ -149,7 +149,7 @@ + + my @features = ( + { option => "3d-rendering", desc => "Toggle 3D Rendering support", +- define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isQt()), value => \$threeDRenderingSupport }, ++ define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit()), value => \$threeDRenderingSupport }, + + { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support", + define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport }, diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch index 1226704b..1a72e9a9 100644 --- a/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch @@ -1,6 +1,6 @@ --- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/configure.prf.orig 2013-01-04 18:56:36.785550268 +0100 +++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/configure.prf 2013-01-04 18:58:20.047373664 +0100 -@@ -115,9 +115,9 @@ +@@ -120,9 +120,9 @@ } # Sanity checks that would prevent us from building the whole project altogether. @@ -10,8 +10,8 @@ +# !android:!mac:!config_icu { +# addReasonForSkippingBuild("ICU is required.") +# } - production_build:blackberry|qnx { - addReasonForSkippingBuild("Build not supported on BB10/QNX yet.") + production_build:blackberry { + addReasonForSkippingBuild("Build not supported on BB10 yet.") } --- qtwebkit-opensource-src-5.0.0/Source/WTF/wtf/Platform.h.orig 2013-01-04 19:28:53.735934784 +0100 +++ qtwebkit-opensource-src-5.0.0/Source/WTF/wtf/Platform.h 2013-01-04 19:28:13.856641177 +0100 diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch index 2a12fca2..2330ee5b 100644 --- a/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch @@ -1,11 +1,9 @@ --- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h.orig 2014-12-29 22:48:34.532357391 +0100 +++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2014-12-29 23:01:26.254334924 +0100 -@@ -34,14 +34,15 @@ - #elif PLATFORM(WIN) +@@ -35,13 +35,14 @@ #include "GLSLANG/ShaderLang.h" #else --#include "ShaderLang.h" -+#include "GLSLANG/ShaderLang.h" + #include "ShaderLang.h" +#include "angle_gl.h" #endif diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-use-correct-icu-libs.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-use-correct-icu-libs.patch new file mode 100644 index 00000000..e686d247 --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-use-correct-icu-libs.patch @@ -0,0 +1,11 @@ +--- qtwebkit-opensource-src-5.4.1/Source/WTF/WTF.pri.icu 2015-03-23 19:21:26.013831236 +0100 ++++ qtwebkit-opensource-src-5.4.1/Source/WTF/WTF.pri 2015-03-23 19:22:46.668582720 +0100 +@@ -14,7 +14,7 @@ + INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH + LIBS += -licucore + } else:!use?(wchar_unicode): { +- win32 { ++ win32:!mingw { + CONFIG(static, static|shared) { + CONFIG(debug, debug|release) { + LIBS += -lsicuind -lsicuucd -lsicudtd diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-use-linux-shell.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-use-linux-shell.patch new file mode 100644 index 00000000..0312d6cd --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-use-linux-shell.patch @@ -0,0 +1,11 @@ +--- qtwebkit-opensource-src-5.5.0/Tools/qmake/mkspecs/features/default_pre.prf.orig 2015-08-08 00:28:12.099889263 +0200 ++++ qtwebkit-opensource-src-5.5.0/Tools/qmake/mkspecs/features/default_pre.prf 2015-08-08 00:28:34.329126204 +0200 +@@ -37,7 +37,7 @@ + } + + # Try to detect if we're running under Windows cmd.exe or not +-win32:isEmpty(MINGW_IN_SHELL): CONFIG += win_cmd_shell ++win32:!mingw:isEmpty(MINGW_IN_SHELL): CONFIG += win_cmd_shell + + # Default location of generated sources + GENERATED_SOURCES_DESTDIR = generated diff --git a/qt5-webkit/mingw-w64/webkit-commit-142567.patch b/qt5-webkit/mingw-w64/webkit-commit-142567.patch new file mode 100644 index 00000000..af8c3e8f --- /dev/null +++ b/qt5-webkit/mingw-w64/webkit-commit-142567.patch @@ -0,0 +1,57 @@ +Index: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp +=================================================================== +--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 136430) ++++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 142567) +@@ -33,7 +33,14 @@ + namespace WebCore { + +-inline static int getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo) +-{ +- int value = -1; ++// Temporary typedef to support an incompatible change in the ANGLE API. ++#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108 ++typedef int ANGLEGetInfoType; ++#else ++typedef size_t ANGLEGetInfoType; ++#endif ++ ++inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo) ++{ ++ ANGLEGetInfoType value = 0; + ShGetInfo(compiler, shaderInfo, &value); + return value; +@@ -56,13 +63,11 @@ + } + +- int numSymbols = getValidationResultValue(compiler, symbolType); +- if (numSymbols < 0) +- return false; +- +- int maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType); ++ ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType); ++ ++ ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType); + if (maxNameLength <= 1) + return false; + +- int maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH); ++ ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH); + if (maxMappedNameLength <= 1) + return false; +@@ -72,7 +77,7 @@ + Vector mappedNameBuffer(maxMappedNameLength); + +- for (int i = 0; i < numSymbols; ++i) { ++ for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) { + ANGLEShaderSymbol symbol; +- int nameLength = -1; ++ ANGLEGetInfoType nameLength = 0; + switch (symbolType) { + case SH_ACTIVE_ATTRIBUTES: +@@ -88,5 +93,5 @@ + return false; + } +- if (nameLength <= 0) ++ if (!nameLength) + return false; + diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index ab86c151..35100bbd 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('cd4083945b76b075bc67dcc38e411d04') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-webview/default/PKGBUILD b/qt5-webview/default/PKGBUILD index c0fd0c9c..cb6cee4e 100644 --- a/qt5-webview/default/PKGBUILD +++ b/qt5-webview/default/PKGBUILD @@ -11,7 +11,7 @@ makedepends=('git') provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) license=('custom' 'FDL' 'GPL3' 'LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=('qt5') source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#tag=v$pkgver) diff --git a/qt5-webview/git/PKGBUILD b/qt5-webview/git/PKGBUILD index 63bf9119..7e2ca954 100644 --- a/qt5-webview/git/PKGBUILD +++ b/qt5-webview/git/PKGBUILD @@ -11,7 +11,7 @@ makedepends=('git') provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) license=('custom' 'FDL' 'GPL3' 'LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=('qt5') source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev) diff --git a/qt5-webview/mingw-w64-git/PKGBUILD b/qt5-webview/mingw-w64-git/PKGBUILD index 000bd890..84144744 100644 --- a/qt5-webview/mingw-w64-git/PKGBUILD +++ b/qt5-webview/mingw-w64-git/PKGBUILD @@ -14,7 +14,7 @@ provides=(${pkgname%-git}) conflicts=(${pkgname%-git}) options=('!strip' '!buildflags' 'staticlibs') license=('custom' 'FDL' 'GPL3' 'LGPL') -url="http://qt-project.org" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" groups=(mingw-w64-qt mingw-w64-qt5) source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev) diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 2705fc39..0c783611 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('7bfdeb968681e75108dd1c661b6f42c1') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index 962fd191..855ed41b 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -11,9 +11,9 @@ depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc') options=('!strip' '!buildflags' 'staticlibs') license=('GPL3' 'LGPL') -url="http://qt-project.org/" +url="https://www.qt.io/" _pkgfqn="${_qt_module}-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") md5sums=('17b9ee5031262b5b875ce0e1045e6bdc') _architectures="i686-w64-mingw32 x86_64-w64-mingw32"