diff --git a/desktop/kde/framework/extra-cmake-modules/pspec.xml b/desktop/kde/framework/extra-cmake-modules/pspec.xml index b2e73f3f97..666632d626 100644 --- a/desktop/kde/framework/extra-cmake-modules/pspec.xml +++ b/desktop/kde/framework/extra-cmake-modules/pspec.xml @@ -12,7 +12,7 @@ library Extra cmake modules for KDE5 Extra cmake modules KDE5 - mirrors://kde/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz + mirrors://kde/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz cmake flex @@ -34,6 +34,13 @@ + + 2018-02-01 + 5.42.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2017-12-15 5.41.0 diff --git a/desktop/toolkit/qt5/qt5-location/pspec.xml b/desktop/toolkit/qt5/qt5-location/pspec.xml index bdd521c869..f25c58f33e 100644 --- a/desktop/toolkit/qt5/qt5-location/pspec.xml +++ b/desktop/toolkit/qt5/qt5-location/pspec.xml @@ -17,6 +17,7 @@ glib2-devel mesa-devel icu4c-devel + zlib-devel qt5-base-devel qt5-assistant-devel qt5-declarative-devel diff --git a/desktop/toolkit/qt5/qt5-webengine/files/harmony-fix.diff b/desktop/toolkit/qt5/qt5-webengine/files/harmony-fix.diff new file mode 100644 index 0000000000..803730f0d1 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webengine/files/harmony-fix.diff @@ -0,0 +1,69 @@ +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; + } + } + } diff --git a/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.9.3-icu-60-build.patch b/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.9.3-icu-60-build.patch new file mode 100644 index 0000000000..8aa50e81cc --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.9.3-icu-60-build.patch @@ -0,0 +1,11 @@ +--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc 2017-11-08 21:13:31.000000000 +0200 ++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc 2017-11-30 16:37:00.116153976 +0200 +@@ -488,7 +488,7 @@ + // are added to the allowed set. The list has to be updated when a new + // 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 ++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT) + const icu::UnicodeSet aspirational_scripts( + icu::UnicodeString( + // Unified Canadian Syllabics diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml index 6fa3b258bb..9d48f195b4 100644 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml @@ -70,9 +70,9 @@ git - - + + qtwebengine-5.9.3-icu-60-build.patch + harmony-fix.diff @@ -153,7 +153,7 @@ - 2018-01-18 + 2018-02-01 5.9.3 Release bump. Kamil Atlı diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml index 2851c8f520..0480ca6311 100644 --- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml @@ -132,7 +132,7 @@ - 2018-01-18 + 2018-02-01 5.9.0 Version bump Ayhan Yalçınsoy diff --git a/desktop/toolkit/qtermwidget5/pspec.xml b/desktop/toolkit/qtermwidget5/pspec.xml index 44c6154ec8..e365a631d6 100644 --- a/desktop/toolkit/qtermwidget5/pspec.xml +++ b/desktop/toolkit/qtermwidget5/pspec.xml @@ -15,6 +15,7 @@ cmake libgcc + lxqt-build-tools qt5-base-devel qt5-linguist @@ -48,7 +49,7 @@ - 2017-10-24 + 2018-02-01 0.8.0 Version bump. Ayhan Yalçınsoy