Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4425 from Rmys/master

Browse Source 
python3-qt5-5.9.2:ver.bump
This commit is contained in:
Rmys
2018-02-01 23:02:15 +03:00
committed by GitHub
parent e9f39bf85c 2ea01f9ff5
commit d40c334eb3
5 changed files with 123 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webengine/files/harmony-fix.diff
+69
View File
@@ -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;
}
}
}
desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.9.3-icu-60-build.patch
+11
View File
@@ -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
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+3 -3
View File
@@ -70,9 +70,9 @@
<Dependency>git</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">qt5-webengine-nss.patch</Patch>
<Patch level="1">use_system_re2.patch</Patch>-->
<!--<Patch level="1">do-not-use-system-ninja.patch</Patch>-->
<!-- <Patch level="1">qtwebengine-5.7.0-icu58.patch</Patch> -->
<Patch level="1">qtwebengine-5.9.3-icu-60-build.patch</Patch>
<Patch level="1">harmony-fix.diff</Patch>
</Patches>
</Source>
programming/language/python3/python3-qt5/actions.py
+1 -1
View File
@@ -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*")
programming/language/python3/python3-qt5/pspec.xml
+39 -32
View File
@@ -13,29 +13,29 @@
<IsA>library</IsA>
<Summary>A set of Python bindings for the Qt 5.x Toolkit</Summary>
<Description>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.</Description>
<Archive sha1sum="46aae31f8196d4beed878bc70ed9ed2938f3c73f" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.7/PyQt5_gpl-5.7.1.tar.gz</Archive>
<Archive sha1sum="058c5b37981b515cc4e16faa04a4a6d8892cdaa9" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.9/PyQt5_gpl-5.9.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>dbus-devel</Dependency>
<Dependency>dbus-python3</Dependency>
<Dependency>dbus-python-common</Dependency>
<Dependency versionFrom="3.6.0">python3-devel</Dependency>
<Dependency versionFrom="4.19.1">python3-sip</Dependency>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-connectivity-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-serialport-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-svg-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-webkit-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-websockets-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-quickcontrols2-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-script-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-connectivity-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-location-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-serialport-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-svg-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.9.0">qt5-webkit-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-websockets-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-quickcontrols2-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-script-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-designer-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>PyQt5_gpl-5.6-dbus_ftbfs.patch</Patch> -->
@@ -49,19 +49,19 @@
<Dependency>libgcc</Dependency>
<Dependency>dbus</Dependency>
<Dependency>python3</Dependency>
<Dependency versionFrom="5.7.1">qt5-base</Dependency>
<Dependency versionFrom="5.7.1">qt5-sensors</Dependency>
<Dependency versionFrom="5.7.1">qt5-location</Dependency>
<Dependency versionFrom="5.7.1">qt5-webkit</Dependency>
<Dependency versionFrom="5.7.1">qt5-x11extras</Dependency>
<Dependency versionFrom="5.7.1">qt5-svg</Dependency>
<Dependency versionFrom="5.7.1">qt5-multimedia</Dependency>
<Dependency versionFrom="5.7.1">qt5-serialport</Dependency>
<Dependency versionFrom="5.7.1">qt5-webchannel</Dependency>
<Dependency versionFrom="5.7.1">qt5-websockets</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.7.1">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.7.1">qt5-connectivity</Dependency>
<Dependency versionFrom="5.9.3">qt5-base</Dependency>
<Dependency versionFrom="5.9.3">qt5-sensors</Dependency>
<Dependency versionFrom="5.9.3">qt5-location</Dependency>
<Dependency versionFrom="5.9.0">qt5-webkit</Dependency>
<Dependency versionFrom="5.9.3">qt5-x11extras</Dependency>
<Dependency versionFrom="5.9.3">qt5-svg</Dependency>
<Dependency versionFrom="5.9.3">qt5-multimedia</Dependency>
<Dependency versionFrom="5.9.3">qt5-serialport</Dependency>
<Dependency versionFrom="5.9.3">qt5-webchannel</Dependency>
<Dependency versionFrom="5.9.3">qt5-websockets</Dependency>
<Dependency versionFrom="5.9.3">qt5-declarative</Dependency>
<Dependency versionFrom="5.9.3">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.9.3">qt5-connectivity</Dependency>
<Dependency>python3-sip</Dependency>
</RuntimeDependencies>
<Files>
@@ -81,7 +81,7 @@
<Summary>Development files for python3-qt5</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.7.1">qt5-base</Dependency>
<Dependency versionFrom="5.9.3">qt5-base</Dependency>
<Dependency release="current">python3-qt5</Dependency>
</RuntimeDependencies>
<Files>
@@ -90,6 +90,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-01-22</Date>
<Version>5.9.2</Version>
<Comment>version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2017-06-03</Date>
<Version>5.7.1</Version>
@@ -126,4 +133,4 @@
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>