[arch-commits] Commit in qt5-base/repos (8 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed May 31 07:41:59 UTC 2017
Date: Wednesday, May 31, 2017 @ 07:41:58
Author: foutrelis
Revision: 296882
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
qt5-base/repos/staging-i686/PKGBUILD
(from rev 296881, qt5-base/trunk/PKGBUILD)
qt5-base/repos/staging-i686/rebuild.list
(from rev 296881, qt5-base/trunk/rebuild.list)
qt5-base/repos/staging-x86_64/PKGBUILD
(from rev 296881, qt5-base/trunk/PKGBUILD)
qt5-base/repos/staging-x86_64/rebuild.list
(from rev 296881, qt5-base/trunk/rebuild.list)
Deleted:
qt5-base/repos/staging-i686/PKGBUILD
qt5-base/repos/staging-i686/rebuild.list
qt5-base/repos/staging-x86_64/PKGBUILD
qt5-base/repos/staging-x86_64/rebuild.list
-----------------------------+
/PKGBUILD | 258 ++++++++++++++++++++++++++++++++++++++++++
/rebuild.list | 30 ++++
staging-i686/PKGBUILD | 129 ---------------------
staging-i686/rebuild.list | 15 --
staging-x86_64/PKGBUILD | 129 ---------------------
staging-x86_64/rebuild.list | 15 --
6 files changed, 288 insertions(+), 288 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2017-05-31 07:41:48 UTC (rev 296881)
+++ staging-i686/PKGBUILD 2017-05-31 07:41:58 UTC (rev 296882)
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# 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.8.0
-pkgver=${_qtver/-/}
-pkgrel=13.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'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
-makedepends=('libfbclient' 'libmariadb' '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'
- 'libmariadb: 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"
- qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
- plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
- plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
- plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
- 'e9ab6de042b599638f506d2974598164'
- '438f85a8ecc0f8c066dc0deb5961b6fa'
- '763a796776f3f8bf46cd4a0ed13d4028'
- 'ffacccebfc17dc5a87724d13cefe38e5')
-
-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 logging to systemd journal
- patch -p1 -i ../qt5-base-journald.patch
-
- # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
- patch -p1 -i ../plasma-crash-1.patch
- patch -p1 -i ../plasma-crash-2.patch
- patch -p1 -i ../plasma-crash-3.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/
-}
Copied: qt5-base/repos/staging-i686/PKGBUILD (from rev 296881, qt5-base/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-05-31 07:41:58 UTC (rev 296882)
@@ -0,0 +1,129 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# 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.8.0
+pkgver=${_qtver/-/}
+pkgrel=14.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'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
+makedepends=('libfbclient' 'libmariadb' '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'
+ 'libmariadb: 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"
+ qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
+ plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
+ plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
+ plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
+md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
+ 'e9ab6de042b599638f506d2974598164'
+ '438f85a8ecc0f8c066dc0deb5961b6fa'
+ '763a796776f3f8bf46cd4a0ed13d4028'
+ 'ffacccebfc17dc5a87724d13cefe38e5')
+
+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 logging to systemd journal
+ patch -p1 -i ../qt5-base-journald.patch
+
+ # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
+ patch -p1 -i ../plasma-crash-1.patch
+ patch -p1 -i ../plasma-crash-2.patch
+ patch -p1 -i ../plasma-crash-3.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: staging-i686/rebuild.list
===================================================================
--- staging-i686/rebuild.list 2017-05-31 07:41:48 UTC (rev 296881)
+++ staging-i686/rebuild.list 2017-05-31 07:41:58 UTC (rev 296882)
@@ -1,15 +0,0 @@
-fcitx-qt5 *
-plasma-integration
-gcin
-calibre
-akonadi *
-skrooge *
-kwin
-lxqt-qtplugin
-pyqt5 *
-deepin-qt5integration *
-deepin-tool-kit *
-qt5ct
-qt5-webkit-ng *
-
-* - Also need rebuild for patch Qt version updates
Copied: qt5-base/repos/staging-i686/rebuild.list (from rev 296881, qt5-base/trunk/rebuild.list)
===================================================================
--- staging-i686/rebuild.list (rev 0)
+++ staging-i686/rebuild.list 2017-05-31 07:41:58 UTC (rev 296882)
@@ -0,0 +1,15 @@
+fcitx-qt5 *
+plasma-integration
+gcin
+calibre
+akonadi *
+skrooge *
+kwin
+lxqt-qtplugin
+pyqt5 *
+deepin-qt5integration *
+deepin-tool-kit *
+qt5ct
+qt5-webkit-ng *
+
+* - Also need rebuild for patch Qt version updates
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2017-05-31 07:41:48 UTC (rev 296881)
+++ staging-x86_64/PKGBUILD 2017-05-31 07:41:58 UTC (rev 296882)
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# 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.8.0
-pkgver=${_qtver/-/}
-pkgrel=13.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'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
-makedepends=('libfbclient' 'libmariadb' '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'
- 'libmariadb: 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"
- qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
- plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
- plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
- plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
- 'e9ab6de042b599638f506d2974598164'
- '438f85a8ecc0f8c066dc0deb5961b6fa'
- '763a796776f3f8bf46cd4a0ed13d4028'
- 'ffacccebfc17dc5a87724d13cefe38e5')
-
-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 logging to systemd journal
- patch -p1 -i ../qt5-base-journald.patch
-
- # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
- patch -p1 -i ../plasma-crash-1.patch
- patch -p1 -i ../plasma-crash-2.patch
- patch -p1 -i ../plasma-crash-3.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/
-}
Copied: qt5-base/repos/staging-x86_64/PKGBUILD (from rev 296881, qt5-base/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-05-31 07:41:58 UTC (rev 296882)
@@ -0,0 +1,129 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# 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.8.0
+pkgver=${_qtver/-/}
+pkgrel=14.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'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
+makedepends=('libfbclient' 'libmariadb' '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'
+ 'libmariadb: 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"
+ qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
+ plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
+ plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
+ plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
+md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
+ 'e9ab6de042b599638f506d2974598164'
+ '438f85a8ecc0f8c066dc0deb5961b6fa'
+ '763a796776f3f8bf46cd4a0ed13d4028'
+ 'ffacccebfc17dc5a87724d13cefe38e5')
+
+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 logging to systemd journal
+ patch -p1 -i ../qt5-base-journald.patch
+
+ # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
+ patch -p1 -i ../plasma-crash-1.patch
+ patch -p1 -i ../plasma-crash-2.patch
+ patch -p1 -i ../plasma-crash-3.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: staging-x86_64/rebuild.list
===================================================================
--- staging-x86_64/rebuild.list 2017-05-31 07:41:48 UTC (rev 296881)
+++ staging-x86_64/rebuild.list 2017-05-31 07:41:58 UTC (rev 296882)
@@ -1,15 +0,0 @@
-fcitx-qt5 *
-plasma-integration
-gcin
-calibre
-akonadi *
-skrooge *
-kwin
-lxqt-qtplugin
-pyqt5 *
-deepin-qt5integration *
-deepin-tool-kit *
-qt5ct
-qt5-webkit-ng *
-
-* - Also need rebuild for patch Qt version updates
Copied: qt5-base/repos/staging-x86_64/rebuild.list (from rev 296881, qt5-base/trunk/rebuild.list)
===================================================================
--- staging-x86_64/rebuild.list (rev 0)
+++ staging-x86_64/rebuild.list 2017-05-31 07:41:58 UTC (rev 296882)
@@ -0,0 +1,15 @@
+fcitx-qt5 *
+plasma-integration
+gcin
+calibre
+akonadi *
+skrooge *
+kwin
+lxqt-qtplugin
+pyqt5 *
+deepin-qt5integration *
+deepin-tool-kit *
+qt5ct
+qt5-webkit-ng *
+
+* - Also need rebuild for patch Qt version updates
More information about the arch-commits
mailing list