[arch-commits] Commit in qt5-base/repos (14 files)
Jan Steffens
heftig at archlinux.org
Wed Sep 20 09:44:51 UTC 2017
Date: Wednesday, September 20, 2017 @ 09:44:50
Author: heftig
Revision: 305903
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
qt5-base/repos/testing-i686/PKGBUILD
(from rev 305902, qt5-base/trunk/PKGBUILD)
qt5-base/repos/testing-i686/harmony-fix.diff
(from rev 305902, qt5-base/trunk/harmony-fix.diff)
qt5-base/repos/testing-i686/rebuild.list
(from rev 305902, qt5-base/trunk/rebuild.list)
qt5-base/repos/testing-x86_64/PKGBUILD
(from rev 305902, qt5-base/trunk/PKGBUILD)
qt5-base/repos/testing-x86_64/harmony-fix.diff
(from rev 305902, qt5-base/trunk/harmony-fix.diff)
qt5-base/repos/testing-x86_64/rebuild.list
(from rev 305902, qt5-base/trunk/rebuild.list)
Deleted:
qt5-base/repos/testing-i686/PKGBUILD
qt5-base/repos/testing-i686/emoji.diff
qt5-base/repos/testing-i686/harmony-fix.diff
qt5-base/repos/testing-i686/rebuild.list
qt5-base/repos/testing-x86_64/PKGBUILD
qt5-base/repos/testing-x86_64/emoji.diff
qt5-base/repos/testing-x86_64/harmony-fix.diff
qt5-base/repos/testing-x86_64/rebuild.list
---------------------------------+
/PKGBUILD | 258 ++++++++++++++++++++++++++++++++++++++
/harmony-fix.diff | 152 ++++++++++++++++++++++
/rebuild.list | 40 +++++
testing-i686/PKGBUILD | 132 -------------------
testing-i686/emoji.diff | 13 -
testing-i686/harmony-fix.diff | 76 -----------
testing-i686/rebuild.list | 20 --
testing-x86_64/PKGBUILD | 132 -------------------
testing-x86_64/emoji.diff | 13 -
testing-x86_64/harmony-fix.diff | 76 -----------
testing-x86_64/rebuild.list | 20 --
11 files changed, 450 insertions(+), 482 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-i686/PKGBUILD 2017-09-20 09:44:50 UTC (rev 305903)
@@ -1,132 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.9.1
-pkgver=${_qtver/-/}
-pkgrel=4
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='A cross-platform application and UI framework'
-depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0' 'double-conversion')
-makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
- 'gtk3' 'libpulse' 'cups' 'freetds')
-optdepends=('qt5-svg: to use SVG icon themes'
- 'postgresql-libs: PostgreSQL driver'
- 'libmariadbclient: MariaDB driver'
- 'unixodbc: ODBC driver'
- 'libfbclient: Firebird/iBase driver'
- 'freetds: MS SQL driver'
- 'gtk3: GTK platform plugin')
-conflicts=('qtchooser')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch"
- qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch"
- emoji.diff harmony-fix.diff)
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
- 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
- '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
- 'c103d811ecce25d076f4f3c5ec1e94f1eceb19a4c6818de00f9a22c5b36699bc'
- '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
-
-prepare() {
- cd ${_pkgfqn}
-
- # Build qmake using Arch {C,LD}FLAGS
- # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
- sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
- mkspecs/common/gcc-base.conf
- sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
- mkspecs/common/g++-unix.conf
-
- # Use python2 for Python 2.x
- find . -name '*.py' -exec sed -i \
- 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
- # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
- sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
-
- # Fix accessibility build
- patch -p1 -i ../qtbug-61731.patch
- # Fix doc navigation
- patch -p1 -i ../qtcreatorbug-18448.patch
- # Emoji!
- patch -p1 -i ../emoji.diff
- # Freetype 2.8.1
- patch -p1 -i ../harmony-fix.diff
-}
-
-build() {
- cd ${_pkgfqn}
-
- # FS#38796
- [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
-
- echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
- export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
-
- PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -headerdir /usr/include/qt \
- -archdatadir /usr/lib/qt \
- -datadir /usr/share/qt \
- -sysconfdir /etc/xdg \
- -examplesdir /usr/share/doc/qt/examples \
- -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
- -system-sqlite \
- -openssl-linked \
- -nomake examples \
- -no-rpath \
- -optimized-qmake \
- -dbus-linked \
- -system-harfbuzz \
- -journald \
- -no-use-gold-linker \
- -reduce-relocations ${SSE2}
-
- make
-}
-
-package_qt5-base() {
- pkgdesc='A cross-platform application and UI framework'
-
- cd ${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- install -D -m644 LGPL_EXCEPTION.txt \
- "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
-
- # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
- # Fix wrong qmake path in pri file
- sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
- "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
- # Symlinks for backwards compatibility
- for b in "${pkgdir}"/usr/bin/*; do
- ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
- done
-}
-
-package_qt5-xcb-private-headers() {
- pkgdesc='Private headers for Qt5 Xcb'
-
- depends=("qt5-base=$pkgver")
- optdepends=()
- groups=()
- conflicts=()
-
- cd ${_pkgfqn}
- install -d -m755 "$pkgdir"/usr/include/qtxcb-private
- cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
Copied: qt5-base/repos/testing-i686/PKGBUILD (from rev 305902, qt5-base/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-09-20 09:44:50 UTC (rev 305903)
@@ -0,0 +1,129 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=qt5-base
+pkgname=(qt5-base qt5-xcb-private-headers)
+_qtver=5.9.1
+pkgver=${_qtver/-/}
+pkgrel=5
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0' 'double-conversion')
+makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+ 'gtk3' 'libpulse' 'cups' 'freetds')
+optdepends=('qt5-svg: to use SVG icon themes'
+ 'postgresql-libs: PostgreSQL driver'
+ 'libmariadbclient: MariaDB driver'
+ 'unixodbc: ODBC driver'
+ 'libfbclient: Firebird/iBase driver'
+ 'freetds: MS SQL driver'
+ 'gtk3: GTK platform plugin')
+conflicts=('qtchooser')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch"
+ qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch"
+ harmony-fix.diff)
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+ 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
+ '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
+ '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
+
+prepare() {
+ cd ${_pkgfqn}
+
+ # Build qmake using Arch {C,LD}FLAGS
+ # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
+ sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
+ mkspecs/common/gcc-base.conf
+ sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
+ mkspecs/common/g++-unix.conf
+
+ # Use python2 for Python 2.x
+ find . -name '*.py' -exec sed -i \
+ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
+
+ # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
+ sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
+
+ # Fix accessibility build
+ patch -p1 -i ../qtbug-61731.patch
+ # Fix doc navigation
+ patch -p1 -i ../qtcreatorbug-18448.patch
+ # Freetype 2.8.1
+ patch -p1 -i ../harmony-fix.diff
+}
+
+build() {
+ cd ${_pkgfqn}
+
+ # FS#38796
+ [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
+
+ echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
+ export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+
+ PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
+ -prefix /usr \
+ -docdir /usr/share/doc/qt \
+ -headerdir /usr/include/qt \
+ -archdatadir /usr/lib/qt \
+ -datadir /usr/share/qt \
+ -sysconfdir /etc/xdg \
+ -examplesdir /usr/share/doc/qt/examples \
+ -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+ -system-sqlite \
+ -openssl-linked \
+ -nomake examples \
+ -no-rpath \
+ -optimized-qmake \
+ -dbus-linked \
+ -system-harfbuzz \
+ -journald \
+ -no-use-gold-linker \
+ -reduce-relocations ${SSE2}
+
+ make
+}
+
+package_qt5-base() {
+ pkgdesc='A cross-platform application and UI framework'
+
+ cd ${_pkgfqn}
+ make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+ find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+ # Fix wrong qmake path in pri file
+ sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
+ "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
+
+ # Symlinks for backwards compatibility
+ for b in "${pkgdir}"/usr/bin/*; do
+ ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+ done
+}
+
+package_qt5-xcb-private-headers() {
+ pkgdesc='Private headers for Qt5 Xcb'
+
+ depends=("qt5-base=$pkgver")
+ optdepends=()
+ groups=()
+ conflicts=()
+
+ cd ${_pkgfqn}
+ install -d -m755 "$pkgdir"/usr/include/qtxcb-private
+ cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
+}
Deleted: testing-i686/emoji.diff
===================================================================
--- testing-i686/emoji.diff 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-i686/emoji.diff 2017-09-20 09:44:50 UTC (rev 305903)
@@ -1,13 +0,0 @@
-diff -u -r qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
---- qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp 2017-06-28 11:54:29.000000000 +0200
-+++ qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp 2017-09-15 12:19:03.581896442 +0200
-@@ -749,6 +749,9 @@
- FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- }
-
-+ value.u.s = (const FcChar8 *)"emoji";
-+ FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
-+
- FcConfigSubstitute(0, pattern, FcMatchPattern);
- FcDefaultSubstitute(pattern);
-
Deleted: testing-i686/harmony-fix.diff
===================================================================
--- testing-i686/harmony-fix.diff 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-i686/harmony-fix.diff 2017-09-20 09:44:50 UTC (rev 305903)
@@ -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;
Copied: qt5-base/repos/testing-i686/harmony-fix.diff (from rev 305902, qt5-base/trunk/harmony-fix.diff)
===================================================================
--- testing-i686/harmony-fix.diff (rev 0)
+++ testing-i686/harmony-fix.diff 2017-09-20 09:44:50 UTC (rev 305903)
@@ -0,0 +1,76 @@
+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;
Deleted: testing-i686/rebuild.list
===================================================================
--- testing-i686/rebuild.list 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-i686/rebuild.list 2017-09-20 09:44:50 UTC (rev 305903)
@@ -1,20 +0,0 @@
-fcitx-qt5 *
-plasma-integration
-gcin
-calibre
-akonadi *
-skrooge *
-kwin
-lxqt-qtplugin
-pyqt5 *
-qt5-styleplugins
-deepin-qt5integration *
-deepin-tool-kit *
-deepin-file-manager *
-dtkwidget *
-dtkwm *
-qt5ct
-qt5-webkit *
-libqtxdg *
-
-* - Also need rebuild for patch Qt version updates
Copied: qt5-base/repos/testing-i686/rebuild.list (from rev 305902, qt5-base/trunk/rebuild.list)
===================================================================
--- testing-i686/rebuild.list (rev 0)
+++ testing-i686/rebuild.list 2017-09-20 09:44:50 UTC (rev 305903)
@@ -0,0 +1,20 @@
+fcitx-qt5 *
+plasma-integration
+gcin
+calibre
+akonadi *
+skrooge *
+kwin
+lxqt-qtplugin
+pyqt5 *
+qt5-styleplugins
+deepin-qt5integration *
+deepin-tool-kit *
+deepin-file-manager *
+dtkwidget *
+dtkwm *
+qt5ct
+qt5-webkit *
+libqtxdg *
+
+* - Also need rebuild for patch Qt version updates
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-x86_64/PKGBUILD 2017-09-20 09:44:50 UTC (rev 305903)
@@ -1,132 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.9.1
-pkgver=${_qtver/-/}
-pkgrel=4
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='A cross-platform application and UI framework'
-depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0' 'double-conversion')
-makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
- 'gtk3' 'libpulse' 'cups' 'freetds')
-optdepends=('qt5-svg: to use SVG icon themes'
- 'postgresql-libs: PostgreSQL driver'
- 'libmariadbclient: MariaDB driver'
- 'unixodbc: ODBC driver'
- 'libfbclient: Firebird/iBase driver'
- 'freetds: MS SQL driver'
- 'gtk3: GTK platform plugin')
-conflicts=('qtchooser')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch"
- qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch"
- emoji.diff harmony-fix.diff)
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
- 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
- '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
- 'c103d811ecce25d076f4f3c5ec1e94f1eceb19a4c6818de00f9a22c5b36699bc'
- '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
-
-prepare() {
- cd ${_pkgfqn}
-
- # Build qmake using Arch {C,LD}FLAGS
- # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
- sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
- mkspecs/common/gcc-base.conf
- sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
- mkspecs/common/g++-unix.conf
-
- # Use python2 for Python 2.x
- find . -name '*.py' -exec sed -i \
- 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
- # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
- sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
-
- # Fix accessibility build
- patch -p1 -i ../qtbug-61731.patch
- # Fix doc navigation
- patch -p1 -i ../qtcreatorbug-18448.patch
- # Emoji!
- patch -p1 -i ../emoji.diff
- # Freetype 2.8.1
- patch -p1 -i ../harmony-fix.diff
-}
-
-build() {
- cd ${_pkgfqn}
-
- # FS#38796
- [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
-
- echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
- export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
-
- PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -headerdir /usr/include/qt \
- -archdatadir /usr/lib/qt \
- -datadir /usr/share/qt \
- -sysconfdir /etc/xdg \
- -examplesdir /usr/share/doc/qt/examples \
- -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
- -system-sqlite \
- -openssl-linked \
- -nomake examples \
- -no-rpath \
- -optimized-qmake \
- -dbus-linked \
- -system-harfbuzz \
- -journald \
- -no-use-gold-linker \
- -reduce-relocations ${SSE2}
-
- make
-}
-
-package_qt5-base() {
- pkgdesc='A cross-platform application and UI framework'
-
- cd ${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- install -D -m644 LGPL_EXCEPTION.txt \
- "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
-
- # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
- # Fix wrong qmake path in pri file
- sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
- "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
-
- # Symlinks for backwards compatibility
- for b in "${pkgdir}"/usr/bin/*; do
- ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
- done
-}
-
-package_qt5-xcb-private-headers() {
- pkgdesc='Private headers for Qt5 Xcb'
-
- depends=("qt5-base=$pkgver")
- optdepends=()
- groups=()
- conflicts=()
-
- cd ${_pkgfqn}
- install -d -m755 "$pkgdir"/usr/include/qtxcb-private
- cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
-}
Copied: qt5-base/repos/testing-x86_64/PKGBUILD (from rev 305902, qt5-base/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-09-20 09:44:50 UTC (rev 305903)
@@ -0,0 +1,129 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=qt5-base
+pkgname=(qt5-base qt5-xcb-private-headers)
+_qtver=5.9.1
+pkgver=${_qtver/-/}
+pkgrel=5
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0' 'double-conversion')
+makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+ 'gtk3' 'libpulse' 'cups' 'freetds')
+optdepends=('qt5-svg: to use SVG icon themes'
+ 'postgresql-libs: PostgreSQL driver'
+ 'libmariadbclient: MariaDB driver'
+ 'unixodbc: ODBC driver'
+ 'libfbclient: Firebird/iBase driver'
+ 'freetds: MS SQL driver'
+ 'gtk3: GTK platform plugin')
+conflicts=('qtchooser')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch"
+ qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch"
+ harmony-fix.diff)
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+ 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
+ '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
+ '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
+
+prepare() {
+ cd ${_pkgfqn}
+
+ # Build qmake using Arch {C,LD}FLAGS
+ # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
+ sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
+ mkspecs/common/gcc-base.conf
+ sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
+ mkspecs/common/g++-unix.conf
+
+ # Use python2 for Python 2.x
+ find . -name '*.py' -exec sed -i \
+ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
+
+ # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
+ sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
+
+ # Fix accessibility build
+ patch -p1 -i ../qtbug-61731.patch
+ # Fix doc navigation
+ patch -p1 -i ../qtcreatorbug-18448.patch
+ # Freetype 2.8.1
+ patch -p1 -i ../harmony-fix.diff
+}
+
+build() {
+ cd ${_pkgfqn}
+
+ # FS#38796
+ [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
+
+ echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
+ export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+
+ PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
+ -prefix /usr \
+ -docdir /usr/share/doc/qt \
+ -headerdir /usr/include/qt \
+ -archdatadir /usr/lib/qt \
+ -datadir /usr/share/qt \
+ -sysconfdir /etc/xdg \
+ -examplesdir /usr/share/doc/qt/examples \
+ -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+ -system-sqlite \
+ -openssl-linked \
+ -nomake examples \
+ -no-rpath \
+ -optimized-qmake \
+ -dbus-linked \
+ -system-harfbuzz \
+ -journald \
+ -no-use-gold-linker \
+ -reduce-relocations ${SSE2}
+
+ make
+}
+
+package_qt5-base() {
+ pkgdesc='A cross-platform application and UI framework'
+
+ cd ${_pkgfqn}
+ make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+ find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+ # Fix wrong qmake path in pri file
+ sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
+ "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
+
+ # Symlinks for backwards compatibility
+ for b in "${pkgdir}"/usr/bin/*; do
+ ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+ done
+}
+
+package_qt5-xcb-private-headers() {
+ pkgdesc='Private headers for Qt5 Xcb'
+
+ depends=("qt5-base=$pkgver")
+ optdepends=()
+ groups=()
+ conflicts=()
+
+ cd ${_pkgfqn}
+ install -d -m755 "$pkgdir"/usr/include/qtxcb-private
+ cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
+}
Deleted: testing-x86_64/emoji.diff
===================================================================
--- testing-x86_64/emoji.diff 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-x86_64/emoji.diff 2017-09-20 09:44:50 UTC (rev 305903)
@@ -1,13 +0,0 @@
-diff -u -r qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
---- qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp 2017-06-28 11:54:29.000000000 +0200
-+++ qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp 2017-09-15 12:19:03.581896442 +0200
-@@ -749,6 +749,9 @@
- FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- }
-
-+ value.u.s = (const FcChar8 *)"emoji";
-+ FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
-+
- FcConfigSubstitute(0, pattern, FcMatchPattern);
- FcDefaultSubstitute(pattern);
-
Deleted: testing-x86_64/harmony-fix.diff
===================================================================
--- testing-x86_64/harmony-fix.diff 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-x86_64/harmony-fix.diff 2017-09-20 09:44:50 UTC (rev 305903)
@@ -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;
Copied: qt5-base/repos/testing-x86_64/harmony-fix.diff (from rev 305902, qt5-base/trunk/harmony-fix.diff)
===================================================================
--- testing-x86_64/harmony-fix.diff (rev 0)
+++ testing-x86_64/harmony-fix.diff 2017-09-20 09:44:50 UTC (rev 305903)
@@ -0,0 +1,76 @@
+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;
Deleted: testing-x86_64/rebuild.list
===================================================================
--- testing-x86_64/rebuild.list 2017-09-20 09:41:43 UTC (rev 305902)
+++ testing-x86_64/rebuild.list 2017-09-20 09:44:50 UTC (rev 305903)
@@ -1,20 +0,0 @@
-fcitx-qt5 *
-plasma-integration
-gcin
-calibre
-akonadi *
-skrooge *
-kwin
-lxqt-qtplugin
-pyqt5 *
-qt5-styleplugins
-deepin-qt5integration *
-deepin-tool-kit *
-deepin-file-manager *
-dtkwidget *
-dtkwm *
-qt5ct
-qt5-webkit *
-libqtxdg *
-
-* - Also need rebuild for patch Qt version updates
Copied: qt5-base/repos/testing-x86_64/rebuild.list (from rev 305902, qt5-base/trunk/rebuild.list)
===================================================================
--- testing-x86_64/rebuild.list (rev 0)
+++ testing-x86_64/rebuild.list 2017-09-20 09:44:50 UTC (rev 305903)
@@ -0,0 +1,20 @@
+fcitx-qt5 *
+plasma-integration
+gcin
+calibre
+akonadi *
+skrooge *
+kwin
+lxqt-qtplugin
+pyqt5 *
+qt5-styleplugins
+deepin-qt5integration *
+deepin-tool-kit *
+deepin-file-manager *
+dtkwidget *
+dtkwm *
+qt5ct
+qt5-webkit *
+libqtxdg *
+
+* - Also need rebuild for patch Qt version updates
More information about the arch-commits
mailing list