From cc0b1d4a4f3aa947e06f49782e85eedfe4aae754 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 1 Mar 2015 16:00:26 +0000
Subject: [PATCH] extra/qt5 to 5.4.1-2

---
 extra/qt5/PKGBUILD         | 19 +++++++------------
 extra/qt5/designer.desktop |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index c04e1baad..06f85ad1b 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,5 +1,6 @@
 # $Id: PKGBUILD 179039 2013-03-01 20:22:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed libfbclient, ibase
@@ -37,8 +38,8 @@ pkgname=('qt5-base'
          'qt5-websockets'
          'qt5-x11extras'
          'qt5-xmlpatterns')
-pkgver=5.4.0
-pkgrel=3
+pkgver=5.4.1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -53,15 +54,13 @@ 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'
         'rpi.patch'
         'qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch')
-md5sums=('21843b00ecde8956217faab391bc007b'
+md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
          'b2897dd6a2967bccf8f10e397aafee55'
-         '9638a78e502719ef8fe5f8d10d0361a9'
+         '76e150b20178d2d43801f7367232e5f7'
          '188da8f4c87316e730ebf1c6217bf5a0'
          '322b419b16c75d4de0ee7ad0a246caa1'
-         'f69ac1589a661f232fb86ad32e293b28'
          '9fe115d2c1d4778b8cb8e7f1b2e2bca6'
          'd55ad1f1c90725834b44eada5db4e401')
 
@@ -109,10 +108,6 @@ prepare() {
   # 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() {
@@ -485,7 +480,7 @@ package_qt5-tools() {
   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/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 \
diff --git a/extra/qt5/designer.desktop b/extra/qt5/designer.desktop
index 86aefe020..b39e77a45 100644
--- a/extra/qt5/designer.desktop
+++ b/extra/qt5/designer.desktop
@@ -3,7 +3,7 @@ Name=Qt Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt applications
 Exec=/usr/lib/qt/bin/designer
-Icon=designer
+Icon=QtProject-designer
 MimeType=application/x-designer;
 Terminal=false
 Type=Application