[arch-commits] Commit in (72 files)
Antonio Rojas
arojas at archlinux.org
Fri Apr 21 11:55:01 UTC 2017
Date: Friday, April 21, 2017 @ 11:54:59
Author: arojas
Revision: 293803
Qt 5.9 beta 2
Added:
qt5-3d/kde-unstable/
qt5-base/kde-unstable/
qt5-canvas3d/kde-unstable/
qt5-charts/kde-unstable/
qt5-connectivity/kde-unstable/
qt5-datavis3d/kde-unstable/
qt5-declarative/kde-unstable/
qt5-doc/kde-unstable/
qt5-examples/kde-unstable/
qt5-gamepad/kde-unstable/
qt5-graphicaleffects/kde-unstable/
qt5-imageformats/kde-unstable/
qt5-location/kde-unstable/
qt5-multimedia/kde-unstable/
qt5-networkauth/kde-unstable/
qt5-quickcontrols/kde-unstable/
qt5-quickcontrols2/kde-unstable/
qt5-script/kde-unstable/
qt5-scxml/kde-unstable/
qt5-sensors/kde-unstable/
qt5-serialbus/kde-unstable/
qt5-serialport/kde-unstable/
qt5-speech/kde-unstable/
qt5-svg/kde-unstable/
qt5-tools/kde-unstable/
qt5-translations/kde-unstable/
qt5-virtualkeyboard/kde-unstable/
qt5-wayland/kde-unstable/
qt5-webchannel/kde-unstable/
qt5-webengine/kde-unstable/
qt5-webkit/kde-unstable/
qt5-websockets/kde-unstable/
qt5-webview/kde-unstable/
qt5-x11extras/kde-unstable/
qt5-xmlpatterns/kde-unstable/
Modified:
qt5-3d/kde-unstable/PKGBUILD
qt5-base/kde-unstable/PKGBUILD
qt5-canvas3d/kde-unstable/PKGBUILD
qt5-charts/kde-unstable/PKGBUILD
qt5-connectivity/kde-unstable/PKGBUILD
qt5-datavis3d/kde-unstable/PKGBUILD
qt5-declarative/kde-unstable/PKGBUILD
qt5-doc/kde-unstable/PKGBUILD
qt5-examples/kde-unstable/PKGBUILD
qt5-gamepad/kde-unstable/PKGBUILD
qt5-graphicaleffects/kde-unstable/PKGBUILD
qt5-imageformats/kde-unstable/PKGBUILD
qt5-location/kde-unstable/PKGBUILD
qt5-multimedia/kde-unstable/PKGBUILD
qt5-networkauth/kde-unstable/PKGBUILD
qt5-quickcontrols/kde-unstable/PKGBUILD
qt5-quickcontrols2/kde-unstable/PKGBUILD
qt5-script/kde-unstable/PKGBUILD
qt5-scxml/kde-unstable/PKGBUILD
qt5-sensors/kde-unstable/PKGBUILD
qt5-serialbus/kde-unstable/PKGBUILD
qt5-serialport/kde-unstable/PKGBUILD
qt5-speech/kde-unstable/PKGBUILD
qt5-svg/kde-unstable/PKGBUILD
qt5-tools/kde-unstable/PKGBUILD
qt5-translations/kde-unstable/PKGBUILD
qt5-virtualkeyboard/kde-unstable/PKGBUILD
qt5-wayland/kde-unstable/PKGBUILD
qt5-webchannel/kde-unstable/PKGBUILD
qt5-webengine/kde-unstable/PKGBUILD
qt5-webkit/kde-unstable/PKGBUILD
qt5-websockets/kde-unstable/PKGBUILD
qt5-webview/kde-unstable/PKGBUILD
qt5-x11extras/kde-unstable/PKGBUILD
qt5-xmlpatterns/kde-unstable/PKGBUILD
Deleted:
qt5-wayland/kde-unstable/revert-5b807802.patch
qt5-webengine/kde-unstable/qtwebengine-5.7.0-icu58.patch
-------------------------------+
PKGBUILD | 288 ++++++++-------------
qtwebengine-5.7.0-icu58.patch | 105 -------
revert-5b807802.patch | 542 ----------------------------------------
3 files changed, 121 insertions(+), 814 deletions(-)
Modified: qt5-3d/kde-unstable/PKGBUILD
===================================================================
--- qt5-3d/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-3d/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-3d
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('048bc9762f1da4773384911122b116c4')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('0355929944bda95ff58164c359a68191a935585a39f1e38443ca6c7b7703c797')
prepare() {
mkdir -p build
Modified: qt5-base/kde-unstable/PKGBUILD
===================================================================
--- qt5-base/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-base/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -4,15 +4,15 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
-pkgrel=10
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
'gtk3' 'libpulse' 'cups' 'freetds')
@@ -26,16 +26,8 @@
conflicts=('qtchooser')
groups=('qt' 'qt5')
_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
- plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
- plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
- plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
- '160fde81fe882c4241f04634f53691ad'
- '078d8a051c06abf28451fd2cdb7f19ce'
- '92daaa3ebd7cf10ee725b963e44c95a7'
- '76ab122615f1ba2d68c83477f82e389e')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('95a698330821a3330c13291cb806821566cfdb71e59315b442d46f378fc21254')
prepare() {
cd ${_pkgfqn}
@@ -50,14 +42,6 @@
# Use python2 for Python 2.x
find . -name '*.py' -exec sed -i \
's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
- # Fix logging to systemd journal
- patch -p1 -i ../qt5-base-journald.patch
-
- # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
- patch -p1 -i ../plasma-crash-1.patch
- patch -p1 -i ../plasma-crash-2.patch
- patch -p1 -i ../plasma-crash-3.patch
}
build() {
Modified: qt5-canvas3d/kde-unstable/PKGBUILD
===================================================================
--- qt5-canvas3d/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-canvas3d/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-canvas3d
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('94d6e0141711d3660e2872fbb051da5e')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('19a1aaae0fe5d3aeab813a03ace7bd8d443bdaf8579a2d6f2772e49c6ebca2d4')
prepare() {
mkdir -p build
Modified: qt5-charts/kde-unstable/PKGBUILD
===================================================================
--- qt5-charts/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-charts/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qt5-charts
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('f7571b774a4f42c627ae9a8259dd8ace')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('00311d47f581622fdccd53c8d1864b0de7cde611dd757ec16ec0603b48796172')
prepare() {
mkdir -p build
Modified: qt5-connectivity/kde-unstable/PKGBUILD
===================================================================
--- qt5-connectivity/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-connectivity/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-connectivity
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('aabc57b30ab4d888b390f12f2bee637a')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('b86fd65a9729ff0af2f04d2cbcdc9a0aed78b7ff35ef6fd06b0caab8b04b3d8f')
prepare() {
mkdir -p build
Modified: qt5-datavis3d/kde-unstable/PKGBUILD
===================================================================
--- qt5-datavis3d/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-datavis3d/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qt5-datavis3d
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('75cf7881d162030fb56442c94bc76456')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('c61e800997874256c44ecd2a58df3cf6cd3c758c8b12f7824d2aaed8992f0652')
prepare() {
mkdir -p build
Modified: qt5-declarative/kde-unstable/PKGBUILD
===================================================================
--- qt5-declarative/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-declarative/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-declarative
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@
conflicts=('qtchooser' 'qt5-declarative-render2d')
replaces=('qt5-declarative-render2d')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('4f55b3617abdff14706d02d761d5a0aa')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('9f2df211918d49b9dab66c169b90f1b1bc4a9d3096a958cdd5f78832f2da75c5')
prepare() {
mkdir -p build
Modified: qt5-doc/kde-unstable/PKGBUILD
===================================================================
--- qt5-doc/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-doc/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -4,9 +4,9 @@
# Contributor: Michael Hansen <zrax0111 gmail com>
pkgname=qt5-doc
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=('any')
url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -15,8 +15,8 @@
makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite')
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz")
-md5sums=('66660cd3d9e1a6fed36e88adcb72e9fe')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz")
+sha256sums=('b74c30cd80474880b4a0c2f0ed6efdbda16ebe72cdc26f2a85bb025a42d5d838')
prepare() {
cd ${_pkgfqn}
Modified: qt5-examples/kde-unstable/PKGBUILD
===================================================================
--- qt5-examples/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-examples/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -4,7 +4,7 @@
# Contributor: Michael Hansen <zrax0111 gmail com>
pkgname=qt5-examples
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('any')
@@ -14,8 +14,8 @@
depends=('qt5-doc')
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz")
-md5sums=('66660cd3d9e1a6fed36e88adcb72e9fe')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz")
+sha256sums=('b74c30cd80474880b4a0c2f0ed6efdbda16ebe72cdc26f2a85bb025a42d5d838')
package() {
_base="$pkgdir"/usr/share/doc/qt/examples
Modified: qt5-gamepad/kde-unstable/PKGBUILD
===================================================================
--- qt5-gamepad/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-gamepad/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qt5-gamepad
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('eac2f30dfff1027c3adedaff841b4772')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('c58fdd999fd543bedc139a6ed384ee9fba35d4b8111f1fcb085b12ab57d0caaf')
prepare() {
mkdir -p build
Modified: qt5-graphicaleffects/kde-unstable/PKGBUILD
===================================================================
--- qt5-graphicaleffects/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-graphicaleffects/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-graphicaleffects
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('0f74145f0fbb3db8d2f9711b83531fcf')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('9148413eaacf1e4e024fdea9201278d5523dfaec44fdcfdc5da2d6f56e5872d0')
prepare() {
mkdir -p build
Modified: qt5-imageformats/kde-unstable/PKGBUILD
===================================================================
--- qt5-imageformats/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-imageformats/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-imageformats
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('75e6580e5db2a16deffe072cd2dc60ed')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('d8afcca8d3074eeec7cceb0febd81111f8412d7ed88e89b202a0dd53943713b2')
prepare() {
mkdir -p build
Modified: qt5-location/kde-unstable/PKGBUILD
===================================================================
--- qt5-location/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-location/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-location
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('gypsy: Gypsy geolocation plugin')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('2077d5d6f926087614c9e94021019c0e')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('cef4ee0ec2b46a764b285bf546821a90c97bfcfd78c041d86ff84c1eae373a9a')
prepare() {
mkdir -p build
Modified: qt5-multimedia/kde-unstable/PKGBUILD
===================================================================
--- qt5-multimedia/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-multimedia/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-multimedia
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings' 'gst-plugins-bad: camera support')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('c8610023cfe036d3ad7c13f6e99892cf')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('68f25afbdb79bad5160bfbe0d8c3c68d460665d959064c2ec3c1f8362089fafa')
prepare() {
mkdir -p build
Modified: qt5-networkauth/kde-unstable/PKGBUILD
===================================================================
--- qt5-networkauth/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-networkauth/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -2,7 +2,7 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt5-networkauth
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=(i686 x86_64)
@@ -12,8 +12,8 @@
depends=(qt5-base)
groups=(qt qt5)
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('2e85ab8ae1f60520b2b007113df1cef9')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('bf1b0c1a6814055d551dd62068212e229d36f6bf31086c11134cb462f3c1a8a3')
prepare() {
mkdir -p build
Modified: qt5-quickcontrols/kde-unstable/PKGBUILD
===================================================================
--- qt5-quickcontrols/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-quickcontrols/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-quickcontrols
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('62124ab5b9a9aee99138d848ea0e35a3')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('c8d2c4e4e23a9c908b73d27f7819938b0b08c8988371337d5d02b738d245aa40')
prepare() {
mkdir -p build
Modified: qt5-quickcontrols2/kde-unstable/PKGBUILD
===================================================================
--- qt5-quickcontrols2/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-quickcontrols2/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-quickcontrols2
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
optdepends=('qt5-graphicaleffects: for the Material style')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('d5ce30fe81fcd9b7ba51d1b5dc7f7265')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('aa0cd934ec16f345e6791d0e6a448141bac4dc4a7429fbbffb66f1a88820162d')
prepare() {
mkdir -p build
Modified: qt5-script/kde-unstable/PKGBUILD
===================================================================
--- qt5-script/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-script/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-script
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('ad08742955a7c6c9972ad9913a29115c')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('26760be5667ef1183fd53079a17861f166db027d1f3e5b28d8c5990c9ecccf08')
prepare() {
mkdir -p build
Modified: qt5-scxml/kde-unstable/PKGBUILD
===================================================================
--- qt5-scxml/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-scxml/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qt5-scxml
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('498c638710cf519f08e5a782f8feed63')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('dfee4a509fe1105c19aafaab49794df257769615f6608b7fdb326d80bc490b6c')
prepare() {
mkdir -p build
Modified: qt5-sensors/kde-unstable/PKGBUILD
===================================================================
--- qt5-sensors/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-sensors/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-sensors
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('c2062e07ab5d52d0fb8ef19c5ef6f86d')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('9f9b77047d03805645fc689d7fcc88494f089d212d7010bb13c87756fe5f5c43')
prepare() {
mkdir -p build
Modified: qt5-serialbus/kde-unstable/PKGBUILD
===================================================================
--- qt5-serialbus/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-serialbus/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-serialbus
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('1b8e73e69cabb4a6627e882283a3c011')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('8f90d732aae81e818c139bd06cc54ee540a4d936fc09c62775afd28808e6b5dd')
prepare() {
mkdir -p build
Modified: qt5-serialport/kde-unstable/PKGBUILD
===================================================================
--- qt5-serialport/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-serialport/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-serialport
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('1a39fbb6436761a2ea3edce6628a41bd')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('a9609dbe483b1b0fb0b284565d908c4f634fb372ee830b8f87d8a24b23b40578')
prepare() {
mkdir -p build
Modified: qt5-speech/kde-unstable/PKGBUILD
===================================================================
--- qt5-speech/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-speech/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt5-speech
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(i686 x86_64)
url='http://qt-project.org/'
license=(GPL3 LGPL3 FDL custom)
@@ -14,8 +14,8 @@
optdepends=('flite: flite TTS backend' 'speech-dispatcher: speech-dispatcher TTS backend')
groups=(qt qt5)
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('021bcba221e4d175bf4368ee6a19296d')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('ed4d458bd998a5b8a609ca91b214924a89d937beb8970db32b02f655aef6c2ec')
prepare() {
mkdir -p build
Modified: qt5-svg/kde-unstable/PKGBUILD
===================================================================
--- qt5-svg/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-svg/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-svg
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('44da40f325dc545d85217007ae62aa63')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('5c9ba90df25f8a45e974916e4eeaf3b9d228258c0ca04af8f02239e35553ca1b')
prepare() {
mkdir -p build
Modified: qt5-tools/kde-unstable/PKGBUILD
===================================================================
--- qt5-tools/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-tools/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-tools
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -16,13 +16,13 @@
groups=('qt' 'qt5')
conflicts=('qtchooser')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
{assistant,designer,linguist,qdbusviewer}.desktop)
-md5sums=('506e53a228fe0c3d6c8b6fbebd8e47ae'
- '4d5108891a3c0255af29e7640a29caed'
- 'f9a33d1e43ebf4ee9c6feda68feba64a'
- '521eff2020e1397aa9b22caa17d4ee4b'
- '05a8324f294da817b2fd3a59863a06f1')
+sha256sums=('21c8305305856d428f6a181476392be9f2786d25bd5f3e79f8c76a8e24661cb5'
+ '8092d6d846e39632107b14726fa112862d800e929ef10f05f2a284dbda9b53c4'
+ '366e18ba400068df40d26a3c944d6bd4925bf22c32f171b837a3f4e387eff019'
+ 'db1ad1d27ce73820b8d50291618b6f817292f15f55107274064b9ae99201069a'
+ 'cd94367e35f99ab85277aa95985bbde292a9cc82db2c04c4efdaed5799aa16db')
prepare() {
mkdir -p build
Modified: qt5-translations/kde-unstable/PKGBUILD
===================================================================
--- qt5-translations/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-translations/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-translations
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('any')
@@ -14,8 +14,8 @@
makedepends=('qt5-tools')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('b6c6748a923b9639c7d018cfdb04caf4')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('af8be0fed788a26c4f497e7e66f1ee1a6a1338e9431d9d5785d4831d45e655c7')
prepare() {
mkdir -p build
Modified: qt5-virtualkeyboard/kde-unstable/PKGBUILD
===================================================================
--- qt5-virtualkeyboard/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-virtualkeyboard/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qt5-virtualkeyboard
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('efdd5a64234dc0ef7e47505502ca5d28')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('0ade1a57a3db6a78301605126583c64caa1d1d30bdfb34e9f92e986219230e9c')
prepare() {
mkdir -p build
Modified: qt5-wayland/kde-unstable/PKGBUILD
===================================================================
--- qt5-wayland/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-wayland/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-wayland
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,17 +13,11 @@
depends=('qt5-declarative' 'libxcomposite' 'wayland') # namcap note: wayland is needed for nvidia-libgl users
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- revert-5b807802.patch)
-md5sums=('0a40bd721bd5e1630601beab660c6ea9'
- '95e986e9c0ab5ebe03c85efb69ee751a')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('b471877c430767cb2c2a3510bf8b8c86ab2dca0f72ba79e767d79d6a96d4e457')
prepare() {
mkdir -p build
-
-# Revert commit that breaks Plasma Wayland
- cd ${_pkgfqn}
- patch -Rp1 -i ../revert-5b807802.patch
}
build() {
Deleted: qt5-wayland/kde-unstable/revert-5b807802.patch
===================================================================
--- qt5-wayland/trunk/revert-5b807802.patch 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-wayland/kde-unstable/revert-5b807802.patch 2017-04-21 11:54:59 UTC (rev 293803)
@@ -1,542 +0,0 @@
-From 5b807802866c8df00cb3340d4f9bcc343be5973a Mon Sep 17 00:00:00 2001
-From: Giulio Camuffo <giulio.camuffo at kdab.com>
-Date: Sat, 2 Jul 2016 10:46:58 +0200
-Subject: [PATCH] Create and destroy the shell surface when showing and hiding
-
-This changes the shell surface handling for windows, and instead of
-creating the shell surface at initialization time, and then attaching
-a null buffer to hide it, it creates the shell surface on setVisible(true),
-and destroys it on setVisible(false).
-This fixes hiding when using xdg_shell, as that interface defines that
-attaching a null buffer to an xdg_surface is an error.
-Also this should help with bugged EGL drivers which attach a buffer
-after eglSwapBuffers() returns, which used to cause a newly hidden
-window to get a new valid buffer after we attached a null one, showing
-it again.
-
-Task-number: QTBUG-47902
-Change-Id: I8e0a0442319a98cc1361803ea7be1d079b36fc8c
-Reviewed-by: Johan Helsing <johan.helsing at qt.io>
-Reviewed-by: Paul Olav Tvete <paul.tvete at qt.io>
----
- src/client/qwaylandshellsurface_p.h | 5 +-
- src/client/qwaylandshmbackingstore.cpp | 8 +-
- src/client/qwaylandwindow.cpp | 90 +++++++++++-----------
- src/client/qwaylandwindow_p.h | 2 +
- src/client/qwaylandwlshellsurface.cpp | 10 +++
- src/client/qwaylandwlshellsurface_p.h | 6 +-
- src/client/qwaylandxdgpopup.cpp | 6 ++
- src/client/qwaylandxdgpopup_p.h | 2 +
- src/client/qwaylandxdgsurface.cpp | 19 ++---
- src/client/qwaylandxdgsurface_p.h | 5 +-
- .../client/wayland-egl/qwaylandeglwindow.cpp | 10 +++
- .../client/wayland-egl/qwaylandeglwindow.h | 4 +
- .../qwaylandxcompositeeglcontext.cpp | 4 +-
- .../qwaylandxcompositeglxcontext.cpp | 4 +-
- .../ivi-shell/qwaylandivisurface.cpp | 7 ++
- .../ivi-shell/qwaylandivisurface_p.h | 2 +
- tests/auto/client/client/tst_client.cpp | 4 +-
- 17 files changed, 110 insertions(+), 78 deletions(-)
-
-diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h
-index 63b77ab..b51c252 100644
---- a/src/client/qwaylandshellsurface_p.h
-+++ b/src/client/qwaylandshellsurface_p.h
-@@ -94,15 +94,14 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShellSurface : public QObject
-
- inline QWaylandWindow *window() { return m_window; }
-
-+ virtual void setType(Qt::WindowType type, QWaylandWindow *transientParent) = 0;
-+
- protected:
- virtual void setMaximized() {}
- virtual void setFullscreen() {}
- virtual void setNormal() {}
- virtual void setMinimized() {}
-
-- virtual void setTopLevel() {}
-- virtual void updateTransientParent(QWindow * /*parent*/) {}
--
- private:
- QWaylandWindow *m_window;
- friend class QWaylandWindow;
-diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
-index 5f8336c..d0d6cfd 100644
---- a/src/client/qwaylandshmbackingstore.cpp
-+++ b/src/client/qwaylandshmbackingstore.cpp
-@@ -211,13 +211,7 @@ void QWaylandShmBackingStore::flush(QWindow *window, const QRegion ®ion, cons
-
- QMargins margins = windowDecorationMargins();
-
-- waylandWindow()->attachOffset(mFrontBuffer);
-- mFrontBuffer->setBusy();
--
-- QVector<QRect> rects = region.rects();
-- foreach (const QRect &rect, rects)
-- waylandWindow()->damage(rect.translated(margins.left(), margins.top()));
-- waylandWindow()->commit();
-+ waylandWindow()->commit(mFrontBuffer, region.translated(margins.left(), margins.top()));
- }
-
- void QWaylandShmBackingStore::resize(const QSize &size, const QRegion &)
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 6c3647d..1ff6686 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -96,8 +96,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
- {
- static WId id = 1;
- mWindowId = id++;
-- if (window->type() != Qt::Desktop)
-- initWindow();
- }
-
- QWaylandWindow::~QWaylandWindow()
-@@ -126,18 +124,28 @@ QWaylandWindow::~QWaylandWindow()
-
- void QWaylandWindow::initWindow()
- {
-- init(mDisplay->createSurface(static_cast<QtWayland::wl_surface *>(this)));
-+ if (window()->type() == Qt::Desktop)
-+ return;
-+
-+ if (!isInitialized())
-+ init(mDisplay->createSurface(static_cast<QtWayland::wl_surface *>(this)));
-
- if (shouldCreateSubSurface()) {
-+ Q_ASSERT(!mSubSurfaceWindow);
-+
- QWaylandWindow *p = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
- if (::wl_subsurface *ss = mDisplay->createSubSurface(this, p)) {
- mSubSurfaceWindow = new QWaylandSubSurface(this, p, ss);
- }
- } else if (shouldCreateShellSurface()) {
-+ Q_ASSERT(!mShellSurface);
-+
- mShellSurface = mDisplay->createShellSurface(this);
-- }
-+ if (!mShellSurface)
-+ qFatal("Could not create a shell surface object.");
-+
-+ mShellSurface->setType(window()->type(), transientParent());
-
-- if (mShellSurface) {
- // Set initial surface title
- setWindowTitle(window()->title());
-
-@@ -171,17 +179,6 @@ void QWaylandWindow::initWindow()
- }
- }
-
-- if (mShellSurface) {
-- if (window()->transientParent()) {
-- if (window()->type() != Qt::Popup) {
-- mShellSurface->updateTransientParent(window()->transientParent());
-- }
-- } else {
-- if (window()->type() != Qt::ToolTip)
-- mShellSurface->setTopLevel();
-- }
-- }
--
- // Enable high-dpi rendering. Scale() returns the screen scale factor and will
- // typically be integer 1 (normal-dpi) or 2 (high-dpi). Call set_buffer_scale()
- // to inform the compositor that high-resolution buffers will be provided.
-@@ -244,6 +241,9 @@ WId QWaylandWindow::winId() const
-
- void QWaylandWindow::setParent(const QPlatformWindow *parent)
- {
-+ if (!window()->isVisible())
-+ return;
-+
- QWaylandWindow *oldparent = mSubSurfaceWindow ? mSubSurfaceWindow->parent() : 0;
- if (oldparent == parent)
- return;
-@@ -287,8 +287,7 @@ void QWaylandWindow::setGeometry_helper(const QRect &rect)
- QMargins m = QPlatformWindow::parent()->frameMargins();
- mSubSurfaceWindow->set_position(rect.x() + m.left(), rect.y() + m.top());
- mSubSurfaceWindow->parent()->window()->requestUpdate();
-- } else if (shellSurface() && window()->transientParent() && window()->type() != Qt::Popup)
-- shellSurface()->updateTransientParent(window()->transientParent());
-+ }
- }
-
- void QWaylandWindow::setGeometry(const QRect &rect)
-@@ -313,20 +312,8 @@ void QWaylandWindow::setGeometry(const QRect &rect)
- void QWaylandWindow::setVisible(bool visible)
- {
- if (visible) {
-- if (mShellSurface) {
-- if (window()->type() == Qt::Popup) {
-- QWaylandWindow *parent = transientParent();
-- if (parent) {
-- QWaylandWlShellSurface *wlshellSurface = qobject_cast<QWaylandWlShellSurface*>(mShellSurface);
-- if (wlshellSurface)
-- wlshellSurface->setPopup(parent, mDisplay->lastInputDevice(), mDisplay->lastInputSerial());
-- }
-- } else if (window()->type() == Qt::ToolTip) {
-- if (QWaylandWindow *parent = transientParent()) {
-- mShellSurface->updateTransientParent(parent->window());
-- }
-- }
-- }
-+ initWindow();
-+ mDisplay->flushRequests();
-
- setGeometry(window()->geometry());
- // Don't flush the events here, or else the newly visible window may start drawing, but since
-@@ -338,10 +325,8 @@ void QWaylandWindow::setVisible(bool visible)
- // case 'this' will be deleted. When that happens, we must abort right away.
- QPointer<QWaylandWindow> deleteGuard(this);
- QWindowSystemInterface::flushWindowSystemEvents();
-- if (!deleteGuard.isNull()) {
-- attach(static_cast<QWaylandBuffer *>(0), 0, 0);
-- commit();
-- }
-+ if (!deleteGuard.isNull())
-+ reset();
- }
- }
-
-@@ -374,7 +359,7 @@ void QWaylandWindow::setMask(const QRegion &mask)
- wl_region_destroy(region);
- }
-
-- commit();
-+ wl_surface::commit();
- }
-
- void QWaylandWindow::configure(uint32_t edges, int32_t width, int32_t height)
-@@ -461,6 +446,7 @@ void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
- wl_callback_add_listener(callback, &QWaylandWindow::callbackListener, this);
- mFrameCallback = callback;
- mWaitingForFrameSync = true;
-+ buffer->setBusy();
-
- attach(buffer->buffer(), x, y);
- } else {
-@@ -479,6 +465,18 @@ void QWaylandWindow::damage(const QRect &rect)
- damage(rect.x(), rect.y(), rect.width(), rect.height());
- }
-
-+void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
-+{
-+ if (!isInitialized())
-+ return;
-+
-+ attachOffset(buffer);
-+ const QVector<QRect> rects = damage.rects();
-+ for (const QRect &rect: rects)
-+ wl_surface::damage(rect.x(), rect.y(), rect.width(), rect.height());
-+ wl_surface::commit();
-+}
-+
- const wl_callback_listener QWaylandWindow::callbackListener = {
- QWaylandWindow::frameCallback
- };
-@@ -555,7 +553,7 @@ void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orient
- }
- set_buffer_transform(transform);
- // set_buffer_transform is double buffered, we need to commit.
-- commit();
-+ wl_surface::commit();
- }
-
- void QWaylandWindow::setOrientationMask(Qt::ScreenOrientations mask)
-@@ -681,15 +679,13 @@ static QWindow *topLevelWindow(QWindow *window)
-
- QWaylandWindow *QWaylandWindow::transientParent() const
- {
-- if (window()->transientParent()) {
-- // Take the top level window here, since the transient parent may be a QWidgetWindow
-- // or some other window without a shell surface, which is then not able to get mouse
-- // events.
-- return static_cast<QWaylandWindow *>(topLevelWindow(window()->transientParent())->handle());
-- }
-- // Try with the current focus window. It should be the right one and anyway
-- // better than having no parent at all.
-- return mDisplay->lastInputWindow();
-+ // Take the top level window here, since the transient parent may be a QWidgetWindow
-+ // or some other window without a shell surface, which is then not able to get mouse
-+ // events.
-+ if (auto transientParent = window()->transientParent())
-+ return static_cast<QWaylandWindow *>(topLevelWindow(transientParent)->handle());
-+
-+ return nullptr;
- }
-
- void QWaylandWindow::handleMouse(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e)
-diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
-index 442fe9a..7e7078f 100644
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -132,6 +132,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandWindow : public QObject, public QPlatformW
- using QtWayland::wl_surface::damage;
- void damage(const QRect &rect);
-
-+ void commit(QWaylandBuffer *buffer, const QRegion &damage);
-+
- void waitForFrameSync();
-
- QMargins frameMargins() const Q_DECL_OVERRIDE;
-diff --git a/src/client/qwaylandwlshellsurface.cpp b/src/client/qwaylandwlshellsurface.cpp
-index 3527015..77434e9 100644
---- a/src/client/qwaylandwlshellsurface.cpp
-+++ b/src/client/qwaylandwlshellsurface.cpp
-@@ -215,6 +215,16 @@ void QWaylandWlShellSurface::setPopup(QWaylandWindow *parent, QWaylandInputDevic
- transientPos.x(), transientPos.y(), 0);
- }
-
-+void QWaylandWlShellSurface::setType(Qt::WindowType type, QWaylandWindow *transientParent)
-+{
-+ if (type == Qt::Popup && transientParent)
-+ setPopup(transientParent, m_window->display()->lastInputDevice(), m_window->display()->lastInputSerial());
-+ else if (transientParent)
-+ updateTransientParent(transientParent->window());
-+ else
-+ setTopLevel();
-+}
-+
- void QWaylandWlShellSurface::shell_surface_ping(uint32_t serial)
- {
- pong(serial);
-diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h
-index ef732ef..af86276 100644
---- a/src/client/qwaylandwlshellsurface_p.h
-+++ b/src/client/qwaylandwlshellsurface_p.h
-@@ -92,14 +92,16 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellSurface : public QWaylandShellSurfa
- void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
- void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
-
-+ void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
-+
- private:
- void setMaximized() Q_DECL_OVERRIDE;
- void setFullscreen() Q_DECL_OVERRIDE;
- void setNormal() Q_DECL_OVERRIDE;
- void setMinimized() Q_DECL_OVERRIDE;
-
-- void setTopLevel() Q_DECL_OVERRIDE;
-- void updateTransientParent(QWindow *parent) Q_DECL_OVERRIDE;
-+ void setTopLevel();
-+ void updateTransientParent(QWindow *parent);
- void setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, int serial);
-
- QWaylandWindow *m_window;
-diff --git a/src/client/qwaylandxdgpopup.cpp b/src/client/qwaylandxdgpopup.cpp
-index abc2527..57800f1 100644
---- a/src/client/qwaylandxdgpopup.cpp
-+++ b/src/client/qwaylandxdgpopup.cpp
-@@ -56,6 +56,12 @@ QWaylandXdgPopup::~QWaylandXdgPopup()
- delete m_extendedWindow;
- }
-
-+void QWaylandXdgPopup::setType(Qt::WindowType type, QWaylandWindow *transientParent)
-+{
-+ Q_UNUSED(type);
-+ Q_UNUSED(transientParent);
-+}
-+
- void QWaylandXdgPopup::xdg_popup_popup_done()
- {
- m_window->window()->close();
-diff --git a/src/client/qwaylandxdgpopup_p.h b/src/client/qwaylandxdgpopup_p.h
-index ff58041..64bb4d9 100644
---- a/src/client/qwaylandxdgpopup_p.h
-+++ b/src/client/qwaylandxdgpopup_p.h
-@@ -68,6 +68,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgPopup : public QWaylandShellSurface
- QWaylandXdgPopup(struct ::xdg_popup *popup, QWaylandWindow *window);
- virtual ~QWaylandXdgPopup();
-
-+ void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
-+
- protected:
- void xdg_popup_popup_done() override;
-
-diff --git a/src/client/qwaylandxdgsurface.cpp b/src/client/qwaylandxdgsurface.cpp
-index a3bbb06..fe8761e 100644
---- a/src/client/qwaylandxdgsurface.cpp
-+++ b/src/client/qwaylandxdgsurface.cpp
-@@ -128,17 +128,11 @@ void QWaylandXdgSurface::setMinimized()
- set_minimized();
- }
-
--void QWaylandXdgSurface::setTopLevel()
-+void QWaylandXdgSurface::updateTransientParent(QWaylandWindow *parent)
- {
-- // There's no xdg_shell_surface API for this, ignoring
--}
--
--void QWaylandXdgSurface::updateTransientParent(QWindow *parent)
--{
-- QWaylandWindow *parent_wayland_window = static_cast<QWaylandWindow *>(parent->handle());
-- if (!parent_wayland_window)
-+ if (!parent)
- return;
-- auto parentXdgSurface = qobject_cast<QWaylandXdgSurface *>(parent_wayland_window->shellSurface());
-+ auto parentXdgSurface = qobject_cast<QWaylandXdgSurface *>(parent->shellSurface());
- Q_ASSERT(parentXdgSurface);
- set_parent(parentXdgSurface->object());
- }
-@@ -183,6 +177,13 @@ void QWaylandXdgSurface::sendProperty(const QString &name, const QVariant &value
- m_extendedWindow->updateGenericProperty(name, value);
- }
-
-+void QWaylandXdgSurface::setType(Qt::WindowType type, QWaylandWindow *transientParent)
-+{
-+ Q_UNUSED(type)
-+ if (transientParent)
-+ updateTransientParent(transientParent);
-+}
-+
- void QWaylandXdgSurface::xdg_surface_configure(int32_t width, int32_t height, struct wl_array *states,uint32_t serial)
- {
- uint32_t *state = reinterpret_cast<uint32_t*>(states->data);
-diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h
-index 1a5eeed..265d3ba 100644
---- a/src/client/qwaylandxdgsurface_p.h
-+++ b/src/client/qwaylandxdgsurface_p.h
-@@ -99,14 +99,15 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface
- bool isFullscreen() const { return m_fullscreen; }
- bool isMaximized() const { return m_maximized; }
-
-+ void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
-+
- private:
- void setMaximized() Q_DECL_OVERRIDE;
- void setFullscreen() Q_DECL_OVERRIDE;
- void setNormal() Q_DECL_OVERRIDE;
- void setMinimized() Q_DECL_OVERRIDE;
-
-- void setTopLevel() Q_DECL_OVERRIDE;
-- void updateTransientParent(QWindow *parent) Q_DECL_OVERRIDE;
-+ void updateTransientParent(QWaylandWindow *parent);
-
- private:
- QWaylandWindow *m_window;
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-index 236218e..6b5c532 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-@@ -159,6 +159,12 @@ void QWaylandEglWindow::setVisible(bool visible)
- {
- QWaylandWindow::setVisible(visible);
- if (!visible)
-+ QMetaObject::invokeMethod(this, "doInvalidateSurface", Qt::QueuedConnection);
-+}
-+
-+void QWaylandEglWindow::doInvalidateSurface()
-+{
-+ if (!window()->isVisible())
- invalidateSurface();
- }
-
-@@ -168,6 +174,10 @@ void QWaylandEglWindow::invalidateSurface()
- eglDestroySurface(m_clientBufferIntegration->eglDisplay(), m_eglSurface);
- m_eglSurface = 0;
- }
-+ if (m_waylandEglWindow) {
-+ wl_egl_window_destroy(m_waylandEglWindow);
-+ m_waylandEglWindow = nullptr;
-+ }
- }
-
- EGLSurface QWaylandEglWindow::eglSurface() const
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
-index 556ed68..bf65668 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
-@@ -54,6 +54,7 @@ class QWaylandGLContext;
-
- class QWaylandEglWindow : public QWaylandWindow
- {
-+ Q_OBJECT
- public:
- QWaylandEglWindow(QWindow *window);
- ~QWaylandEglWindow();
-@@ -75,6 +76,9 @@ class QWaylandEglWindow : public QWaylandWindow
- void invalidateSurface() Q_DECL_OVERRIDE;
- void setVisible(bool visible) Q_DECL_OVERRIDE;
-
-+private Q_SLOTS:
-+ void doInvalidateSurface();
-+
- private:
- QWaylandEglClientBufferIntegration *m_clientBufferIntegration;
- struct wl_egl_window *m_waylandEglWindow;
-diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
-index e2e2f55..c07ad53 100644
---- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
-+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
-@@ -64,9 +64,7 @@ void QWaylandXCompositeEGLContext::swapBuffers(QPlatformSurface *surface)
-
- QSize size = w->geometry().size();
-
-- w->attach(w->buffer(), 0, 0);
-- w->damage(QRect(QPoint(), size));
-- w->commit();
-+ w->commit(w->buffer(), QRegion(0, 0, size.width(), size.height()));
- w->waitForFrameSync();
- }
-
-diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
-index bc6e94f..439acc0 100644
---- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
-+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
-@@ -90,9 +90,7 @@ void QWaylandXCompositeGLXContext::swapBuffers(QPlatformSurface *surface)
-
- glXSwapBuffers(m_display, w->xWindow());
-
-- w->attach(w->buffer(), 0, 0);
-- w->damage(QRect(QPoint(), size));
-- w->commit();
-+ w->commit(w->buffer(), QRegion(0, 0, size.width(), size.height()));
- w->waitForFrameSync();
- }
-
-diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp
-index f8871fa..ecc47e0 100644
---- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp
-+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp
-@@ -71,6 +71,13 @@ QWaylandIviSurface::~QWaylandIviSurface()
- delete m_extendedWindow;
- }
-
-+void QWaylandIviSurface::setType(Qt::WindowType type, QWaylandWindow *transientParent)
-+{
-+
-+ Q_UNUSED(type)
-+ Q_UNUSED(transientParent)
-+}
-+
- void QWaylandIviSurface::createExtendedSurface(QWaylandWindow *window)
- {
- if (window->display()->windowExtension())
-diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
-index 96978e2..9ac81ad 100644
---- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
-+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
-@@ -56,6 +56,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandIviSurface : public QtWayland::ivi_surface
- struct ::ivi_controller_surface *iviControllerSurface);
- virtual ~QWaylandIviSurface();
-
-+ void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
-+
- private:
- void createExtendedSurface(QWaylandWindow *window);
- virtual void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE;
-diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
-index 74363ef..6aad25b 100644
---- a/tests/auto/client/client/tst_client.cpp
-+++ b/tests/auto/client/client/tst_client.cpp
-@@ -248,8 +248,8 @@ void tst_WaylandClient::backingStore()
-
- window.hide();
-
-- // hiding the window should detach the buffer
-- QTRY_VERIFY(surface->image.isNull());
-+ // hiding the window should destroy the surface
-+ QTRY_VERIFY(!compositor->surface());
- }
-
- class DndWindow : public QWindow
Modified: qt5-webchannel/kde-unstable/PKGBUILD
===================================================================
--- qt5-webchannel/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-webchannel/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-webchannel
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('9cb74ebedb6e7ca1f2a4dc3f8e2fbc08')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('7879cdb736676f4f33ec2b7de3e7e890e03f9b0a29147e5b655638a4693a8af1')
prepare() {
mkdir -p build
Modified: qt5-webengine/kde-unstable/PKGBUILD
===================================================================
--- qt5-webengine/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-webengine/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-webengine
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -13,24 +13,14 @@
depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 'libvpx'
'libevent' 'libsrtp' 'snappy' 'nss' 'protobuf' 'libxslt' 'libxdamage' 'minizip' 'ffmpeg')
# namcap note: libxdamage is needed for nvidia users
-makedepends=('python2' 'git' 'gperf' 'jsoncpp')
+makedepends=('python2' 'git' 'gperf' 'jsoncpp' 'ninja')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-webengine-nss.patch
- qtwebengine-5.7.0-icu58.patch qtbug-58488.patch::"https://github.com/qt/qtwebengine/commit/7e7dd262.patch"
- qtbug-58381.patch::"https://github.com/qt/qtwebengine/commit/8e147ed3.patch"
- qtbug-58515.patch::"https://github.com/qt/qtwebengine/commit/a6c6665d.patch"
- qtbug-58673.patch::"https://github.com/qt/qtwebengine/commit/90501711.patch"
- qtbug-58362.patch::"https://github.com/qt/qtwebengine/commit/31374ba9.patch")
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qt5-webengine-nss.patch)
-md5sums=('6e7fb2be161c6db4d988a4f5b329672f'
- '2a1610b34204102938a24154a52e5571'
- '9d225d1bf83ea45dbf6556d30d35fcb8'
- '3762cbdbc6a752e4d876e048e5e16de6'
- '951ac7549fff82f9d1d11e9bf50556ba'
- 'd5da5608285ad764f37fe196f9afe5a1'
- 'c7b5acd58319d23d769c19f42323e8ec'
- '663f8454990de96fad4c8c78bcd6f819')
+sha256sums=('a98709230ed0015e9fa3d82d93cdc757934e5bf577563caf9e5f56217c46ae85'
+ '4419e688bfda63b399a9ea2f28d5e4c8c6294096d363b657903329dbba0499cd')
prepare() {
mkdir -p build
@@ -42,20 +32,6 @@
# Fix opening some websites with recent NSS https://github.com/QupZilla/qupzilla/issues/1870 (KaOSx patch)
cd ${_pkgfqn}
# patch -p1 -i ../qt5-webengine-nss.patch
-
- # Fix build with ICU 58 (gentoo)
- patch -p1 -i "$srcdir"/qtwebengine-5.7.0-icu58.patch
-
- # Prevent drop-down popups form stealing focus https://bugreports.qt.io/browse/QTBUG-58488
- patch -p1 -i ../qtbug-58488.patch
-
- # Backport some focus fixes
- patch -p1 -i ../qtbug-58381.patch
- patch -p1 -i ../qtbug-58515.patch
- patch -p1 -i ../qtbug-58673.patch
-
- # Fix IME support
- patch -p1 -i ../qtbug-58362.patch
}
build() {
Deleted: qt5-webengine/kde-unstable/qtwebengine-5.7.0-icu58.patch
===================================================================
--- qt5-webengine/trunk/qtwebengine-5.7.0-icu58.patch 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-webengine/kde-unstable/qtwebengine-5.7.0-icu58.patch 2017-04-21 11:54:59 UTC (rev 293803)
@@ -1,105 +0,0 @@
-From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001
-From: jshin <jshin at chromium.org>
-Date: Fri, 21 Oct 2016 01:15:50 -0700
-Subject: [PATCH] Update aspirational_scripts per Unicode 9
-
-This is a preparation to update ICU to 58.1.
-Without this change, ICU update CL cannot be tested on
-trybots because a compile will fail due to '#error' checking
-if ICU version is less than 58.
-
-BUG=637001
-TEST=None
-TBR=pkasting at chromium.org
-
-Review-Url: https://chromiumcodereview.appspot.com/2436113003
-Cr-Commit-Position: refs/heads/master@{#426749}
----
- components/url_formatter/url_formatter.cc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
-index 4455db3..2b82c0c 100644
---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-@@ -428,9 +428,9 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) {
- // section at
- // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are
- // are added to the allowed set. The list has to be updated when a new
-- // version of Unicode is released. The current version is 8.0.0 and ICU 58
-- // will have Unicode 9.0 data.
--#if U_ICU_VERSION_MAJOR_NUM < 58
-+ // version of Unicode is released. The current version is 9.0.0 and ICU 60
-+ // will have Unicode 10.0 data.
-+#if U_ICU_VERSION_MAJOR_NUM < 60
- const icu::UnicodeSet aspirational_scripts(
- icu::UnicodeString(
- // Unified Canadian Syllabics
-@@ -444,13 +444,13 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) {
- // Yi
- "\\uA000-\\uA48C"
- // Miao
-- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F"
-+ "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E"
- "\\U00016F8F-\\U00016F9F]",
- -1, US_INV),
- *status);
- allowed_set.addAll(aspirational_scripts);
- #else
--#error "Update aspirational_scripts per Unicode 9.0"
-+#error "Update aspirational_scripts per Unicode 10.0"
- #endif
-
- // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in
-diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
-qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800
-+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800
-@@ -26,6 +26,9 @@
- #include "wtf/StdLibExtras.h"
- #include "wtf/text/CharacterNames.h"
-
-+#include <unicode/uchar.h>
-+#include <unicode/uvernum.h>
-+
- namespace blink {
-
- unsigned numGraphemeClusters(const String& string)
-@@ -122,13 +125,18 @@
- { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
- };
-
-+#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#define BA_LB_COUNT (U_LB_COUNT - 3)
-+#else
-+#define BA_LB_COUNT U_LB_COUNT
-+#endif
- // Line breaking table for CSS word-break: break-all. This table differs from
- // asciiLineBreakTable in:
- // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
- // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
- // - 1 indicates additional break opportunities. 0 indicates to fallback to
- // normal line break, not "prohibit break."
--static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
-+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
- // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI
- { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
- { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
-@@ -178,7 +186,7 @@
- #undef AL
-
- static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
--static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
-+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
-
- static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
- {
-@@ -209,7 +217,7 @@
-
- static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
- {
-- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
-+ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
- const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
- return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
- }
Modified: qt5-webkit/kde-unstable/PKGBUILD
===================================================================
--- qt5-webkit/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-webkit/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-webkit
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@
optdepends=('gst-plugins-good: Webm codec support')
conflicts=('qt')
groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz")
-md5sums=('60a6935aca4a7c553d0ec4646ceed3b4')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${_qtver}/qtwebkit-opensource-src-${_qtver}.tar.xz")
+sha256sums=('da5ef14d359beb1c3315c17fb00c9af447784996f39d5682c9a0741477696bd6')
prepare() {
mkdir -p build
@@ -28,12 +28,12 @@
qmake ../${_pkgfqn}
make
- make docs
+# make docs
}
package() {
cd build
- make INSTALL_ROOT="$pkgdir" install install_docs
+ make INSTALL_ROOT="$pkgdir" install # install_docs
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "$pkgdir/usr/lib" -type f -name '*.prl' \
Modified: qt5-websockets/kde-unstable/PKGBUILD
===================================================================
--- qt5-websockets/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-websockets/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-websockets
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
optdepends=('qt5-declarative: QML bindings')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('99bbe29bb05a19b6fca7077eb07d7d1b')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('c05046b0a64688f4f208566fcbd9ff39b2341cceb9a93c94f824d1fbd2d9706e')
prepare() {
mkdir -p build
Modified: qt5-webview/kde-unstable/PKGBUILD
===================================================================
--- qt5-webview/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-webview/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Maintainer: Antonio Rojas <arojas at archlinux.org>
pkgname=qt5-webview
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('00c8056667a9a7143f4522452fc40f3b')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('109dd062680af3c400681ca027560ce3d8645baf13847d6ed55a0e876c07f0ec')
prepare() {
mkdir -p build
Modified: qt5-x11extras/kde-unstable/PKGBUILD
===================================================================
--- qt5-x11extras/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-x11extras/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-x11extras
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@
makedepends=()
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('a29256a11122e68e8507433d34d9f9ae')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('6dd1716c0c282f1f6385be884a4a4f364134d44b803e670035ec19c47086d92e')
prepare() {
mkdir -p build
Modified: qt5-xmlpatterns/kde-unstable/PKGBUILD
===================================================================
--- qt5-xmlpatterns/trunk/PKGBUILD 2017-04-15 20:46:17 UTC (rev 292941)
+++ qt5-xmlpatterns/kde-unstable/PKGBUILD 2017-04-21 11:54:59 UTC (rev 293803)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt5-xmlpatterns
-_qtver=5.8.0
+_qtver=5.9.0-beta2
pkgver=${_qtver/-/}
pkgrel=1
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
conflicts=('qtchooser')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('033cbcf237be0d5cb7256b3d881411ff')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('cca0e579e1e1c92389f5771cda7339afb629248eec367810fdb8bf53b511d51c')
prepare() {
mkdir -p build
More information about the arch-commits
mailing list