Date: Monday, February 29, 2016 @ 13:07:50
Author: arojas
Revision: 260369
archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64
Added:
qt5-base/repos/
qt5-base/repos/kde-unstable-i686/
qt5-base/repos/kde-unstable-i686/PKGBUILD
(from rev 260368, qt5-base/trunk/PKGBUILD)
qt5-base/repos/kde-unstable-i686/qt5-alsa1.11.patch
(from rev 260368, qt5-base/trunk/qt5-alsa1.11.patch)
qt5-base/repos/kde-unstable-x86_64/
qt5-base/repos/kde-unstable-x86_64/PKGBUILD
(from rev 260368, qt5-base/trunk/PKGBUILD)
qt5-base/repos/kde-unstable-x86_64/qt5-alsa1.11.patch
(from rev 260368, qt5-base/trunk/qt5-alsa1.11.patch)
----------------------------------------+
kde-unstable-i686/PKGBUILD | 120 +++++++++++++++++++++++++++++++
kde-unstable-i686/qt5-alsa1.11.patch | 11 ++
kde-unstable-x86_64/PKGBUILD | 120 +++++++++++++++++++++++++++++++
kde-unstable-x86_64/qt5-alsa1.11.patch | 11 ++
4 files changed, 262 insertions(+)
Copied: qt5-base/repos/kde-unstable-i686/PKGBUILD (from rev 260368,
qt5-base/trunk/PKGBUILD)
===================================================================
--- repos/kde-unstable-i686/PKGBUILD (rev 0)
+++ repos/kde-unstable-i686/PKGBUILD 2016-02-29 12:07:50 UTC (rev 260369)
@@ -0,0 +1,120 @@
+# $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.6.0-rc
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
+ 'qtchooser' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11')
+makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc'
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+ 'gtk2' 'libxkbcommon-x11' 'libinput' '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'
+ 'mtdev: evdev plugin'
+ 'libxkbcommon-x11: xcb plugin'
+ 'libsm: xcb plugin'
+ 'gtk2: GTK2 plugin')
+conflicts=('qt')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";
qt5-alsa1.11.patch)
+md5sums=('82e5bd59946630ec36ab357f1779f411'
+ '5e96b5cfa248b8b071919adb27abc715')
+
+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
+
+ # Fix ALSA 1.11 detection
+ patch -p1 -i ../qt5-alsa1.11.patch
+}
+
+build() {
+ cd ${_pkgfqn}
+
+# export QTDIR="${srcdir}"/${_pkgfqn}
+# export LD_LIBRARY_PATH="${QTDIR}"/lib:"${LD_LIBRARY_PATH}"
+# export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
+
+ # FS#38796
+ [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
+
+ PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
+ -prefix /usr \
+ -bindir /usr/lib/qt/bin \
+ -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} -debug
+
+ make
+
+ # Fix docs build when qt is not installed
+# sed -e "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
+# -i qmake/Makefile.qmake-docs -i src/corelib/qdoc_wrapper.sh
+# find . -name Makefile \
+# -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/bin/qdoc|g" {} +
+# sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g"
qmake/Makefile.qmake-docs
+# find . -name Makefile \
+# -exec sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
+
+# make docs
+}
+
+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
+
+ # Useful symlinks
+ install -d "${pkgdir}"/usr/bin
+ for b in "${pkgdir}"/usr/lib/qt/bin/*; do
+ ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+ done
+}
Copied: qt5-base/repos/kde-unstable-i686/qt5-alsa1.11.patch (from rev 260368,
qt5-base/trunk/qt5-alsa1.11.patch)
===================================================================
--- repos/kde-unstable-i686/qt5-alsa1.11.patch (rev 0)
+++ repos/kde-unstable-i686/qt5-alsa1.11.patch 2016-02-29 12:07:50 UTC (rev
260369)
@@ -0,0 +1,11 @@
+--- qtbase-opensource-src-5.6.0-rc/config.tests/unix/alsa/alsatest.cpp.0
2016-02-29 08:15:48.203031809 +0000
++++ qtbase-opensource-src-5.6.0-rc/config.tests/unix/alsa/alsatest.cpp
2016-02-29 08:16:39.712811962 +0000
+@@ -32,7 +32,7 @@
+ ****************************************************************************/
+
+ #include <alsa/asoundlib.h>
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+
Copied: qt5-base/repos/kde-unstable-x86_64/PKGBUILD (from rev 260368,
qt5-base/trunk/PKGBUILD)
===================================================================
--- repos/kde-unstable-x86_64/PKGBUILD (rev 0)
+++ repos/kde-unstable-x86_64/PKGBUILD 2016-02-29 12:07:50 UTC (rev 260369)
@@ -0,0 +1,120 @@
+# $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.6.0-rc
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
+ 'qtchooser' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11')
+makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc'
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+ 'gtk2' 'libxkbcommon-x11' 'libinput' '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'
+ 'mtdev: evdev plugin'
+ 'libxkbcommon-x11: xcb plugin'
+ 'libsm: xcb plugin'
+ 'gtk2: GTK2 plugin')
+conflicts=('qt')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";
qt5-alsa1.11.patch)
+md5sums=('82e5bd59946630ec36ab357f1779f411'
+ '5e96b5cfa248b8b071919adb27abc715')
+
+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
+
+ # Fix ALSA 1.11 detection
+ patch -p1 -i ../qt5-alsa1.11.patch
+}
+
+build() {
+ cd ${_pkgfqn}
+
+# export QTDIR="${srcdir}"/${_pkgfqn}
+# export LD_LIBRARY_PATH="${QTDIR}"/lib:"${LD_LIBRARY_PATH}"
+# export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
+
+ # FS#38796
+ [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
+
+ PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
+ -prefix /usr \
+ -bindir /usr/lib/qt/bin \
+ -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} -debug
+
+ make
+
+ # Fix docs build when qt is not installed
+# sed -e "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
+# -i qmake/Makefile.qmake-docs -i src/corelib/qdoc_wrapper.sh
+# find . -name Makefile \
+# -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/bin/qdoc|g" {} +
+# sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g"
qmake/Makefile.qmake-docs
+# find . -name Makefile \
+# -exec sed -i
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
+
+# make docs
+}
+
+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
+
+ # Useful symlinks
+ install -d "${pkgdir}"/usr/bin
+ for b in "${pkgdir}"/usr/lib/qt/bin/*; do
+ ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+ done
+}
Copied: qt5-base/repos/kde-unstable-x86_64/qt5-alsa1.11.patch (from rev 260368,
qt5-base/trunk/qt5-alsa1.11.patch)
===================================================================
--- repos/kde-unstable-x86_64/qt5-alsa1.11.patch
(rev 0)
+++ repos/kde-unstable-x86_64/qt5-alsa1.11.patch 2016-02-29 12:07:50 UTC
(rev 260369)
@@ -0,0 +1,11 @@
+--- qtbase-opensource-src-5.6.0-rc/config.tests/unix/alsa/alsatest.cpp.0
2016-02-29 08:15:48.203031809 +0000
++++ qtbase-opensource-src-5.6.0-rc/config.tests/unix/alsa/alsatest.cpp
2016-02-29 08:16:39.712811962 +0000
+@@ -32,7 +32,7 @@
+ ****************************************************************************/
+
+ #include <alsa/asoundlib.h>
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+
