commit 3f624ead11d0a5d93110d99e12193080cd0e4bd4 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Dec 24 17:34:55 2017 +1100 qtwebengine: 5.9.3 -> 5.10.0 diff --git a/qtwebengine/.footprint b/qtwebengine/.footprint index 72743d97a..7ac8c1c3f 100644 --- a/qtwebengine/.footprint +++ b/qtwebengine/.footprint @@ -2,28 +2,28 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/qt5/ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.3/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginecertificateerror_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginedialogrequests_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginedownloaditem_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginehistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginehistory_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebengineloadrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginenavigationrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginenewviewrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebengineprofile_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginescript_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginesettings_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginesingleton_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebenginetestsupport_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebengineview_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qquickwebengineview_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/qtwebengineglobal_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.10.0/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginecertificateerror_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginedialogrequests_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginedownloaditem_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginehistory_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginehistory_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebengineloadrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginenavigationrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginenewviewrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebengineprofile_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginescript_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginesettings_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginesingleton_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebenginetestsupport_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebengineview_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qquickwebengineview_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngine/5.10.0/QtWebEngine/private/qtwebengineglobal_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineProfile -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineScript -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/QtWebEngine @@ -34,13 +34,13 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.9.3/QtWebEngine/private/ -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/qtwebengineglobal.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngine/qtwebengineversion.h drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.3/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/private/qtwebenginecoreglobal_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/private/qwebenginecallback_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/private/qwebenginecookiestore_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.10.0/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.10.0/QtWebEngineCore/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.10.0/QtWebEngineCore/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.10.0/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.10.0/QtWebEngineCore/private/qwebenginecallback_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.10.0/QtWebEngineCore/private/qwebenginecookiestore_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/5.10.0/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCallback -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCookieStore -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineHttpRequest @@ -61,15 +61,15 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.9.3/QtWebEngineCore/priva -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlrequestjob.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlschemehandler.h drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/qwebenginehistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/qwebenginepage_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/qwebengineprofile_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.9.3/QtWebEngineWidgets/private/qwebengineview_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/qwebenginehistory_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/qwebenginepage_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/qwebengineprofile_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/5.10.0/QtWebEngineWidgets/private/qwebengineview_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineCertificateError -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineContextMenuData -rw-rw-r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineDownloadItem @@ -113,22 +113,22 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5WebEngineWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake -rw-r--r-- root/root usr/lib/libQt5WebEngine.la -rw-r--r-- root/root usr/lib/libQt5WebEngine.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.9.3 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.9.3 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.9 -> libQt5WebEngine.so.5.9.3 --rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.9.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.10.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.10.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.10 -> libQt5WebEngine.so.5.10.0 +-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.10.0 -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.la -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.9.3 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.9.3 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.9 -> libQt5WebEngineCore.so.5.9.3 --rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.9.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.10.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.10.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.10 -> libQt5WebEngineCore.so.5.10.0 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.10.0 -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.la -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.9.3 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.9.3 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.9 -> libQt5WebEngineWidgets.so.5.9.3 --rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.9.3 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.10.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.10.0 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.10 -> libQt5WebEngineWidgets.so.5.10.0 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.10.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngine.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngineCore.pc diff --git a/qtwebengine/.md5sum b/qtwebengine/.md5sum index 8c8c4f260..959edc466 100644 --- a/qtwebengine/.md5sum +++ b/qtwebengine/.md5sum @@ -1,3 +1,2 @@ -bae366f6797eaf6679e99575932a9758 harmony-fix.patch 2b8336d205219ae66f67423aa9d267b8 last-commit-position.patch -3d9a205f94117d1fcd61544b02d32d99 qtwebengine-opensource-src-5.9.3.tar.xz +0ea0b32e97911cf80d32b31cf10a6d8b qtwebengine-everywhere-src-5.10.0.tar.xz diff --git a/qtwebengine/.signature b/qtwebengine/.signature index 5b4b2a1e9..981826c66 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WCfA/GfmA0D876QtMOJjKWaAuagAOiAqbT8o3hC3JG52EtgtMQXB3jOFVQ3hHJIynMdrMi6S2cjCL6wlqF7fQs= -SHA256 (Pkgfile) = fbe4a42ff85a3bbc3a27e3a44f2ca031d784f9c09fc00e3d1514d43f61a60b49 -SHA256 (.footprint) = d924be023c71bd3f94366b3daca090a1fcc65d80fefa152ec23a37a67eac3cfe -SHA256 (qtwebengine-opensource-src-5.9.3.tar.xz) = 45ae1142fd87271c100f4d7889427738e774e86db5d8f6bcf9ceb99d18571d37 +RWSE3ohX2g5d/WmBU5L5w423RymQeahWFCKZz5Y/qMiDERW8XOF9DlhTgpil9uizRdZ6m47/n4w3uI/FAD35xhWkLdAhpanYtwo= +SHA256 (Pkgfile) = 406e18c42ef8937ee00572e914b77c2ab605f5df7848a7af16824da20912b459 +SHA256 (.footprint) = d7c8b35f0a73b00885cb379924c7abd7ea41b0be2a6e6052138fa048edd28fd0 +SHA256 (qtwebengine-everywhere-src-5.10.0.tar.xz) = a8bf5989ef847a249bbc1f391743a36971825b896747d073e30dbcdefc9567f9 SHA256 (last-commit-position.patch) = 4f9d9bbde39013061bf9d003af67aff81bb7be3f42f0723e87c308425d8ead97 -SHA256 (harmony-fix.patch) = 2c309c0f6978e6a399422319b5034b01881d5526cf48b2ee5fcc7f418029a344 diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index c3370a606..a5e8542fc 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -4,23 +4,18 @@ # Depends on: qt5 xorg-libxscrnsaver xorg-libxtst nss ninja name=qtwebengine -version=5.9.3 +version=5.10.0 release=1 -source=(http://download.qt.io/official_releases/qt/${version::3}/$version/submodules/$name-opensource-src-$version.tar.xz - last-commit-position.patch - harmony-fix.patch) +source=(http://download.qt.io/official_releases/qt/${version::4}/$version/submodules/$name-everywhere-src-$version.tar.xz + last-commit-position.patch) build() { - cd $name-opensource-src-$version + cd $name-everywhere-src-$version # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch - # FreeType 2.8.1 - patch -p1 -i $SRC/harmony-fix.patch - # Ninja, by default, sets the number of jobs to the number of availalble threads - local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS) test -n "$JOBS" && export NINJAFLAGS+=" -j $JOBS" install -d build diff --git a/qtwebengine/harmony-fix.patch b/qtwebengine/harmony-fix.patch deleted file mode 100644 index 803730f0d..000000000 --- a/qtwebengine/harmony-fix.patch +++ /dev/null @@ -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(&gFTMemory, &fLibrary)) { - 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; - } - } - }