[arch-commits] Commit in qt5/trunk (PKGBUILD kdebug-329174.patch)

[Felix Yan]

    Date: Tuesday, February 24, 2015 @ 16:19:47
  Author: fyan
Revision: 231846

upgpkg: qt5 5.4.1-1

Modified:
  qt5/trunk/PKGBUILD
Deleted:
  qt5/trunk/kdebug-329174.patch

---------------------+
 PKGBUILD            |   19 +++++++------------
 kdebug-329174.patch |   39 ---------------------------------------
 2 files changed, 7 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-24 15:19:25 UTC (rev 231845)
+++ PKGBUILD	2015-02-24 15:19:47 UTC (rev 231846)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgbase=qt5
 pkgname=('qt5-base'
@@ -26,8 +27,8 @@
          'qt5-websockets'
          'qt5-x11extras'
          'qt5-xmlpatterns')
-pkgver=5.4.0
-pkgrel=3
+pkgver=5.4.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -41,14 +42,12 @@
 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'
-        'kdebug-329174.patch')
-md5sums=('21843b00ecde8956217faab391bc007b'
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop')
+md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
-         '322b419b16c75d4de0ee7ad0a246caa1'
-         'f69ac1589a661f232fb86ad32e293b28')
+         '322b419b16c75d4de0ee7ad0a246caa1')
 
 prepare() {
   cd ${_pkgfqn}
@@ -66,10 +65,6 @@
   # 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
-
-  # Fixed in 5.4.1
-  cd qtbase
-  patch -p1 -i "${srcdir}"/kdebug-329174.patch
 }
 
 build() {

Deleted: kdebug-329174.patch
===================================================================
--- kdebug-329174.patch	2015-02-24 15:19:25 UTC (rev 231845)
+++ kdebug-329174.patch	2015-02-24 15:19:47 UTC (rev 231846)
@@ -1,39 +0,0 @@
-From 6a7ee92b3958e3a3ebc16be15f8bd34217ec7bd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin at kde.org>
-Date: Wed, 10 Dec 2014 07:27:23 +0100
-Subject: [PATCH] Handle SelectionClientClose in QXcbClipboard
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QXcbClipboard listens for subtype SelectionClientClose of Xfixes
-SelectionNotify event, but doesn't handle it. When the client holding
-the clipboard selection closes the Clipboard becomes empty and thus the
-change should be emitted.
-
-This fixes downstream KDE Bug #329174.
-
-Change-Id: I19fb8cfd7bd3b249c0bc6ca2a724a9aeeb05ac7e
-Reviewed-by: Jørgen Lind <jorgen.lind at theqtcompany.com>
-Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
----
- src/plugins/platforms/xcb/qxcbclipboard.cpp |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-index 8b3893e..f56a29d 100644
---- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
-+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -742,7 +742,8 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
-             m_xClipboard[mode]->reset();
-         }
-         emitChanged(mode);
--    }
-+    } else if (event->subtype == XCB_XFIXES_SELECTION_EVENT_SELECTION_CLIENT_CLOSE)
-+        emitChanged(mode);
- }
- 
- 
--- 
-1.7.1
-