diff options
-rw-r--r-- | libre-testing/qt5-webengine/PKGBUILD | 59 | ||||
-rw-r--r-- | libre-testing/qt5-webengine/qt5-webengine-nss.patch | 31 | ||||
-rw-r--r-- | libre-testing/qt5-webengine/qtwebengine-5.7.0-icu58.patch | 105 | ||||
-rw-r--r-- | libre/qt5-webengine/PKGBUILD | 9 | ||||
-rw-r--r-- | libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch | 56 |
5 files changed, 59 insertions, 201 deletions
diff --git a/libre-testing/qt5-webengine/PKGBUILD b/libre-testing/qt5-webengine/PKGBUILD deleted file mode 100644 index 7d485dd24..000000000 --- a/libre-testing/qt5-webengine/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> -# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke R. <g4jc@openmailbox.org> - -pkgname=qt5-webengine -_qtver=5.8.0 -pkgver=${_qtver/-/} -pkgrel=1.parabola1 -arch=('i686' 'x86_64') -url='http://qt-project.org/' -license=('LGPL3' 'LGPL2.1' 'BSD') -pkgdesc='Provides support for web applications using the Chromium browser project, without nonfree codecs' -depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 'libvpx' - 'libevent' 'libsrtp' 'snappy' 'nss' 'protobuf' 'libxslt' 'minizip' 'ffmpeg') -makedepends=('python2' 'git' 'gperf' 'jsoncpp') -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) - -md5sums=('6e7fb2be161c6db4d988a4f5b329672f' - '2a1610b34204102938a24154a52e5571' - '9d225d1bf83ea45dbf6556d30d35fcb8') - -prepare() { - mkdir -p build - - # Hack to force using python2 - mkdir -p bin - ln -s /usr/bin/python2 bin/python - - # 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 -} - -build() { - cd build - - export PATH="$srcdir/bin:$PATH" - qmake WEBENGINE_CONFIG+="use_system_ffmpeg use_system_icu" ../${_pkgfqn} - make -} - -package() { - cd build - make INSTALL_ROOT="$pkgdir" install - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - - install -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium -} diff --git a/libre-testing/qt5-webengine/qt5-webengine-nss.patch b/libre-testing/qt5-webengine/qt5-webengine-nss.patch deleted file mode 100644 index 6c0cdf1c7..000000000 --- a/libre-testing/qt5-webengine/qt5-webengine-nss.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc -qtwebengine-opensource-src-5.6.0-beta-chimera-nss-init/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc ---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2015-12-10 18:17:21.000000000 +0100 -+++ qtwebengine-opensource-src-5.6.0-beta-chimera-nss-init/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2016-01-14 -17:11:38.432633534 +0100 -@@ -57,6 +57,10 @@ - #include "net/ssl/ssl_platform_key.h" - #endif - -+#if defined(USE_NSS_CERTS) || defined(OS_IOS) -+#include "net/cert_net/nss_ocsp.h" -+#endif -+ - namespace net { - - namespace { -@@ -795,6 +799,14 @@ - DCHECK(!ssl_); - DCHECK(!transport_bio_); - -+#if defined(USE_NSS_CERTS) || defined(OS_IOS) -+ if (ssl_config_.cert_io_enabled) { -+ // TODO(davidben): Move this out of SSLClientSocket. See -+ // https://crbug.com/539520. -+ EnsureNSSHttpIOInit(); -+ } -+#endif -+ - SSLContext* context = SSLContext::GetInstance(); - crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE); - diff --git a/libre-testing/qt5-webengine/qtwebengine-5.7.0-icu58.patch b/libre-testing/qt5-webengine/qtwebengine-5.7.0-icu58.patch deleted file mode 100644 index f3f6bdee0..000000000 --- a/libre-testing/qt5-webengine/qtwebengine-5.7.0-icu58.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001 -From: jshin <jshin@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@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)); - } diff --git a/libre/qt5-webengine/PKGBUILD b/libre/qt5-webengine/PKGBUILD index 4ff51ae96..86ebd00bf 100644 --- a/libre/qt5-webengine/PKGBUILD +++ b/libre/qt5-webengine/PKGBUILD @@ -6,9 +6,9 @@ # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info> pkgname=qt5-webengine -_qtver=5.7.1 +_qtver=5.8.0 pkgver=${_qtver/-/} -pkgrel=2.parabola1 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'armv7h') url='http://qt-project.org/' license=('LGPL3' 'LGPL2.1' 'BSD') @@ -23,9 +23,9 @@ source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submo qtwebengine-opensource-src-5.6.0-beta-no-neon.patch system-ffmpeg.patch) -md5sums=('c90fba515fb33c091904fe2cadbb345a' +md5sums=('6e7fb2be161c6db4d988a4f5b329672f' '2a1610b34204102938a24154a52e5571' - 'c2ffb0073e6f67a0a77a8fe39f9e9859' + '9d225d1bf83ea45dbf6556d30d35fcb8' '123d4d0d7db7473649ff2b5650330cc4' '9f79b14f7c5ff603c1fcd87f37a8904f') @@ -53,7 +53,6 @@ build() { cd build export PATH="$srcdir/bin:$PATH" - export CXXFLAGS+=" -fno-delete-null-pointer-checks" qmake WEBENGINE_CONFIG+="use_system_ffmpeg use_system_icu" ../${_pkgfqn} make } diff --git a/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch b/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch index ced5367c4..f3f6bdee0 100644 --- a/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch +++ b/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch @@ -1,4 +1,58 @@ -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 +From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001 +From: jshin <jshin@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@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 @@ |