Date: Saturday, October 7, 2017 @ 06:38:33 Author: arojas Revision: 307071
archrelease: copy trunk to staging-i686, staging-x86_64 Added: qt5-base/repos/staging-i686/ qt5-base/repos/staging-i686/PKGBUILD (from rev 307070, qt5-base/trunk/PKGBUILD) qt5-base/repos/staging-i686/harmony-fix.diff (from rev 307070, qt5-base/trunk/harmony-fix.diff) qt5-base/repos/staging-i686/rebuild.list (from rev 307070, qt5-base/trunk/rebuild.list) qt5-base/repos/staging-x86_64/ qt5-base/repos/staging-x86_64/PKGBUILD (from rev 307070, qt5-base/trunk/PKGBUILD) qt5-base/repos/staging-x86_64/harmony-fix.diff (from rev 307070, qt5-base/trunk/harmony-fix.diff) qt5-base/repos/staging-x86_64/rebuild.list (from rev 307070, qt5-base/trunk/rebuild.list) ---------------------------------+ staging-i686/PKGBUILD | 121 ++++++++++++++++++++++++++++++++++++++ staging-i686/harmony-fix.diff | 76 +++++++++++++++++++++++ staging-i686/rebuild.list | 19 +++++ staging-x86_64/PKGBUILD | 121 ++++++++++++++++++++++++++++++++++++++ staging-x86_64/harmony-fix.diff | 76 +++++++++++++++++++++++ staging-x86_64/rebuild.list | 19 +++++ 6 files changed, 432 insertions(+) Copied: qt5-base/repos/staging-i686/PKGBUILD (from rev 307070, qt5-base/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2017-10-07 06:38:33 UTC (rev 307071) @@ -0,0 +1,121 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgbase=qt5-base +pkgname=(qt5-base qt5-xcb-private-headers) +_qtver=5.9.2 +pkgver=${_qtver/-/} +pkgrel=1 +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" + harmony-fix.diff) +sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b' + '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 + + # 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/staging-i686/harmony-fix.diff (from rev 307070, qt5-base/trunk/harmony-fix.diff) =================================================================== --- staging-i686/harmony-fix.diff (rev 0) +++ staging-i686/harmony-fix.diff 2017-10-07 06:38:33 UTC (rev 307071) @@ -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; Copied: qt5-base/repos/staging-i686/rebuild.list (from rev 307070, qt5-base/trunk/rebuild.list) =================================================================== --- staging-i686/rebuild.list (rev 0) +++ staging-i686/rebuild.list 2017-10-07 06:38:33 UTC (rev 307071) @@ -0,0 +1,19 @@ +fcitx-qt5 * +plasma-integration +gcin +calibre +akonadi * +skrooge * +kwin +lxqt-qtplugin +pyqt5 * +qt5-styleplugins * +deepin-qt5integration * +deepin-file-manager * +dtkwidget * +dtkwm * +qt5ct +qt5-webkit * +libqtxdg * + +* - Also need rebuild for patch Qt version updates Copied: qt5-base/repos/staging-x86_64/PKGBUILD (from rev 307070, qt5-base/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2017-10-07 06:38:33 UTC (rev 307071) @@ -0,0 +1,121 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgbase=qt5-base +pkgname=(qt5-base qt5-xcb-private-headers) +_qtver=5.9.2 +pkgver=${_qtver/-/} +pkgrel=1 +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" + harmony-fix.diff) +sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b' + '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 + + # 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/staging-x86_64/harmony-fix.diff (from rev 307070, qt5-base/trunk/harmony-fix.diff) =================================================================== --- staging-x86_64/harmony-fix.diff (rev 0) +++ staging-x86_64/harmony-fix.diff 2017-10-07 06:38:33 UTC (rev 307071) @@ -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; Copied: qt5-base/repos/staging-x86_64/rebuild.list (from rev 307070, qt5-base/trunk/rebuild.list) =================================================================== --- staging-x86_64/rebuild.list (rev 0) +++ staging-x86_64/rebuild.list 2017-10-07 06:38:33 UTC (rev 307071) @@ -0,0 +1,19 @@ +fcitx-qt5 * +plasma-integration +gcin +calibre +akonadi * +skrooge * +kwin +lxqt-qtplugin +pyqt5 * +qt5-styleplugins * +deepin-qt5integration * +deepin-file-manager * +dtkwidget * +dtkwm * +qt5ct +qt5-webkit * +libqtxdg * + +* - Also need rebuild for patch Qt version updates