Date: Thursday, February 9, 2017 @ 07:47:37 Author: arojas Revision: 288277
archrelease: copy trunk to extra-i686, extra-x86_64 Added: qt5-base/repos/extra-i686/PKGBUILD (from rev 288276, qt5-base/trunk/PKGBUILD) qt5-base/repos/extra-i686/rebuild.list (from rev 288276, qt5-base/trunk/rebuild.list) qt5-base/repos/extra-x86_64/PKGBUILD (from rev 288276, qt5-base/trunk/PKGBUILD) qt5-base/repos/extra-x86_64/rebuild.list (from rev 288276, 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 | 220 ++++++++++++++++++++++++++++++++++++++++++++ /rebuild.list | 30 ++++++ extra-i686/PKGBUILD | 99 ------------------- extra-i686/rebuild.list | 15 --- extra-x86_64/PKGBUILD | 99 ------------------- extra-x86_64/rebuild.list | 15 --- 6 files changed, 250 insertions(+), 228 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-02-09 07:47:04 UTC (rev 288276) +++ extra-i686/PKGBUILD 2017-02-09 07:47:37 UTC (rev 288277) @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-base -_qtver=5.8.0 -pkgver=${_qtver/-/} -pkgrel=3 -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') -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="${pkgname/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") -md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9' - '160fde81fe882c4241f04634f53691ad') - -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 -} - -build() { - cd ${_pkgfqn} - - # FS#38796 - [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2" - - 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() { - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install - - install -D -m644 LGPL_EXCEPTION.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/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 -} Copied: qt5-base/repos/extra-i686/PKGBUILD (from rev 288276, qt5-base/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-02-09 07:47:37 UTC (rev 288277) @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-base +_qtver=5.8.0 +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' + 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups') +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="${pkgname/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' + '160fde81fe882c4241f04634f53691ad' + '078d8a051c06abf28451fd2cdb7f19ce' + '92daaa3ebd7cf10ee725b963e44c95a7' + '76ab122615f1ba2d68c83477f82e389e') + +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" + + 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() { + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/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 +} Deleted: extra-i686/rebuild.list =================================================================== --- extra-i686/rebuild.list 2017-02-09 07:47:04 UTC (rev 288276) +++ extra-i686/rebuild.list 2017-02-09 07:47:37 UTC (rev 288277) @@ -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/extra-i686/rebuild.list (from rev 288276, qt5-base/trunk/rebuild.list) =================================================================== --- extra-i686/rebuild.list (rev 0) +++ extra-i686/rebuild.list 2017-02-09 07:47:37 UTC (rev 288277) @@ -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: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-02-09 07:47:04 UTC (rev 288276) +++ extra-x86_64/PKGBUILD 2017-02-09 07:47:37 UTC (rev 288277) @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-base -_qtver=5.8.0 -pkgver=${_qtver/-/} -pkgrel=3 -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') -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="${pkgname/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") -md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9' - '160fde81fe882c4241f04634f53691ad') - -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 -} - -build() { - cd ${_pkgfqn} - - # FS#38796 - [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2" - - 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() { - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install - - install -D -m644 LGPL_EXCEPTION.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/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 -} Copied: qt5-base/repos/extra-x86_64/PKGBUILD (from rev 288276, qt5-base/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-02-09 07:47:37 UTC (rev 288277) @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-base +_qtver=5.8.0 +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' + 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups') +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="${pkgname/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' + '160fde81fe882c4241f04634f53691ad' + '078d8a051c06abf28451fd2cdb7f19ce' + '92daaa3ebd7cf10ee725b963e44c95a7' + '76ab122615f1ba2d68c83477f82e389e') + +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" + + 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() { + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/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 +} Deleted: extra-x86_64/rebuild.list =================================================================== --- extra-x86_64/rebuild.list 2017-02-09 07:47:04 UTC (rev 288276) +++ extra-x86_64/rebuild.list 2017-02-09 07:47:37 UTC (rev 288277) @@ -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/extra-x86_64/rebuild.list (from rev 288276, qt5-base/trunk/rebuild.list) =================================================================== --- extra-x86_64/rebuild.list (rev 0) +++ extra-x86_64/rebuild.list 2017-02-09 07:47:37 UTC (rev 288277) @@ -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