[arch-commits] Commit in qt5-webengine/kde-unstable (2 files)

[Antonio Rojas]

    Date: Thursday, April 25, 2019 @ 07:34:31
  Author: arojas
Revision: 352111

Fix PDF extension

Modified:
  qt5-webengine/kde-unstable/PKGBUILD
Deleted:
  qt5-webengine/kde-unstable/qtwebengine-harmony.patch

---------------------------+
 PKGBUILD                  |   12 +++---
 qtwebengine-harmony.patch |   77 --------------------------------------------
 2 files changed, 6 insertions(+), 83 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-25 06:44:57 UTC (rev 352110)
+++ PKGBUILD	2019-04-25 07:34:31 UTC (rev 352111)
@@ -15,9 +15,9 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-         qtwebengine-harmony.patch)
+         qtwebengine-pdf.patch::"https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=395e61ff")
 sha256sums=('1140939b1d7de4e51c7ce1fd79cce7474a06ccfab4d63d835c55ffe2ddb27e55'
-            'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3')
+            '68b9920539409dd3ab0001db6e7f742a2e531e6fb2ba1d4ec82be9b7a761e59e')
 
 prepare() {
   mkdir -p build
@@ -28,8 +28,8 @@
 
   cd ${_pkgfqn}
 
-  # FreeType 2.8.1
-#  patch -Np1 -i ../qtwebengine-harmony.patch
+  # Fix PDF extension
+  patch -Np1 -i ../qtwebengine-pdf.patch
 }
 
 build() {
@@ -40,8 +40,8 @@
     -proprietary-codecs \
     -system-ffmpeg \
     -webp \
-    -spellchecker \
-    -webengine-icu
+    -spellchecker
+#    -webengine-icu
   make
 }
 

Deleted: qtwebengine-harmony.patch
===================================================================
--- qtwebengine-harmony.patch	2019-04-25 06:44:57 UTC (rev 352110)
+++ qtwebengine-harmony.patch	2019-04-25 07:34:31 UTC (rev 352111)
@@ -1,77 +0,0 @@
---- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2017-10-10 17:42:06.956950985 +0200
-+++ qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2017-10-10 17:46:05.824187787 +0200
-@@ -99,8 +99,6 @@
-     FreeTypeLibrary()
-         : fGetVarDesignCoordinates(nullptr)
-         , fLibrary(nullptr)
--        , fIsLCDSupported(false)
--        , fLCDExtra(0)
-     {
-         if (FT_New_Library(&gFTMemory, &fLibrary)) {
-             return;
-@@ -147,12 +145,7 @@
-         }
- #endif
- 
--        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
--        // The default has changed over time, so this doesn't mean the same thing to all users.
--        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
--            fIsLCDSupported = true;
--            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
--        }
-+        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
-     }
-     ~FreeTypeLibrary() {
-         if (fLibrary) {
-@@ -161,8 +153,6 @@
-     }
- 
-     FT_Library library() { return fLibrary; }
--    bool isLCDSupported() { return fIsLCDSupported; }
--    int lcdExtra() { return fLCDExtra; }
- 
-     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
-     // Prior to this there was no way to get the coordinates out of the FT_Face.
-@@ -173,8 +163,6 @@
- 
- 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.
-@@ -704,17 +692,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
-@@ -1115,11 +1092,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;
-         }
-     }
- }