Date: Monday, December 14, 2015 @ 10:41:51 Author: fyan Revision: 256040
upgpkg: qt5 5.5.1-6 - make qt5-base depends on libxkbcommon-x11 - enable proprietary_codecs (FS#45652) - use system yasm - remove -no-use-gold-linker (gold issue has been fixed) - remove -no-reduce-relocations (adopted by major distributions already, downstream projects should adapt to it) Modified: qt5/trunk/PKGBUILD ----------+ PKGBUILD | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-14 08:19:36 UTC (rev 256039) +++ PKGBUILD 2015-12-14 09:41:51 UTC (rev 256040) @@ -30,7 +30,7 @@ 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.5.1 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://www.qt.io/developers' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -40,7 +40,7 @@ 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs' 'openal' 'gtk2' 'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb' 'geoclue' 'pciutils' - 'libinput') + 'libinput' 'yasm' 'git') groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz" @@ -67,6 +67,11 @@ # in qtwebengine there are still a lot of relative calls which need a workaround mkdir "${srcdir}"/python2-path ln -s /usr/bin/python2 "${srcdir}"/python2-path/python + + # Try to enable proprietary_codecs and use some system yasm + sed -e 's/contains(WEBENGINE_CONFIG, proprietary_codecs): //' \ + -e '/use_system_ffmpeg=0"/a GYP_ARGS += "-Duse_system_yasm=1"' \ + -i qtwebengine/src/core/gyp_run.pro } build() { @@ -100,9 +105,7 @@ -dbus-linked \ -system-harfbuzz \ -journald \ - -libinput \ - -no-use-gold-linker \ - -no-reduce-relocations ${SSE2} + -libinput ${SSE2} make @@ -140,7 +143,7 @@ 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' 'libinput') + 'qtchooser' 'libinput' 'libsm' 'libxkbcommon-x11') optdepends=('qt5-svg: to use SVG icon themes' 'postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' @@ -147,8 +150,6 @@ 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver' 'mtdev: evdev plugin' - 'libxkbcommon-x11: xcb plugin' - 'libsm: xcb plugin' 'gtk2: GTK2 plugin') conflicts=('qt') @@ -203,7 +204,7 @@ package_qt5-declarative() { pkgdesc='Classes for QML and JavaScript languages' - depends=('qt5-xmlpatterns' 'libxkbcommon-x11' 'libsm') + depends=('qt5-xmlpatterns') conflicts=('qt') cd ${_pkgfqn}/qtdeclarative @@ -464,7 +465,7 @@ package_qt5-wayland() { pkgdesc='Provides APIs for Wayland' - depends=('qt5-base' 'libxcomposite' 'libxkbcommon') + depends=('qt5-base' 'libxcomposite') cd ${_pkgfqn}/qtwayland make INSTALL_ROOT="${pkgdir}" install