[arch-commits] Commit in qt5/repos (11 files)

Felix Yan fyan at archlinux.org
Fri Jul 10 15:57:29 UTC 2015


    Date: Friday, July 10, 2015 @ 17:57:28
  Author: fyan
Revision: 242081

archrelease: copy trunk to staging-i686

Added:
  qt5/repos/staging-i686/
  qt5/repos/staging-i686/PKGBUILD
    (from rev 242080, qt5/trunk/PKGBUILD)
  qt5/repos/staging-i686/assistant.desktop
    (from rev 242080, qt5/trunk/assistant.desktop)
  qt5/repos/staging-i686/designer.desktop
    (from rev 242080, qt5/trunk/designer.desktop)
  qt5/repos/staging-i686/gcc-5.patch
    (from rev 242080, qt5/trunk/gcc-5.patch)
  qt5/repos/staging-i686/ibus-get-display-number-when-screen-number-is-omitted.patch
    (from rev 242080, qt5/trunk/ibus-get-display-number-when-screen-number-is-omitted.patch)
  qt5/repos/staging-i686/keypad-shortcuts.patch
    (from rev 242080, qt5/trunk/keypad-shortcuts.patch)
  qt5/repos/staging-i686/linguist.desktop
    (from rev 242080, qt5/trunk/linguist.desktop)
  qt5/repos/staging-i686/qdbusviewer.desktop
    (from rev 242080, qt5/trunk/qdbusviewer.desktop)
  qt5/repos/staging-i686/qt5-tools.install
    (from rev 242080, qt5/trunk/qt5-tools.install)
  qt5/repos/staging-i686/rebuild.list
    (from rev 242080, qt5/trunk/rebuild.list)

-------------------------------------------------------------+
 PKGBUILD                                                    |  579 ++++++++++
 assistant.desktop                                           |    8 
 designer.desktop                                            |   10 
 gcc-5.patch                                                 |   17 
 ibus-get-display-number-when-screen-number-is-omitted.patch |   32 
 keypad-shortcuts.patch                                      |   94 +
 linguist.desktop                                            |    9 
 qdbusviewer.desktop                                         |    9 
 qt5-tools.install                                           |   12 
 rebuild.list                                                |    2 
 10 files changed, 772 insertions(+)

