From efd29829c4b917982f326b9c3ec6f84a04a6403c Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 1 Feb 2018 21:22:21 +0300 Subject: [PATCH 1/2] python3-qt5-5.9.2:ver.bump --- .../language/python3/python3-qt5/actions.py | 2 +- .../language/python3/python3-qt5/pspec.xml | 71 ++++++++++--------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/programming/language/python3/python3-qt5/actions.py b/programming/language/python3/python3-qt5/actions.py index a3f6cdfd8c..74961bd330 100644 --- a/programming/language/python3/python3-qt5/actions.py +++ b/programming/language/python3/python3-qt5/actions.py @@ -32,5 +32,5 @@ def install(): autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) - pisitools.dohtml("doc/html/*") + #pisitools.dohtml("doc/html/*") pisitools.dodoc("NEWS", "README","LICENSE*") diff --git a/programming/language/python3/python3-qt5/pspec.xml b/programming/language/python3/python3-qt5/pspec.xml index 8f5c74d6e9..45d53bff62 100644 --- a/programming/language/python3/python3-qt5/pspec.xml +++ b/programming/language/python3/python3-qt5/pspec.xml @@ -13,29 +13,29 @@ library A set of Python bindings for the Qt 5.x Toolkit Qt is a set of C++ libraries and development tools that includes platform independent abstractions for graphical user interfaces, networking, threads, Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and application settings. PyQt implements 440 of these classes as a set of Python modules. - mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7/PyQt5_gpl-5.7.1.tar.gz + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.9/PyQt5_gpl-5.9.2.tar.gz dbus-devel dbus-python3 dbus-python-common python3-devel python3-sip - qt5-base-devel - qt5-connectivity-devel - qt5-declarative-devel - qt5-location-devel - qt5-multimedia-devel - qt5-sensors-devel - qt5-serialport-devel - qt5-svg-devel - qt5-webchannel-devel - qt5-webkit-devel - qt5-websockets-devel - qt5-x11extras-devel - qt5-xmlpatterns-devel - qt5-quickcontrols2-devel - qt5-script-devel - qt5-designer-devel + qt5-base-devel + qt5-connectivity-devel + qt5-declarative-devel + qt5-location-devel + qt5-multimedia-devel + qt5-sensors-devel + qt5-serialport-devel + qt5-svg-devel + qt5-webchannel-devel + qt5-webkit-devel + qt5-websockets-devel + qt5-x11extras-devel + qt5-xmlpatterns-devel + qt5-quickcontrols2-devel + qt5-script-devel + qt5-designer-devel @@ -49,19 +49,19 @@ libgcc dbus python3 - qt5-base - qt5-sensors - qt5-location - qt5-webkit - qt5-x11extras - qt5-svg - qt5-multimedia - qt5-serialport - qt5-webchannel - qt5-websockets - qt5-declarative - qt5-xmlpatterns - qt5-connectivity + qt5-base + qt5-sensors + qt5-location + qt5-webkit + qt5-x11extras + qt5-svg + qt5-multimedia + qt5-serialport + qt5-webchannel + qt5-websockets + qt5-declarative + qt5-xmlpatterns + qt5-connectivity python3-sip @@ -81,7 +81,7 @@ Development files for python3-qt5 libgcc - qt5-base + qt5-base python3-qt5 @@ -90,6 +90,13 @@ + + 2018-01-22 + 5.9.2 + version bump + Mustafa Cinasal + muscnsl@gmail.com + 2017-06-03 5.7.1 @@ -126,4 +133,4 @@ ayhanyalcinsoy@pisilinux.org - \ No newline at end of file + From 2ea01f9ff5b4ef274ef25c0eeb5860e7a580caa4 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 1 Feb 2018 23:00:20 +0300 Subject: [PATCH 2/2] qt5-webengine --- .../framework/extra-cmake-modules/pspec.xml | 9 ++- desktop/toolkit/qt5/qt5-location/pspec.xml | 1 + .../qt5/qt5-webengine/files/harmony-fix.diff | 69 +++++++++++++++++++ .../qtwebengine-5.9.3-icu-60-build.patch | 11 +++ desktop/toolkit/qt5/qt5-webengine/pspec.xml | 8 +-- desktop/toolkit/qt5/qt5-webkit/pspec.xml | 2 +- desktop/toolkit/qtermwidget5/pspec.xml | 3 +- 7 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 desktop/toolkit/qt5/qt5-webengine/files/harmony-fix.diff create mode 100644 desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.9.3-icu-60-build.patch 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