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

qt5-webengine

Browse Source
This commit is contained in:
Rmys
2018-02-01 23:00:20 +03:00
parent efd29829c4
commit 2ea01f9ff5
7 changed files with 96 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/framework/extra-cmake-modules/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Extra cmake modules for KDE5</Summary>
<Description>Extra cmake modules KDE5</Description>
<Archive sha1sum="ef5c552af9212ee7e0a563b8407f5daf9d2d808e" type="tarxz">mirrors://kde/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz</Archive>
<Archive sha1sum="8cbc897b036b1fc4e57797caf6b15823e98c5e30" type="tarxz">mirrors://kde/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>flex</Dependency>
@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="14">
<Date>2018-02-01</Date>
<Version>5.42.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="13">
<Date>2017-12-15</Date>
<Version>5.41.0</Version>
desktop/toolkit/qt5/qt5-location/pspec.xml
+1
View File
@@ -17,6 +17,7 @@
<Dependency>glib2-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-declarative-devel</Dependency>
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
+4 -4
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>
@@ -153,7 +153,7 @@
<History>
<Update release="4">
<Date>2018-01-18</Date>
<Date>2018-02-01</Date>
<Version>5.9.3</Version>
<Comment>Release bump.</Comment>
<Name>Kamil Atlı</Name>
desktop/toolkit/qt5/qt5-webkit/pspec.xml
+1 -1
View File
@@ -132,7 +132,7 @@
<History>
<Update release="7">
<Date>2018-01-18</Date>
<Date>2018-02-01</Date>
<Version>5.9.0</Version>
<Comment>Version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
desktop/toolkit/qtermwidget5/pspec.xml
+2 -1
View File
@@ -15,6 +15,7 @@
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>lxqt-build-tools</Dependency>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-linguist</Dependency>
</BuildDependencies>
@@ -48,7 +49,7 @@
</Package>
<History>
<Update release="5">
<Date>2017-10-24</Date>
<Date>2018-02-01</Date>
<Version>0.8.0</Version>
<Comment>Version bump.</Comment>
<Name>Ayhan Yalçınsoy</Name>