Date: Tuesday, July 4, 2017 @ 12:34:21
Author: arojas
Revision: 299669
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qt5-base/repos/extra-i686/PKGBUILD
(from rev 299668, qt5-base/trunk/PKGBUILD)
qt5-base/repos/extra-i686/rebuild.list
(from rev 299668, qt5-base/trunk/rebuild.list)
qt5-base/repos/extra-x86_64/PKGBUILD
(from rev 299668, qt5-base/trunk/PKGBUILD)
qt5-base/repos/extra-x86_64/rebuild.list
(from rev 299668, qt5-base/trunk/rebuild.list)
Deleted:
qt5-base/repos/extra-i686/PKGBUILD
qt5-base/repos/extra-i686/rebuild.list
qt5-base/repos/extra-x86_64/PKGBUILD
qt5-base/repos/extra-x86_64/rebuild.list
---------------------------+
/PKGBUILD | 250 ++++++++++++++++++++++++++++++++++++++++++++
/rebuild.list | 34 +++++
extra-i686/PKGBUILD | 116 --------------------
extra-i686/rebuild.list | 17 --
extra-x86_64/PKGBUILD | 116 --------------------
extra-x86_64/rebuild.list | 17 --
6 files changed, 284 insertions(+), 266 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-07-04 12:33:39 UTC (rev 299668)
+++ extra-i686/PKGBUILD 2017-07-04 12:34:21 UTC (rev 299669)
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# 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.1
-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";)
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6')
-
-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
-}
-
-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/extra-i686/PKGBUILD (from rev 299668,
qt5-base/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-07-04 12:34:21 UTC (rev 299669)
@@ -0,0 +1,125 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# 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.1
+pkgver=${_qtver/-/}
+pkgrel=2
+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";)
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+ 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
+ '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3')
+
+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
+}
+
+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: extra-i686/rebuild.list
===================================================================
--- extra-i686/rebuild.list 2017-07-04 12:33:39 UTC (rev 299668)
+++ extra-i686/rebuild.list 2017-07-04 12:34:21 UTC (rev 299669)
@@ -1,17 +0,0 @@
-fcitx-qt5 *
-plasma-integration
-gcin
-calibre
-akonadi *
-skrooge *
-kwin
-lxqt-qtplugin
-pyqt5 *
-deepin-qt5integration *
-deepin-tool-kit *
-deepin-file-manager *
-qt5ct
-qt5-webkit *
-libqtxdg *
-
-* - Also need rebuild for patch Qt version updates
Copied: qt5-base/repos/extra-i686/rebuild.list (from rev 299668,
qt5-base/trunk/rebuild.list)
===================================================================
--- extra-i686/rebuild.list (rev 0)
+++ extra-i686/rebuild.list 2017-07-04 12:34:21 UTC (rev 299669)
@@ -0,0 +1,17 @@
+fcitx-qt5 *
+plasma-integration
+gcin
+calibre
+akonadi *
+skrooge *
+kwin
+lxqt-qtplugin
+pyqt5 *
+deepin-qt5integration *
+deepin-tool-kit *
+deepin-file-manager *
+qt5ct
+qt5-webkit *
+libqtxdg *
+
+* - Also need rebuild for patch Qt version updates
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-07-04 12:33:39 UTC (rev 299668)
+++ extra-x86_64/PKGBUILD 2017-07-04 12:34:21 UTC (rev 299669)
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# 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.1
-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";)
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6')
-
-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
-}
-
-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/extra-x86_64/PKGBUILD (from rev 299668,
qt5-base/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-07-04 12:34:21 UTC (rev 299669)
@@ -0,0 +1,125 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# 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.1
+pkgver=${_qtver/-/}
+pkgrel=2
+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";)
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+ 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
+ '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3')
+
+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
+}
+
+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: extra-x86_64/rebuild.list
===================================================================
--- extra-x86_64/rebuild.list 2017-07-04 12:33:39 UTC (rev 299668)
+++ extra-x86_64/rebuild.list 2017-07-04 12:34:21 UTC (rev 299669)
@@ -1,17 +0,0 @@
-fcitx-qt5 *
-plasma-integration
-gcin
-calibre
-akonadi *
-skrooge *
-kwin
-lxqt-qtplugin
-pyqt5 *
-deepin-qt5integration *
-deepin-tool-kit *
-deepin-file-manager *
-qt5ct
-qt5-webkit *
-libqtxdg *
-
-* - Also need rebuild for patch Qt version updates
Copied: qt5-base/repos/extra-x86_64/rebuild.list (from rev 299668,
qt5-base/trunk/rebuild.list)
===================================================================
--- extra-x86_64/rebuild.list (rev 0)
+++ extra-x86_64/rebuild.list 2017-07-04 12:34:21 UTC (rev 299669)
@@ -0,0 +1,17 @@
+fcitx-qt5 *
+plasma-integration
+gcin
+calibre
+akonadi *
+skrooge *
+kwin
+lxqt-qtplugin
+pyqt5 *
+deepin-qt5integration *
+deepin-tool-kit *
+deepin-file-manager *
+qt5ct
+qt5-webkit *
+libqtxdg *
+
+* - Also need rebuild for patch Qt version updates
