summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-01-25 03:25:38 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-01-25 03:46:55 -0300
commitb0c67f6a560c13ff53c0688db9f55afbb1f65486 (patch)
tree63bc429c02962147222afd2bf42be61be008c26f /libre
parent8cd379f8f5de3117c04c50f5362edd587e4d690e (diff)
downloadabslibre-b0c67f6a560c13ff53c0688db9f55afbb1f65486.tar.gz
abslibre-b0c67f6a560c13ff53c0688db9f55afbb1f65486.tar.bz2
abslibre-b0c67f6a560c13ff53c0688db9f55afbb1f65486.zip
qt5-webengine-5.7.1-2.parabola1: updating version
* move qt5-webengine-5.8.0-1.parabola1 to [libre-testing] since we are using Qt 5.7.1 yet
Diffstat (limited to 'libre')
-rw-r--r--libre/qt5-webengine/PKGBUILD9
-rw-r--r--libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch56
2 files changed, 6 insertions, 59 deletions
diff --git a/libre/qt5-webengine/PKGBUILD b/libre/qt5-webengine/PKGBUILD
index 7d485dd24..282bf7e5f 100644
--- a/libre/qt5-webengine/PKGBUILD
+++ b/libre/qt5-webengine/PKGBUILD
@@ -5,9 +5,9 @@
# Contributor: Luke R. <g4jc@openmailbox.org>
pkgname=qt5-webengine
-_qtver=5.8.0
+_qtver=5.7.1
pkgver=${_qtver/-/}
-pkgrel=1.parabola1
+pkgrel=2.parabola1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -20,9 +20,9 @@ _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'
+md5sums=('c90fba515fb33c091904fe2cadbb345a'
'2a1610b34204102938a24154a52e5571'
- '9d225d1bf83ea45dbf6556d30d35fcb8')
+ 'c2ffb0073e6f67a0a77a8fe39f9e9859')
prepare() {
mkdir -p build
@@ -43,6 +43,7 @@ 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 f3f6bdee0..ced5367c4 100644
--- a/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
+++ b/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
@@ -1,58 +1,4 @@
-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
+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 @@