[arch-commits] Commit in qt5-base/repos (5 files)
Date: Tuesday, March 27, 2018 @ 23:51:00 Author: foutrelis Revision: 320451 archrelease: copy trunk to staging-x86_64 Added: qt5-base/repos/staging-x86_64/ qt5-base/repos/staging-x86_64/PKGBUILD (from rev 320450, qt5-base/trunk/PKGBUILD) qt5-base/repos/staging-x86_64/qtbug-65478.patch (from rev 320450, qt5-base/trunk/qtbug-65478.patch) qt5-base/repos/staging-x86_64/rebuild.list (from rev 320450, qt5-base/trunk/rebuild.list) qt5-base/repos/staging-x86_64/revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch (from rev 320450, qt5-base/trunk/revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch) --+ PKGBUILD | 131 ++ qtbug-65478.patch| 31 ++ rebuild.list | 25 + revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch | 71 + 4 files changed, 258 insertions(+) Copied: qt5-base/repos/staging-x86_64/PKGBUILD (from rev 320450, qt5-base/trunk/PKGBUILD) === --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2018-03-27 23:51:00 UTC (rev 320451) @@ -0,0 +1,131 @@ +# $Id$ +# Maintainer: Felix Yan+# Contributor: Andrea Scarpino + +pkgbase=qt5-base +pkgname=(qt5-base qt5-xcb-private-headers) +_qtver=5.10.1 +pkgver=${_qtver/-/} +pkgrel=7 +arch=('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' 'xdg-utils' + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2' + 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion') +makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' + 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers') +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-/}-everywhere-src-${_qtver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; +revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch +qtbug-65478.patch + qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4; + qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c; + qtbug-66420.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fa091640;) +sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969' +'7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763' +'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6' +'3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5' +'88766a7b73a03e1219800c8fdc56afbf23b15d16cc61c4d77547b1fd2404ea6e' +'9e21893545f950132c9face1d502d32e746b2838d4e8c9075dcf3fa43981fcb2') + +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 + + # Revert upstream commit which breaks some Deepin components (FS#57531) + # https://bugreports.qt.io/browse/QTBUG-66226 + patch -Np1 -i ../revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch + # Fix kexi crash at startup http://bugreports.qt.io/browse/QTBUG-65478 + patch -p1 -i ../qtbug-65478.patch + # Fix restoring column status in kmail and ksysguard + patch -p1 -i ../qheaderview-restore.patch + # Fix QHeaderView regression https://bugreports.qt.io/browse/QTBUG-66444 + patch -p1 -i ../qtbug-66444.patch + # Fix white screen with Mesa 18 https://bugreports.qt.io/browse/QTBUG-66420 + patch -p1 -i ../qtbug-66420.patch +} + +build() { + cd ${_pkgfqn} + + PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \ +-prefix
[arch-commits] Commit in qt5-base/repos (5 files)
Date: Wednesday, March 21, 2018 @ 17:15:24 Author: arojas Revision: 319768 archrelease: copy trunk to testing-x86_64 Added: qt5-base/repos/testing-x86_64/ qt5-base/repos/testing-x86_64/PKGBUILD (from rev 319767, qt5-base/trunk/PKGBUILD) qt5-base/repos/testing-x86_64/qtbug-65478.patch (from rev 319767, qt5-base/trunk/qtbug-65478.patch) qt5-base/repos/testing-x86_64/rebuild.list (from rev 319767, qt5-base/trunk/rebuild.list) qt5-base/repos/testing-x86_64/revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch (from rev 319767, qt5-base/trunk/revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch) --+ PKGBUILD | 131 ++ qtbug-65478.patch| 31 ++ rebuild.list | 25 + revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch | 71 + 4 files changed, 258 insertions(+) Copied: qt5-base/repos/testing-x86_64/PKGBUILD (from rev 319767, qt5-base/trunk/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2018-03-21 17:15:24 UTC (rev 319768) @@ -0,0 +1,131 @@ +# $Id$ +# Maintainer: Felix Yan+# Contributor: Andrea Scarpino + +pkgbase=qt5-base +pkgname=(qt5-base qt5-xcb-private-headers) +_qtver=5.10.1 +pkgver=${_qtver/-/} +pkgrel=6 +arch=('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' 'xdg-utils' + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2' + 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion') +makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' + 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers') +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-/}-everywhere-src-${_qtver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; +revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch +qtbug-65478.patch + qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4; + qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c; + qtbug-66420.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fa091640;) +sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969' +'7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763' +'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6' +'3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5' +'88766a7b73a03e1219800c8fdc56afbf23b15d16cc61c4d77547b1fd2404ea6e' +'9e21893545f950132c9face1d502d32e746b2838d4e8c9075dcf3fa43981fcb2') + +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 + + # Revert upstream commit which breaks some Deepin components (FS#57531) + # https://bugreports.qt.io/browse/QTBUG-66226 + patch -Np1 -i ../revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch + # Fix kexi crash at startup http://bugreports.qt.io/browse/QTBUG-65478 + patch -p1 -i ../qtbug-65478.patch + # Fix restoring column status in kmail and ksysguard + patch -p1 -i ../qheaderview-restore.patch + # Fix QHeaderView regression https://bugreports.qt.io/browse/QTBUG-66444 + patch -p1 -i ../qtbug-66444.patch + # Fix white screen with Mesa 18 https://bugreports.qt.io/browse/QTBUG-66420 + patch -p1 -i ../qtbug-66420.patch +} + +build() { + cd ${_pkgfqn} + + PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \ +-prefix /usr