Merge branch 'master' of gparabola:abslibre-mips64el

5 files changed, 40 insertions, 12 deletions

diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 62851cbea..430e0d077 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $
+# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
 pkgver=4.8.4
-pkgrel=16
+pkgrel=18
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -31,14 +31,16 @@ replaces=('qt<=4.8.4')
 conflicts=('qt')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
-        'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop'
+        'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
+        'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch'
 	'declarative-fix-sigbus.patch')
 md5sums=('89c5ecba180cae74c66260ac732dc5cb'
          'a16638f4781e56e7887ff8212a322ecc'
-         '4f0152ba6d645e81218b23ba8beeb42d'
-         '283a00ff7f662dca481b70d6daa826e0'
-         '027683880235708d4bc270a7ef961183'
+         '8a28b3f52dbeb685d4b69440b520a3e1'
+         '9727c406c240990870c905696a8c5bd1'
+         '0e384663d3dd32abe35f5331c4147569'
+         'b859c5673e5098c39f72b2252947049e'
          'c439c7731c25387352d8453ca7574971'
          'aac963d05a9d5733e2bfce9e26607f51')
 
@@ -100,10 +102,26 @@ package() {
 
     # install missing icons and desktop files
     install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
+      "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png
+    install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+      "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png
+    install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
+      "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png
+    install -D -m644 tools/designer/src/designer/images/designer.png \
+      "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png
+    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+      size=$(echo $(basename ${icon}) | cut -d- -f2)
+      install -D -m644 ${icon} \
+          "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png
+    done
+    install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \
+      "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png
+    install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+      "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png
+
     install -d "${pkgdir}"/usr/share/applications
-    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \
-      "${pkgdir}/usr/share/applications/"
+    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \
+      "${pkgdir}"/usr/share/applications/
 
     # Useful symlinks for cmake and configure scripts
     install -d "${pkgdir}"/usr/bin
diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop
index d2904beb2..d874d612b 100644
--- a/extra/qt4/assistant-qt4.desktop
+++ b/extra/qt4/assistant-qt4.desktop
@@ -2,7 +2,7 @@
 Name=Qt4 Assistant 
 Comment=Shows Qt4 documentation and examples
 Exec=assistant-qt4
-Icon=assistant
+Icon=assistant-qt4
 Terminal=false
 Encoding=UTF-8
 Type=Application
diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop
index 514146e78..86ea4eda5 100644
--- a/extra/qt4/designer-qt4.desktop
+++ b/extra/qt4/designer-qt4.desktop
@@ -3,7 +3,7 @@ Name=Qt4 Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt4 applications
 Exec=designer-qt4
-Icon=designer
+Icon=designer-qt4
 MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8
diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop
index 61036b307..765c88275 100644
--- a/extra/qt4/linguist-qt4.desktop
+++ b/extra/qt4/linguist-qt4.desktop
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist
+Icon=linguist-qt4
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
 Encoding=UTF-8
diff --git a/extra/qt4/qdbusviewer-qt4.desktop b/extra/qt4/qdbusviewer-qt4.desktop
new file mode 100644
index 000000000..2d4218c9b
--- /dev/null
+++ b/extra/qt4/qdbusviewer-qt4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 QDbusViewer 
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=qdbusviewer-qt4
+Icon=qdbusviewer-qt4
+Terminal=false
+Type=Application
+Categories=Qt;Development;Debugger;
+