[arch-commits] Commit in qt5-base/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Wed Dec 14 10:36:36 UTC 2016
Date: Wednesday, December 14, 2016 @ 10:36:35
Author: arojas
Revision: 283158
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
qt5-base/repos/testing-i686/PKGBUILD
(from rev 283157, qt5-base/trunk/PKGBUILD)
qt5-base/repos/testing-i686/no-gtk-qpa-on-wayland.patch
(from rev 283157, qt5-base/trunk/no-gtk-qpa-on-wayland.patch)
qt5-base/repos/testing-i686/rebuild.list
(from rev 283157, qt5-base/trunk/rebuild.list)
qt5-base/repos/testing-x86_64/PKGBUILD
(from rev 283157, qt5-base/trunk/PKGBUILD)
qt5-base/repos/testing-x86_64/no-gtk-qpa-on-wayland.patch
(from rev 283157, qt5-base/trunk/no-gtk-qpa-on-wayland.patch)
qt5-base/repos/testing-x86_64/rebuild.list
(from rev 283157, qt5-base/trunk/rebuild.list)
Deleted:
qt5-base/repos/testing-i686/PKGBUILD
qt5-base/repos/testing-i686/no-gtk-qpa-on-wayland.patch
qt5-base/repos/testing-i686/rebuild.list
qt5-base/repos/testing-x86_64/PKGBUILD
qt5-base/repos/testing-x86_64/no-gtk-qpa-on-wayland.patch
qt5-base/repos/testing-x86_64/rebuild.list
--------------------------------------------+
/PKGBUILD | 216 +++++++++++++++++++++++++++
/no-gtk-qpa-on-wayland.patch | 26 +++
/rebuild.list | 18 ++
testing-i686/PKGBUILD | 108 -------------
testing-i686/no-gtk-qpa-on-wayland.patch | 13 -
testing-i686/rebuild.list | 9 -
testing-x86_64/PKGBUILD | 108 -------------
testing-x86_64/no-gtk-qpa-on-wayland.patch | 13 -
testing-x86_64/rebuild.list | 9 -
9 files changed, 260 insertions(+), 260 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-12-14 10:22:24 UTC (rev 283157)
+++ testing-i686/PKGBUILD 2016-12-14 10:36:35 UTC (rev 283158)
@@ -1,108 +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>
-
-pkgname=qt5-base
-_qtver=5.7.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' 'libgl' 'fontconfig'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
-makedepends=('mtdev' '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'
- 'mtdev: evdev plugin'
- '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"
- qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch"
- qtbug-55583.patch::"https://github.com/qt/qtbase/commit/84ea00d4.patch")
-md5sums=('f0809befe04160fbb73bbf38a06a2073'
- 'c86af27562bbbe05c3defd63d00130fd'
- '7b11584d9ea1ccb6c419e9b9816dee63')
-
-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 libsystemd-journal detection
- sed -e 's|libsystemd-journal|libsystemd|' -i config.tests/unix/journald/journald.pro -i src/corelib/global/global.pri
-
- # Don't unload plugins in QPluginLoader https://bugreports.qt.io/browse/QTBUG-49061
- patch -p1 -i ../qtbug-49061.patch
-
- # Fix file chooser segfault on gnome/wayland https://bugreports.qt.io/browse/QTBUG-55583
- patch -p1 -i ../qtbug-55583.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/testing-i686/PKGBUILD (from rev 283157, qt5-base/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-12-14 10:36:35 UTC (rev 283158)
@@ -0,0 +1,108 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-base
+_qtver=5.7.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' 'libgl' 'fontconfig'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
+makedepends=('mtdev' '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'
+ 'mtdev: evdev plugin'
+ '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"
+ qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch"
+ qtbug-55583.patch::"https://github.com/qt/qtbase/commit/84ea00d4.patch")
+md5sums=('f0809befe04160fbb73bbf38a06a2073'
+ 'c86af27562bbbe05c3defd63d00130fd'
+ '7b11584d9ea1ccb6c419e9b9816dee63')
+
+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 libsystemd-journal detection
+ sed -e 's|libsystemd-journal|libsystemd|' -i config.tests/unix/journald/journald.pro -i src/corelib/global/global.pri
+
+ # Don't unload plugins in QPluginLoader https://bugreports.qt.io/browse/QTBUG-49061
+ patch -p1 -i ../qtbug-49061.patch
+
+ # Fix file chooser segfault on gnome/wayland https://bugreports.qt.io/browse/QTBUG-55583
+ patch -p1 -i ../qtbug-55583.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: testing-i686/no-gtk-qpa-on-wayland.patch
===================================================================
--- testing-i686/no-gtk-qpa-on-wayland.patch 2016-12-14 10:22:24 UTC (rev 283157)
+++ testing-i686/no-gtk-qpa-on-wayland.patch 2016-12-14 10:36:35 UTC (rev 283158)
@@ -1,13 +0,0 @@
-diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-index db264d1..e3cb2f3 100644
---- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-@@ -814,7 +814,7 @@ QStringList QGenericUnixTheme::themeNames()
- #ifndef QT_NO_SETTINGS
- result.push_back(QLatin1String(QKdeTheme::name));
- #endif
-- } else if (gtkBasedEnvironments.contains(desktopName)) {
-+ } else if (gtkBasedEnvironments.contains(desktopName) && QString::fromLocal8Bit(qgetenv("XDG_SESSION_TYPE")) != QLatin1String("wayland")) {
- // prefer the GTK3 theme implementation with native dialogs etc.
- result.push_back(QStringLiteral("gtk3"));
- // fallback to the generic Gnome theme if loading the GTK3 theme fails
Copied: qt5-base/repos/testing-i686/no-gtk-qpa-on-wayland.patch (from rev 283157, qt5-base/trunk/no-gtk-qpa-on-wayland.patch)
===================================================================
--- testing-i686/no-gtk-qpa-on-wayland.patch (rev 0)
+++ testing-i686/no-gtk-qpa-on-wayland.patch 2016-12-14 10:36:35 UTC (rev 283158)
@@ -0,0 +1,13 @@
+diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+index db264d1..e3cb2f3 100644
+--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
++++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+@@ -814,7 +814,7 @@ QStringList QGenericUnixTheme::themeNames()
+ #ifndef QT_NO_SETTINGS
+ result.push_back(QLatin1String(QKdeTheme::name));
+ #endif
+- } else if (gtkBasedEnvironments.contains(desktopName)) {
++ } else if (gtkBasedEnvironments.contains(desktopName) && QString::fromLocal8Bit(qgetenv("XDG_SESSION_TYPE")) != QLatin1String("wayland")) {
+ // prefer the GTK3 theme implementation with native dialogs etc.
+ result.push_back(QStringLiteral("gtk3"));
+ // fallback to the generic Gnome theme if loading the GTK3 theme fails
Deleted: testing-i686/rebuild.list
===================================================================
--- testing-i686/rebuild.list 2016-12-14 10:22:24 UTC (rev 283157)
+++ testing-i686/rebuild.list 2016-12-14 10:36:35 UTC (rev 283158)
@@ -1,9 +0,0 @@
-fcitx-qt5
-plasma-integration
-gcin
-calibre
-akonadi
-skrooge
-kwin
-lxqt-qtplugin
-qt5dxcb-plugin
Copied: qt5-base/repos/testing-i686/rebuild.list (from rev 283157, qt5-base/trunk/rebuild.list)
===================================================================
--- testing-i686/rebuild.list (rev 0)
+++ testing-i686/rebuild.list 2016-12-14 10:36:35 UTC (rev 283158)
@@ -0,0 +1,9 @@
+fcitx-qt5
+plasma-integration
+gcin
+calibre
+akonadi
+skrooge
+kwin
+lxqt-qtplugin
+qt5dxcb-plugin
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-12-14 10:22:24 UTC (rev 283157)
+++ testing-x86_64/PKGBUILD 2016-12-14 10:36:35 UTC (rev 283158)
@@ -1,108 +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>
-
-pkgname=qt5-base
-_qtver=5.7.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' 'libgl' 'fontconfig'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
-makedepends=('mtdev' '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'
- 'mtdev: evdev plugin'
- '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"
- qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch"
- qtbug-55583.patch::"https://github.com/qt/qtbase/commit/84ea00d4.patch")
-md5sums=('f0809befe04160fbb73bbf38a06a2073'
- 'c86af27562bbbe05c3defd63d00130fd'
- '7b11584d9ea1ccb6c419e9b9816dee63')
-
-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 libsystemd-journal detection
- sed -e 's|libsystemd-journal|libsystemd|' -i config.tests/unix/journald/journald.pro -i src/corelib/global/global.pri
-
- # Don't unload plugins in QPluginLoader https://bugreports.qt.io/browse/QTBUG-49061
- patch -p1 -i ../qtbug-49061.patch
-
- # Fix file chooser segfault on gnome/wayland https://bugreports.qt.io/browse/QTBUG-55583
- patch -p1 -i ../qtbug-55583.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/testing-x86_64/PKGBUILD (from rev 283157, qt5-base/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-12-14 10:36:35 UTC (rev 283158)
@@ -0,0 +1,108 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-base
+_qtver=5.7.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' 'libgl' 'fontconfig'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
+makedepends=('mtdev' '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'
+ 'mtdev: evdev plugin'
+ '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"
+ qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch"
+ qtbug-55583.patch::"https://github.com/qt/qtbase/commit/84ea00d4.patch")
+md5sums=('f0809befe04160fbb73bbf38a06a2073'
+ 'c86af27562bbbe05c3defd63d00130fd'
+ '7b11584d9ea1ccb6c419e9b9816dee63')
+
+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 libsystemd-journal detection
+ sed -e 's|libsystemd-journal|libsystemd|' -i config.tests/unix/journald/journald.pro -i src/corelib/global/global.pri
+
+ # Don't unload plugins in QPluginLoader https://bugreports.qt.io/browse/QTBUG-49061
+ patch -p1 -i ../qtbug-49061.patch
+
+ # Fix file chooser segfault on gnome/wayland https://bugreports.qt.io/browse/QTBUG-55583
+ patch -p1 -i ../qtbug-55583.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: testing-x86_64/no-gtk-qpa-on-wayland.patch
===================================================================
--- testing-x86_64/no-gtk-qpa-on-wayland.patch 2016-12-14 10:22:24 UTC (rev 283157)
+++ testing-x86_64/no-gtk-qpa-on-wayland.patch 2016-12-14 10:36:35 UTC (rev 283158)
@@ -1,13 +0,0 @@
-diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-index db264d1..e3cb2f3 100644
---- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-@@ -814,7 +814,7 @@ QStringList QGenericUnixTheme::themeNames()
- #ifndef QT_NO_SETTINGS
- result.push_back(QLatin1String(QKdeTheme::name));
- #endif
-- } else if (gtkBasedEnvironments.contains(desktopName)) {
-+ } else if (gtkBasedEnvironments.contains(desktopName) && QString::fromLocal8Bit(qgetenv("XDG_SESSION_TYPE")) != QLatin1String("wayland")) {
- // prefer the GTK3 theme implementation with native dialogs etc.
- result.push_back(QStringLiteral("gtk3"));
- // fallback to the generic Gnome theme if loading the GTK3 theme fails
Copied: qt5-base/repos/testing-x86_64/no-gtk-qpa-on-wayland.patch (from rev 283157, qt5-base/trunk/no-gtk-qpa-on-wayland.patch)
===================================================================
--- testing-x86_64/no-gtk-qpa-on-wayland.patch (rev 0)
+++ testing-x86_64/no-gtk-qpa-on-wayland.patch 2016-12-14 10:36:35 UTC (rev 283158)
@@ -0,0 +1,13 @@
+diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+index db264d1..e3cb2f3 100644
+--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
++++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+@@ -814,7 +814,7 @@ QStringList QGenericUnixTheme::themeNames()
+ #ifndef QT_NO_SETTINGS
+ result.push_back(QLatin1String(QKdeTheme::name));
+ #endif
+- } else if (gtkBasedEnvironments.contains(desktopName)) {
++ } else if (gtkBasedEnvironments.contains(desktopName) && QString::fromLocal8Bit(qgetenv("XDG_SESSION_TYPE")) != QLatin1String("wayland")) {
+ // prefer the GTK3 theme implementation with native dialogs etc.
+ result.push_back(QStringLiteral("gtk3"));
+ // fallback to the generic Gnome theme if loading the GTK3 theme fails
Deleted: testing-x86_64/rebuild.list
===================================================================
--- testing-x86_64/rebuild.list 2016-12-14 10:22:24 UTC (rev 283157)
+++ testing-x86_64/rebuild.list 2016-12-14 10:36:35 UTC (rev 283158)
@@ -1,9 +0,0 @@
-fcitx-qt5
-plasma-integration
-gcin
-calibre
-akonadi
-skrooge
-kwin
-lxqt-qtplugin
-qt5dxcb-plugin
Copied: qt5-base/repos/testing-x86_64/rebuild.list (from rev 283157, qt5-base/trunk/rebuild.list)
===================================================================
--- testing-x86_64/rebuild.list (rev 0)
+++ testing-x86_64/rebuild.list 2016-12-14 10:36:35 UTC (rev 283158)
@@ -0,0 +1,9 @@
+fcitx-qt5
+plasma-integration
+gcin
+calibre
+akonadi
+skrooge
+kwin
+lxqt-qtplugin
+qt5dxcb-plugin
More information about the arch-commits
mailing list