[arch-commits] Commit in qt5/trunk (2 files)

Felix Yan fyan at archlinux.org
Fri Jul 10 12:53:03 UTC 2015


    Date: Friday, July 10, 2015 @ 14:53:03
  Author: fyan
Revision: 242002

upgpkg: qt5 5.5.0-1

Modified:
  qt5/trunk/PKGBUILD
Deleted:
  qt5/trunk/avoid-calling-potentially-pure-virtual-method.patch

-----------------------------------------------------+
 PKGBUILD                                            |  201 +++++++++---------
 avoid-calling-potentially-pure-virtual-method.patch |   64 -----
 2 files changed, 110 insertions(+), 155 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-10 12:37:57 UTC (rev 242001)
+++ PKGBUILD	2015-07-10 12:53:03 UTC (rev 242002)
@@ -3,7 +3,9 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgbase=qt5
-pkgname=('qt5-base'
+pkgname=('qt5-3d'
+         'qt5-base'
+         'qt5-canvas3d'
          'qt5-connectivity'
          'qt5-declarative'
          'qt5-doc'
@@ -27,32 +29,29 @@
          'qt5-websockets'
          'qt5-x11extras'
          'qt5-xmlpatterns')
-pkgver=5.4.2
+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' 'gstreamer0.10-base-plugins'
-            'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
-            'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng'
-            'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs'
-            'openal' 'gtk2' 'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb'
-            'geoclue' 'pciutils' 'nss' 'gstreamer0.10-bad')
+            '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' 'avoid-calling-potentially-pure-virtual-method.patch'
-        'ibus-get-display-number-when-screen-number-is-omitted.patch')
-md5sums=('c23bd0f14d66e7901d24906a1edce9b0'
+        'keypad-shortcuts.patch')
+md5sums=('65d5282f3dee0336da9ed1f77148952f'
          'b2897dd6a2967bccf8f10e397aafee55'
          '76e150b20178d2d43801f7367232e5f7'
          '188da8f4c87316e730ebf1c6217bf5a0'
          '322b419b16c75d4de0ee7ad0a246caa1'
-         '665439088fc7de52a97455c5eaf87889'
-         'cab3284d52ea700b8761f4d71d68baf0'
-         '39e285d08b4951de095c2f6d6acdc925')
+         '665439088fc7de52a97455c5eaf87889')
 
 prepare() {
   cd ${_pkgfqn}
@@ -60,12 +59,6 @@
   # https://bugs.archlinux.org/task/44676
   (cd qtbase; patch -p1 -i "$srcdir/keypad-shortcuts.patch")
 
-  # https://bugs.archlinux.org/task/43986
-  (cd qtdeclarative; patch -p1 -i "$srcdir/avoid-calling-potentially-pure-virtual-method.patch")
-
-  # https://bugs.archlinux.org/task/45180
-  (cd qtbase; patch -p1 -i "$srcdir/ibus-get-display-number-when-screen-number-is-omitted.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}|" \
@@ -112,8 +105,9 @@
     -dbus-linked \
     -system-harfbuzz \
     -journald \
+    -libinput \
     -no-use-gold-linker \
-    -reduce-relocations ${SSE2}
+    -no-reduce-relocations ${SSE2}
 
   make
 
@@ -134,11 +128,24 @@
   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')
+           'qtchooser' 'libinput')
   optdepends=('qt5-svg: to use SVG icon themes'
               'postgresql-libs: PostgreSQL driver'
               'libmariadbclient: MariaDB driver'
@@ -171,6 +178,19 @@
   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')
@@ -240,57 +260,6 @@
     "${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
-}
-
-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-multimedia() {
-  pkgdesc='Classes for audio, video, radio and camera functionality'
-  depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
-  optdepends=('gstreamer0.10-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-graphicaleffects() {
   pkgdesc='Graphical effects for use with Qt Quick 2'
   depends=('qt5-declarative')
@@ -329,6 +298,23 @@
     "${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')
@@ -354,12 +340,10 @@
 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
-
-  install -D -m644 LGPL_EXCEPTION.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
 }
 
 package_qt5-script() {
@@ -471,22 +455,16 @@
     "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
 }
 
-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')
+package_qt5-translations() {
+  pkgdesc='A cross-platform application and UI framework (Translations)'
+  depends=('qt5-base')
+  conflicts=('qt')
 
-  cd ${_pkgfqn}/qtwebkit
+  cd ${_pkgfqn}/qttranslations
   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
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
 }
 
 package_qt5-wayland() {
@@ -521,7 +499,7 @@
 
 package_qt5-webengine() {
   pkgdesc='Provides support for web applications using the Chromium browser project'
-  depends=('qt5-declarative' 'nss' 'libxtst' 'libxcursor' 'libxrandr' 'alsa-lib' 'libxcomposite')
+  depends=('qt5-webchannel' 'qt5-location' 'nss' 'libxtst' 'libxcursor' 'libxrandr' 'alsa-lib' 'libxcomposite')
   license=('LGPL')
 
   cd ${_pkgfqn}/qtwebengine
@@ -530,10 +508,27 @@
   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')
-  license=('LGPL')
 
   cd ${_pkgfqn}/qtwebsockets
   make INSTALL_ROOT="${pkgdir}" install
@@ -541,6 +536,9 @@
   # 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() {
@@ -558,3 +556,24 @@
     "${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
+}

Deleted: avoid-calling-potentially-pure-virtual-method.patch
===================================================================
--- avoid-calling-potentially-pure-virtual-method.patch	2015-07-10 12:37:57 UTC (rev 242001)
+++ avoid-calling-potentially-pure-virtual-method.patch	2015-07-10 12:53:03 UTC (rev 242002)
@@ -1,64 +0,0 @@
-From 0d31aa1617c96ed3e3624d77332ea6f13aba1492 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson at kde.org>
-Date: Thu, 23 Apr 2015 15:01:24 +0200
-Subject: [PATCH 67/68] Avoid calling potentially pure virtual method
-
-In Qt 5.4 screenChanged is called indirectly from the destructor of
-QPlatformScreen. By comparing new values against the oldScreen we call
-call virtual methods of QPlatformScreen from it's own destructor which
-results in a crash.
-
-This patch simply emits change signals whenever a screen change regardless
-of whether the value differs from the previous screen. Arguably less
-efficient, but better than crashing.
-
-This fix is not needed in Qt 5.5 where the QPA architecture has changed.
-
-Task-number: QTBUG-45753
-Change-Id: Ic155906928855a377add9b21bff9e72b31f4667e
-Reviewed-by: Alan Alpert <aalpert at blackberry.com>
----
- src/quick/items/qquickscreen.cpp | 27 +++++++++------------------
- 1 file changed, 9 insertions(+), 18 deletions(-)
-
-diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
-index c4d1407..0900adb 100644
---- a/src/quick/items/qquickscreen.cpp
-+++ b/src/quick/items/qquickscreen.cpp
-@@ -347,24 +347,15 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
-             emit orientationUpdateMaskChanged();
-         }
- 
--        if (!oldScreen || screen->size() != oldScreen->size()) {
--            emit widthChanged();
--            emit heightChanged();
--        }
--        if (!oldScreen || screen->name() != oldScreen->name())
--            emit nameChanged();
--        if (!oldScreen || screen->orientation() != oldScreen->orientation())
--            emit orientationChanged();
--        if (!oldScreen || screen->primaryOrientation() != oldScreen->primaryOrientation())
--            emit primaryOrientationChanged();
--        if (!oldScreen || screen->availableVirtualGeometry() != oldScreen->availableVirtualGeometry())
--            emit desktopGeometryChanged();
--        if (!oldScreen || screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch())
--            emit logicalPixelDensityChanged();
--        if (!oldScreen || screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch())
--            emit pixelDensityChanged();
--        if (!oldScreen || screen->devicePixelRatio() != oldScreen->devicePixelRatio())
--            emit devicePixelRatioChanged();
-+        emit widthChanged();
-+        emit heightChanged();
-+        emit nameChanged();
-+        emit orientationChanged();
-+        emit primaryOrientationChanged();
-+        emit desktopGeometryChanged();
-+        emit logicalPixelDensityChanged();
-+        emit pixelDensityChanged();
-+        emit devicePixelRatioChanged();
- 
-         connect(screen, SIGNAL(geometryChanged(QRect)),
-                 this, SIGNAL(widthChanged()));
--- 
-2.3.7
-



More information about the arch-commits mailing list