ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

qt5: 5.9.3 -> 5.10.0

Browse Source
This commit is contained in:
Danny Rawlins 2017-12-24 14:04:31 +11:00
parent b7502a7080
commit b281fbc70b
5 changed files with 3767 additions and 3515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7182
qt5/.footprint
View File

File diff suppressed because it is too large Load Diff

3
qt5/.md5sum
View File

@ -1,3 +1,2 @@
8fdc8dc23b19c1c00e817d5c56eac1a0 harmony-fix.patch
eae2435509493a2084405714e0a9bdf9 qt-everywhere-opensource-src-5.9.3.tar.xz
c5e275ab0ed7ee61d0f4b82cd471770d qt-everywhere-src-5.10.0.tar.xz
67165bacd3231b57d7b7db1e6bcb7d89 qt5-logo.png

9
qt5/.signature
View File

@ -1,7 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/R38Zh4neJ4+Vmql6UQ2Umeg4gg5olqEpSLrBe4xBtkJ1beg38SYsCtTlisDOSsosBU965DyBNKxUXOhVxeaiAk=
SHA256 (Pkgfile) = 79459675bd089c76163cdf35d71c117cec405f393e9100d9276f7ab0789a377c
SHA256 (.footprint) = 34eb01b4a9bab8b0312001a7c5ed388a19854b7dda2d7a10f546af6b55c01b4e
SHA256 (qt-everywhere-opensource-src-5.9.3.tar.xz) = 57acd8f03f830c2d7dc29fbe28aaa96781b2b9bdddce94196e6761a0f88c6046
RWSE3ohX2g5d/WBSoWjETPTHFotfPVlkJnl/9l9lbEz0m7MyrkgUvBpvZ4ZeZADdcumRdRCYZqM6L3NAbsSyJMI5A5D+fCpRXAE=
SHA256 (Pkgfile) = 0a0e3b669fd3f94bcff4530edefcb51ce75683771cdb07ba61ea9307f62b58b7
SHA256 (.footprint) = b59ade93c0608bc1efbff003da7d4c2fb96cd4fb277956dd5b47bf8f9d6d3a65
SHA256 (qt-everywhere-src-5.10.0.tar.xz) = 936d4cf5d577298f4f9fdb220e85b008ae321554a5fcd38072dc327a7296230e
SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e
SHA256 (harmony-fix.patch) = 8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3

12
qt5/Pkgfile
View File

@ -4,17 +4,13 @@
# Depends on: dbus gdk-pixbuf gst-plugins-base libepoxy libmng libxkbcommon mtdev xorg-libxcomposite xorg-libxcursor xorg-libxi xorg-libxinerama xorg-libxrandr xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-wm
name=qt5
version=5.9.3
version=5.10.0
release=1
source=(https://download.qt.io/official_releases/qt/${version::3}/$version/single/qt-everywhere-opensource-src-$version.tar.xz
qt5-logo.png
harmony-fix.patch)
source=(https://download.qt.io/official_releases/qt/${version::4}/$version/single/qt-everywhere-src-$version.tar.xz
qt5-logo.png)
build() {
cd qt-everywhere-opensource-src-$version
# Freetype 2.8.1
patch -d qtbase -p1 -i $SRC/harmony-fix.patch
cd qt-everywhere-src-$version
# Fix missing private includes
# https://bugreports.qt.io/browse/QTBUG-37417

76
qt5/harmony-fix.patch
View File

@ -1,76 +0,0 @@
diff -u -r qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp qtbase-opensource-src-5.9.1-ftharmony/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
--- qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp 2017-06-28 11:54:29.000000000 +0200
+++ qtbase-opensource-src-5.9.1-ftharmony/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp 2017-09-19 21:31:27.803755180 +0200
@@ -786,6 +786,7 @@
m_subPixelPositionCount = 4;
forceAutoHint = false;
stemDarkeningDriver = false;
+ hasLcdRendering = false;
}
QFontEngineFT::~QFontEngineFT()
@@ -909,6 +910,15 @@
}
#endif
+ FT_Int amajor = 0, aminor = 0, apatch = 0;
+ FT_Library_Version(qt_getFreetype(), &amajor, &aminor, &apatch);
+ if (amajor > 2 || amajor == 2 && (aminor > 8 || aminor == 8 && apatch >= 1))
+ hasLcdRendering = true;
+#if defined(QT_USE_FREETYPE_LCDFILTER)
+ else if (FT_Library_SetLcdFilter(qt_getFreetype(), FT_LCD_FILTER_NONE) == FT_Err_Ok)
+ hasLcdRendering = true;
+#endif
+
fontDef.styleName = QString::fromUtf8(face->style_name);
if (!freetype->hbFace) {
@@ -1165,21 +1175,19 @@
int glyph_buffer_size = 0;
QScopedArrayPointer<uchar> glyph_buffer;
+ if (hasLcdRendering && slot->format == FT_GLYPH_FORMAT_OUTLINE && (hsubpixel || vfactor != 1)) {
#if defined(QT_USE_FREETYPE_LCDFILTER)
- bool useFreetypeRenderGlyph = false;
- if (slot->format == FT_GLYPH_FORMAT_OUTLINE && (hsubpixel || vfactor != 1)) {
- err = FT_Library_SetLcdFilter(slot->library, (FT_LcdFilter)lcdFilterType);
- if (err == FT_Err_Ok)
- useFreetypeRenderGlyph = true;
- }
+ FT_Library_SetLcdFilter(slot->library, (FT_LcdFilter)lcdFilterType);
+#endif
- if (useFreetypeRenderGlyph) {
err = FT_Render_Glyph(slot, hsubpixel ? FT_RENDER_MODE_LCD : FT_RENDER_MODE_LCD_V);
if (err != FT_Err_Ok)
qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph);
+#if defined(QT_USE_FREETYPE_LCDFILTER)
FT_Library_SetLcdFilter(slot->library, FT_LCD_FILTER_NONE);
+#endif
info.height = slot->bitmap.rows / vfactor;
info.width = hsubpixel ? slot->bitmap.width / 3 : slot->bitmap.width;
@@ -1193,9 +1201,7 @@
convertRGBToARGB(slot->bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, slot->bitmap.pitch, subpixelType != Subpixel_RGB, false);
else if (vfactor != 1)
convertRGBToARGB_V(slot->bitmap.buffer, (uint *)glyph_buffer.data(), info.width, info.height, slot->bitmap.pitch, subpixelType != Subpixel_VRGB, false);
- } else
-#endif
- {
+ } else {
int left = slot->metrics.horiBearingX;
int right = slot->metrics.horiBearingX + slot->metrics.width;
int top = slot->metrics.horiBearingY;
diff -u -r qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h qtbase-opensource-src-5.9.1-ftharmony/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
--- qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h 2017-06-28 11:54:29.000000000 +0200
+++ qtbase-opensource-src-5.9.1-ftharmony/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h 2017-09-19 21:27:52.433263233 +0200
@@ -311,6 +311,7 @@
bool cacheEnabled;
bool forceAutoHint;
bool stemDarkeningDriver;
+ bool hasLcdRendering;
private:
friend class QFontEngineFTRawFont;