[arch-commits] Commit in qt5-webengine/kde-unstable (3 files)
Date: Wednesday, October 9, 2019 @ 20:13:03
Author: arojas
Revision: 364292
Build with system ICU
Added:
qt5-webengine/kde-unstable/qt5-webengine-system-icu.patch
Modified:
qt5-webengine/kde-unstable/PKGBUILD
Deleted:
qt5-webengine/kde-unstable/qt5-webengine-system-icu.patch
+
PKGBUILD | 15 ++-
qt5-webengine-system-icu.patch | 52 ---
2 files changed, 41 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-09 19:17:00 UTC (rev 364291)
+++ PKGBUILD2019-10-09 20:13:03 UTC (rev 364292)
@@ -4,7 +4,7 @@
pkgname=qt5-webengine
_qtver=5.14.0-beta1
pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://www.qt.io'
license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -11,13 +11,15 @@
pkgdesc='Provides support for web applications using the Chromium browser
project'
depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr'
'pciutils' 'libxss'
'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx')
-makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'gn')
+makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-
qt5-webengine-linux-5.2.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch?id=74e69da9;)
+
qt5-webengine-linux-5.2.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch?id=74e69da9;
+qt5-webengine-system-icu.patch)
sha256sums=('4255e0a4f1510b6cae552f053b774659d93116cf17080ac003884c82dc00961c'
-'8deb3df43a379976bbdb1fa814e68b2ce0433043695efc694c11e47f67c51b6a')
+'8deb3df43a379976bbdb1fa814e68b2ce0433043695efc694c11e47f67c51b6a'
+'057fcd43300931e438c6714d2d42516d45420b6e8ae513c901a599d49215796a')
prepare() {
mkdir -p build
@@ -24,6 +26,7 @@
cd $_pkgfqn/src/3rdparty/chromium
patch -p2 -i "$srcdir"/qt5-webengine-linux-5.2.patch # Fix build with recent
kernel
+ patch -p2 -i "$srcdir"/qt5-webengine-system-icu.patch # Fix build with
system ICU
}
build() {
@@ -33,8 +36,8 @@
-proprietary-codecs \
-system-ffmpeg \
-webp \
--spellchecker
-#-webengine-icu
+-spellchecker \
+-webengine-icu
make
}
Deleted: qt5-webengine-system-icu.patch
===
--- qt5-webengine-system-icu.patch 2019-10-09 19:17:00 UTC (rev 364291)
+++ qt5-webengine-system-icu.patch 2019-10-09 20:13:03 UTC (rev 364292)
@@ -1,20 +0,0 @@
-diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn
-index 4450e40..9ca36dd 100644
a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -96,6 +96,7 @@ shim_headers("icui18n_shim") {
- "unicode/fpositer.h",
- "unicode/gender.h",
- "unicode/gregocal.h",
-+"unicode/listformatter.h",
- "unicode/measfmt.h",
- "unicode/measunit.h",
- "unicode/measure.h",
-@@ -178,7 +179,6 @@ shim_headers("icuuc_shim") {
- "unicode/icudataver.h",
- "unicode/icuplug.h",
- "unicode/idna.h",
--"unicode/listformatter.h",
- "unicode/localpointer.h",
- "unicode/locdspnm.h",
- "unicode/locid.h",
Added: qt5-webengine-system-icu.patch
===
--- qt5-webengine-system-icu.patch (rev 0)
+++ qt5-webengine-system-icu.patch 2019-10-09 20:13:03 UTC (rev 364292)
@@ -0,0 +1,32 @@
+From 7bc2392c19118a80380c7661fb86c69022eb2b47 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: [PATCH] Fix compilation with system ICU
+
+system_icu_config is missing default type for UCHAR_TYPE, that causes
+a mismatch of types all over Chromium. uint16_t is defined as a base type
+under linux in chromium/build/linux/unbundle/icu.gn.
+Necessary constructions were lost during recent refactorings,
+and seems to be restored in later chromium > 76.
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+---
+
+diff --git a/chromium/third_party/icu/BUILD.gn
b/chromium/third_party/icu/BUILD.gn
+index be3c919..639f8fd 100644
+--- a/chromium/third_party/icu/BUILD.gn
b/chromium/third_party/icu/BUILD.gn
+@@ -1175,6 +1175,12 @@
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
++
++ if (is_win) {
++defines += [ "UCHAR_TYPE=wchar_t" ]
++ } else {
++defines += [ "UCHAR_TYPE=uint16_t" ]
++ }
+ }
+
+ if (use_system_icu) {
+
[arch-commits] Commit in qt5-webengine/kde-unstable (3 files)
Date: Tuesday, October 10, 2017 @ 15:51:50
Author: arojas
Revision: 307391
Update freetype patch
Added:
qt5-webengine/kde-unstable/qtwebengine-harmony.patch
Modified:
qt5-webengine/kde-unstable/PKGBUILD
Deleted:
qt5-webengine/kde-unstable/harmony-fix.diff
---+
PKGBUILD |6 +--
harmony-fix.diff | 69 ---
qtwebengine-harmony.patch | 76
3 files changed, 79 insertions(+), 72 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-10 15:03:01 UTC (rev 307390)
+++ PKGBUILD2017-10-10 15:51:50 UTC (rev 307391)
@@ -16,9 +16,9 @@
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
- harmony-fix.diff)
+ qtwebengine-harmony.patch)
sha256sums=('df7547b87ef6d150c5ed4dc9a03b24299caf9ceb15a3515d995733f901ec3549'
-'2c309c0f6978e6a399422319b5034b01881d5526cf48b2ee5fcc7f418029a344')
+'c183e3a7c135b1942bbb977f74c7f4eff79cd9504c7a17ad29b99ce5776cdece')
prepare() {
mkdir -p build
@@ -30,7 +30,7 @@
cd ${_pkgfqn}
# FreeType 2.8.1
- # patch -Np1 -i ../harmony-fix.diff
+ patch -Np1 -i ../qtwebengine-harmony.patch
}
build() {
Deleted: harmony-fix.diff
===
--- harmony-fix.diff2017-10-10 15:03:01 UTC (rev 307390)
+++ harmony-fix.diff2017-10-10 15:51:50 UTC (rev 307391)
@@ -1,69 +0,0 @@
-diff -u -r
qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
2017-09-19 17:38:43.659642835 +0200
-+++
qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
2017-09-19 17:38:50.492991631 +0200
-@@ -80,7 +80,7 @@
-
- class FreeTypeLibrary : SkNoncopyable {
- public:
--FreeTypeLibrary() : fLibrary(nullptr), fIsLCDSupported(false),
fLCDExtra(0) {
-+FreeTypeLibrary() : fLibrary(nullptr) {
- if (FT_New_Library(, )) {
- return;
- }
-@@ -90,8 +90,6 @@
- // Default { 0x10, 0x40, 0x70, 0x40, 0x10 } adds up to 0x110,
simulating ink spread.
- // SetLcdFilter must be called before SetLcdFilterWeights.
- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
--fIsLCDSupported = true;
--fLCDExtra = 2; //Using a filter adds one full pixel to each side.
-
- #ifdef SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
- // Adds to 0x110 simulating ink spread, but provides better
results than default.
-@@ -124,13 +122,9 @@
- }
-
- FT_Library library() { return fLibrary; }
--bool isLCDSupported() { return fIsLCDSupported; }
--int lcdExtra() { return fLCDExtra; }
-
- private:
- FT_Library fLibrary;
--bool fIsLCDSupported;
--int fLCDExtra;
-
- // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
- // The following platforms provide FreeType of at least 2.4.0.
-@@ -633,17 +627,6 @@
- rec->fTextSize = SkIntToScalar(1 << 14);
- }
-
--if (isLCD(*rec)) {
--// TODO: re-work so that FreeType is set-up and selected by the
SkFontMgr.
--SkAutoMutexAcquire ama(gFTMutex);
--ref_ft_library();
--if (!gFTLibrary->isLCDSupported()) {
--// If the runtime Freetype library doesn't support LCD, disable
it here.
--rec->fMaskFormat = SkMask::kA8_Format;
--}
--unref_ft_library();
--}
--
- SkPaint::Hinting h = rec->getHinting();
- if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
- // collapse full->normal hinting if we're not doing LCD
-@@ -1046,11 +1029,11 @@
- void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
- if (isLCD(fRec)) {
- if (fLCDIsVert) {
--glyph->fHeight += gFTLibrary->lcdExtra();
--glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
-+glyph->fHeight += 2;
-+glyph->fTop -= 1;
- } else {
--glyph->fWidth += gFTLibrary->lcdExtra();
--glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
-+glyph->fWidth += 2;
-+glyph->fLeft -= 1;
- }
- }
- }
Added: qtwebengine-harmony.patch
===
--- qtwebengine-harmony.patch (rev 0)
+++ qtwebengine-harmony.patch 2017-10-10 15:51:50 UTC (rev 307391)
@@ -0,0 +1,76 @@
+---