Copied: qt5/repos/staging-i686/PKGBUILD (from rev 242080, qt5/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,579 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=qt5
+pkgname=('qt5-3d'
+         'qt5-base'
+         'qt5-canvas3d'
+         'qt5-connectivity'
+         'qt5-declarative'
+         'qt5-doc'
+         'qt5-enginio'
+         'qt5-graphicaleffects'
+         'qt5-imageformats'
+         'qt5-location'
+         'qt5-multimedia'
+         'qt5-quick1'
+         'qt5-quickcontrols'
+         'qt5-script'
+         'qt5-sensors'
+         'qt5-serialport'
+         'qt5-svg'
+         'qt5-tools'
+         'qt5-translations'
+         'qt5-wayland'
+         'qt5-webchannel'
+         'qt5-webengine'
+         'qt5-webkit'
+         'qt5-websockets'
+         'qt5-x11extras'
+         'qt5-xmlpatterns')
+pkgver=5.5.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
+            'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'libjpeg-turbo' 'cups'
+            'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'nss'
+            'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby'
+            'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs' 'openal' 'gtk2'
+            'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb' 'geoclue' 'pciutils'
+            'libinput')
+groups=('qt' 'qt5')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz"
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
+        'keypad-shortcuts.patch')
+md5sums=('65d5282f3dee0336da9ed1f77148952f'
+         'b2897dd6a2967bccf8f10e397aafee55'
+         '76e150b20178d2d43801f7367232e5f7'
+         '188da8f4c87316e730ebf1c6217bf5a0'
+         '322b419b16c75d4de0ee7ad0a246caa1'
+         '665439088fc7de52a97455c5eaf87889')
+
+prepare() {
+  cd ${_pkgfqn}
+
+  # https://bugs.archlinux.org/task/44676
+  (cd qtbase; patch -p1 -i "$srcdir/keypad-shortcuts.patch")
+
+  # 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}|" \
+    qtbase/mkspecs/common/gcc-base.conf
+  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
+    qtbase/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|' {} +
+  # 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
+}
+
+build() {
+  cd ${_pkgfqn}
+
+  export QTDIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
+  export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
+
+  # python2 workaround
+  export PATH="${srcdir}/python2-path:$PATH"
+
+  # FS#38796
+  [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
+
+  PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
+    -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 \
+    -libinput \
+    -no-use-gold-linker \
+    -no-reduce-relocations ${SSE2}
+
+  make
+
+  # Fix docs build when qt is not installed
+  sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
+    "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+  find "${QTDIR}" -name Makefile \
+    -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
+  sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+    "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+  find "${QTDIR}" -name Makefile \
+    -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
+  sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+    qtwebkit/Source/Makefile.api
+  find "${QTDIR}" -name Makefile \
+    -exec sed -i "s|/usr/lib/qt/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g" {} +
+
+  make docs
+}
+
+package_qt5-3d() {
+  pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics'
+  depends=('qt5-declarative')
+  license=('LGPL')
+
+  cd ${_pkgfqn}/qt3d
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+}
+
+package_qt5-base() {
+  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')
+  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')
+
+  cd ${_pkgfqn}/qtbase
+  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}/qtbase|/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
+}
+
+package_qt5-canvas3d() {
+  pkgdesc='A JavaScript 3D rendering API for Qt Quick'
+  depends=('qt5-declarative')
+  license=('LGPL')
+
+  cd ${_pkgfqn}/qtcanvas3d
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+}
+
+package_qt5-connectivity() {
+  pkgdesc='Provides access to Bluetooth hardware'
+  depends=('qt5-declarative' 'bluez-libs')
+
+  cd ${_pkgfqn}/qtconnectivity
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-declarative() {
+  pkgdesc='Classes for QML and JavaScript languages'
+  depends=('qt5-xmlpatterns' 'libxkbcommon-x11')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtdeclarative
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  # 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
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-doc() {
+  pkgdesc='A cross-platform application and UI framework (Documentation)'
+  depends=('qt5-base')
+#  arch=('any')
+  conflicts=('qt-doc')
+  replaces=('qt-doc')
+  provides=('qt-doc')
+  options=('docs' '!emptydirs')
+  groups=()
+
+  cd ${_pkgfqn}
+  make INSTALL_ROOT="${pkgdir}" install_docs
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-enginio() {
+  pkgdesc='A Backend-as-a-Service solution to ease the backend development for connected and data-driven application'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtenginio
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-graphicaleffects() {
+  pkgdesc='Graphical effects for use with Qt Quick 2'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtgraphicaleffects
+  make INSTALL_ROOT="${pkgdir}" install
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-imageformats() {
+  pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
+  depends=('qt5-base' 'jasper' 'libmng' 'libwebp')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtimageformats
+  make INSTALL_ROOT="${pkgdir}" install
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-location() {
+  pkgdesc='Provides access to position, satellite and area monitoring classes'
+  depends=('qt5-declarative' 'geoclue')
+
+  cd ${_pkgfqn}/qtlocation
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-multimedia() {
+  pkgdesc='Classes for audio, video, radio and camera functionality'
+  depends=('qt5-declarative' 'libpulse' 'gst-plugins-base-libs' 'openal')
+  optdepends=('gst-plugins-bad: Qt MediaService plugin')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtmultimedia
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-quick1() {
+  pkgdesc='Qt Declarative is provided for Qt 4 compatibility'
+  depends=('qt5-webkit' 'qt5-script')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtquick1
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  # 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
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-quickcontrols() {
+  pkgdesc='Reusable Qt Quick based UI controls to create classic desktop-style user interfaces'
+  depends=('qt5-declarative')
+  license=('LGPL')
+
+  cd ${_pkgfqn}/qtquickcontrols
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-script() {
+  pkgdesc='Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtscript
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-sensors() {
+  pkgdesc='Provides access to sensor hardware and motion gesture recognition'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtsensors
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-serialport() {
+  pkgdesc='Provides access to hardware and virtual serial ports'
+  depends=('qt5-base')
+
+  cd ${_pkgfqn}/qtserialport
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-svg() {
+  pkgdesc='Classes for displaying the contents of SVG files'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtsvg
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-tools() {
+  pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
+  depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme'
+           'xdg-utils')
+  optdepends=('qt5-doc: documentation')
+  install='qt5-tools.install'
+  conflicts=('qt')
+  options=('staticlibs') # libQt5UiTools builds as static only$
+
+  cd ${_pkgfqn}/qttools
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # install missing icons and desktop files
+  for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
+    size=$(echo $(basename ${icon}) | cut -d- -f2)
+    install -p -D -m644 ${icon} \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
+  done
+
+  install -D -m644 src/assistant/assistant/images/assistant.png \
+    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
+  install -D -m644 src/assistant/assistant/images/assistant-128.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
+  install -D -m644 src/designer/src/designer/images/designer.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/QtProject-designer.png"
+  install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \
+    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png"
+  install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png"
+  install -d "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \
+    "${pkgdir}/usr/share/applications/"
+
+  # 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' {} \;
+
+  # 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
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-translations() {
+  pkgdesc='A cross-platform application and UI framework (Translations)'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qttranslations
+  make INSTALL_ROOT="${pkgdir}" install
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-wayland() {
+  pkgdesc='Provides APIs for Wayland'
+  depends=('qt5-base' 'libxcomposite' 'libxkbcommon')
+
+  cd ${_pkgfqn}/qtwayland
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-webchannel() {
+  pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtwebchannel
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-webengine() {
+  pkgdesc='Provides support for web applications using the Chromium browser project'
+  depends=('qt5-webchannel' 'qt5-location' 'nss' 'libxtst' 'libxcursor' 'libxrandr' 'alsa-lib' 'libxcomposite')
+  license=('LGPL')
+
+  cd ${_pkgfqn}/qtwebengine
+  make INSTALL_ROOT="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/share/doc
+}
+
+package_qt5-webkit() {
+  pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
+  depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base' 'libxslt'
+           'libxcomposite' 'libwebp')
+  optdepends=('gst-plugins-good: Webm codec support')
+  license=('GPL3' 'LGPL' 'FDL')
+
+  cd ${_pkgfqn}/qtwebkit
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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 path in pc file
+  perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc
+}
+
+package_qt5-websockets() {
+  pkgdesc='Provides WebSocket communication compliant with RFC 6455'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtwebsockets
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-x11extras() {
+  pkgdesc='Provides platform-specific APIs for X11'
+  depends=('qt5-base')
+
+  cd ${_pkgfqn}/qtx11extras
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-xmlpatterns() {
+  pkgdesc='Support for XPath, XQuery, XSLT and XML schema validation'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtxmlpatterns
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # 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' {} \;
+
+  # 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
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}

Copied: qt5/repos/staging-i686/assistant.desktop (from rev 242080, qt5/trunk/assistant.desktop)
===================================================================
--- staging-i686/assistant.desktop	                        (rev 0)
+++ staging-i686/assistant.desktop	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qt Assistant
+Comment=Shows Qt documentation and examples
+Exec=/usr/lib/qt/bin/assistant
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation;

Copied: qt5/repos/staging-i686/designer.desktop (from rev 242080, qt5/trunk/designer.desktop)
===================================================================
--- staging-i686/designer.desktop	                        (rev 0)
+++ staging-i686/designer.desktop	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt applications
+Exec=/usr/lib/qt/bin/designer
+Icon=QtProject-designer
+MimeType=application/x-designer;
+Terminal=false
+Type=Application
+Categories=Qt;Development;

Copied: qt5/repos/staging-i686/gcc-5.patch (from rev 242080, qt5/trunk/gcc-5.patch)
===================================================================
--- staging-i686/gcc-5.patch	                        (rev 0)
+++ staging-i686/gcc-5.patch	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,17 @@
+diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 
+qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
+--- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than	2015-03-18 10:24:38.683352327 
+-0400
++++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp	2015-03-18 10:25:21.953352327 -0400
+@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
+     }
+ }
+ 
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
++
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
+ {
+     VM& vm = exec->vm();
+

Copied: qt5/repos/staging-i686/ibus-get-display-number-when-screen-number-is-omitted.patch (from rev 242080, qt5/trunk/ibus-get-display-number-when-screen-number-is-omitted.patch)
===================================================================
--- staging-i686/ibus-get-display-number-when-screen-number-is-omitted.patch	                        (rev 0)
+++ staging-i686/ibus-get-display-number-when-screen-number-is-omitted.patch	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,32 @@
+From c72325d52575cb8a46cc8595c592c27581089dec Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar at redhat.com>
+Date: Tue, 24 Mar 2015 19:08:34 +0900
+Subject: [PATCH] ibus: Get display number when screen number is omitted.
+
+QIBusPlatformInputContextPrivate::createConnection() parses DISPLAY
+variable and it does not get the display number when the screen number
+is omitted. E.g. DISPLAY=":1".
+
+Change-Id: I9f81d8114d4e0f654a27ada67c5dc110eb34cd64
+Reviewed-by: Gatis Paeglis <gatis.paeglis at digia.com>
+---
+ .../ibus/qibusplatforminputcontext.cpp             |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+index d00435b..673942b 100644
+--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
++++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+@@ -351,6 +351,8 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection()
+     int pos2 = display.indexOf('.', pos);
+     if (pos2 > 0)
+         displayNumber = display.mid(pos, pos2 - pos);
++    else
++        displayNumber = display.right(pos);
+     if (debug)
+         qDebug() << "host=" << host << "displayNumber" << displayNumber;
+ 
+-- 
+1.7.1
+
+

Copied: qt5/repos/staging-i686/keypad-shortcuts.patch (from rev 242080, qt5/trunk/keypad-shortcuts.patch)
===================================================================
--- staging-i686/keypad-shortcuts.patch	                        (rev 0)
+++ staging-i686/keypad-shortcuts.patch	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,94 @@
+From c137502c7fd7550c780c9531ec414098d8101757 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov <a.volkov at rusbitech.ru>
+Date: Thu, 18 Sep 2014 16:16:26 +0400
+Subject: Fix shortcuts with keypad keys
+
+The way of searching a shortcut match for a key without the keypad
+modifier introduced in 547a1bea492954d828aa0798be93384669812489 is
+not correct. QKeyEvent::setModifiers() doesn't change native scan code
+so we get the incorrect QKeyEvent object which is eventually passed to
+the implementation of QPlatformIntegration::possibleKeys().
+And then QPlatformIntegration::possibleKeys() returns the same result
+as for the original QKeyEvent object.
+
+So to fix it we have to remove Qt::KeypadModifier from keys after
+calling the implementation of QPlatformIntegration::possibleKeys(),
+as it was before 547a1bea492954d828aa0798be93384669812489.
+
+Task-number: QTBUG-33093
+Task-number: QTBUG-20191
+Change-Id: I5b33c9b6cf2c06b133166a31eba9aff9181c9483
+---
+ src/gui/kernel/qshortcutmap.cpp | 12 +++++-------
+ src/gui/kernel/qshortcutmap_p.h |  4 ++--
+ 2 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
+index c915ed39..c13c82c 100644
+--- a/src/gui/kernel/qshortcutmap.cpp
++++ b/src/gui/kernel/qshortcutmap.cpp
+@@ -388,9 +388,7 @@ QKeySequence::SequenceMatch QShortcutMap::nextState(QKeyEvent *e)
+     result = find(e);
+     if (result == QKeySequence::NoMatch && (e->modifiers() & Qt::KeypadModifier)) {
+         // Try to find a match without keypad modifier
+-        QKeyEvent event = *e;
+-        event.setModifiers(e->modifiers() & ~Qt::KeypadModifier);
+-        result = find(&event);
++        result = find(e, Qt::KeypadModifier);
+     }
+     if (result == QKeySequence::NoMatch && e->modifiers() & Qt::ShiftModifier) {
+         // If Shift + Key_Backtab, also try Shift + Qt::Key_Tab
+@@ -443,13 +441,13 @@ bool QShortcutMap::hasShortcutForKeySequence(const QKeySequence &seq) const
+     which can be access through matches().
+     \sa matches
+ */
+-QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e)
++QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e, int ignoredModifiers)
+ {
+     Q_D(QShortcutMap);
+     if (!d->sequences.count())
+         return QKeySequence::NoMatch;
+ 
+-    createNewSequences(e, d->newEntries);
++    createNewSequences(e, d->newEntries, ignoredModifiers);
+ #if defined(DEBUG_QSHORTCUTMAP)
+     qDebug() << "Possible shortcut key sequences:" << d->newEntries;
+ #endif
+@@ -551,7 +549,7 @@ void QShortcutMap::clearSequence(QVector<QKeySequence> &ksl)
+     Alters \a seq to the new sequence state, based on the
+     current sequence state, and the new key event \a e.
+ */
+-void QShortcutMap::createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl)
++void QShortcutMap::createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl, int ignoredModifiers)
+ {
+     Q_D(QShortcutMap);
+     QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
+@@ -581,7 +579,7 @@ void QShortcutMap::createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl)
+                 curKsl.setKey(0, 2);
+                 curKsl.setKey(0, 3);
+             }
+-            curKsl.setKey(possibleKeys.at(pkNum), index);
++            curKsl.setKey(possibleKeys.at(pkNum) & ~ignoredModifiers, index);
+         }
+     }
+ }
+diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
+index 3959c2c..39a8eac 100644
+--- a/src/gui/kernel/qshortcutmap_p.h
++++ b/src/gui/kernel/qshortcutmap_p.h
+@@ -96,10 +96,10 @@ private:
+     QKeySequence::SequenceMatch state();
+     void dispatchEvent(QKeyEvent *e);
+ 
+-    QKeySequence::SequenceMatch find(QKeyEvent *e);
++    QKeySequence::SequenceMatch find(QKeyEvent *e, int ignoredModifiers = 0);
+     QKeySequence::SequenceMatch matches(const QKeySequence &seq1, const QKeySequence &seq2) const;
+     QVector<const QShortcutEntry *> matches() const;
+-    void createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl);
++    void createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl, int ignoredModifiers);
+     void clearSequence(QVector<QKeySequence> &ksl);
+     int translateModifiers(Qt::KeyboardModifiers modifiers);
+ 
+-- 
+cgit v0.11.0
+

Copied: qt5/repos/staging-i686/linguist.desktop (from rev 242080, qt5/trunk/linguist.desktop)
===================================================================
--- staging-i686/linguist.desktop	                        (rev 0)
+++ staging-i686/linguist.desktop	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt Linguist
+Comment=Add translations to Qt applications
+Exec=/usr/lib/qt/bin/linguist
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Type=Application
+Categories=Qt;Development;

Copied: qt5/repos/staging-i686/qdbusviewer.desktop (from rev 242080, qt5/trunk/qdbusviewer.desktop)
===================================================================
--- staging-i686/qdbusviewer.desktop	                        (rev 0)
+++ staging-i686/qdbusviewer.desktop	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt QDbusViewer 
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=/usr/lib/qt/bin/qdbusviewer
+Icon=qdbusviewer
+Terminal=false
+Type=Application
+Categories=Qt;Development;Debugger;

Copied: qt5/repos/staging-i686/qt5-tools.install (from rev 242080, qt5/trunk/qt5-tools.install)
===================================================================
--- staging-i686/qt5-tools.install	                        (rev 0)
+++ staging-i686/qt5-tools.install	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: qt5/repos/staging-i686/rebuild.list (from rev 242080, qt5/trunk/rebuild.list)
===================================================================
--- staging-i686/rebuild.list	                        (rev 0)
+++ staging-i686/rebuild.list	2015-07-10 15:57:28 UTC (rev 242081)
@@ -0,0 +1,2 @@
+fcitx-qt5
+frameworkintegration



More information about the arch-commits mailing list