[arch-commits] Commit in qt/repos (5 files)

[Pierre Schmitz]

    Date: Friday, October 17, 2008 @ 09:11:43
  Author: pierre
Revision: 15708

Merged revisions 15707 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qt/trunk

........
  r15707 | pierre | 2008-10-17 15:10:40 +0200 (Fr, 17 Okt 2008) | 1 line
  
  upgpkg: qt 4.4.3-1
........

Added:
  qt/repos/extra-x86_64/qt4-assistant.desktop
    (from rev 15707, qt/trunk/qt4-assistant.desktop)
  qt/repos/extra-x86_64/qt4-designer.desktop
    (from rev 15707, qt/trunk/qt4-designer.desktop)
  qt/repos/extra-x86_64/qt4-linguist.desktop
    (from rev 15707, qt/trunk/qt4-linguist.desktop)
Modified:
  qt/repos/extra-x86_64/	(properties)
  qt/repos/extra-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   24 +++++++++++++++++-------
 qt4-assistant.desktop |   10 ++++++++++
 qt4-designer.desktop  |   11 +++++++++++
 qt4-linguist.desktop  |   11 +++++++++++
 4 files changed, 49 insertions(+), 7 deletions(-)


Property changes on: qt/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /qt/trunk:1-12906
   + /qt/trunk:1-15707

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-17 13:10:40 UTC (rev 15707)
+++ extra-x86_64/PKGBUILD	2008-10-17 13:11:43 UTC (rev 15708)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=qt
-pkgver=4.4.2
-pkgrel=3
+pkgver=4.4.3
+pkgrel=1
 _qtcopyver=863965
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
@@ -18,10 +18,14 @@
 conflicts=('qt4')
 _pkgfqn=qt-x11-opensource-src-$pkgver
 # svn export -r -${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
-source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz"
-        "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2")
-md5sums=('d310e4aada6b726c141cb3cfa848edea'
-         'e24c3505cdba21a254ccfc0a5b7af508')
+source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.bz2"
+        "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2"
+        'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop')
+md5sums=('00e00c6324d342a7b0d8653112b4f08c'
+         'e24c3505cdba21a254ccfc0a5b7af508'
+         'c95e1697bf2b923199c3b8cd7d485a17'
+         '00333dca87e24767383217ba378b5980'
+         '71f7ac8206c19da7ecf71cdb391f0452')
 
 build() {
 	unset QMAKESPEC
@@ -83,7 +87,13 @@
 	make || return 1
 	make INSTALL_ROOT=$pkgdir install || return 1
 
-	# lots of cleanup and path fixes - thanks to crazy (frugalware)
+	install -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/pixmaps/assistant.png
+	install -D -m644 tools/linguist/linguist/images/appicon.png ${pkgdir}/usr/share/pixmaps/linguist.png
+	install -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/pixmaps/designer.png
+	install -d ${pkgdir}/usr/share/applications
+	install -m644 ${srcdir}/qt4-{linguist,designer,assistant}.desktop ${pkgdir}/usr/share/applications/
+
+	# cleanup and path fixes
 	find $pkgdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
 	sed -i -e "s|-L$srcdir/${_pkgfqn}/lib||g" $pkgdir/usr/lib/pkgconfig/*.pc
 	sed -i -e "s|$srcdir/${_pkgfqn}/bin/moc|/usr/bin/moc|g" $pkgdir/usr/lib/pkgconfig/*.pc

Copied: qt/repos/extra-x86_64/qt4-assistant.desktop (from rev 15707, qt/trunk/qt4-assistant.desktop)
===================================================================
--- extra-x86_64/qt4-assistant.desktop	                        (rev 0)
+++ extra-x86_64/qt4-assistant.desktop	2008-10-17 13:11:43 UTC (rev 15708)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/assistant
+Name=Qt 4 Assistant
+GenericName=Qt4 Document Browser
+X-KDE-StartupNotify=true
+Icon=/usr/share/pixmaps/assistant.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation

Copied: qt/repos/extra-x86_64/qt4-designer.desktop (from rev 15707, qt/trunk/qt4-designer.desktop)
===================================================================
--- extra-x86_64/qt4-designer.desktop	                        (rev 0)
+++ extra-x86_64/qt4-designer.desktop	2008-10-17 13:11:43 UTC (rev 15708)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/designer
+Name=Qt 4 Designer
+GenericName=Interface Designer
+X-KDE-StartupNotify=true
+MimeType=application/x-designer
+Icon=/usr/share/pixmaps/designer.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;GUIDesigner

Copied: qt/repos/extra-x86_64/qt4-linguist.desktop (from rev 15707, qt/trunk/qt4-linguist.desktop)
===================================================================
--- extra-x86_64/qt4-linguist.desktop	                        (rev 0)
+++ extra-x86_64/qt4-linguist.desktop	2008-10-17 13:11:43 UTC (rev 15708)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/linguist
+Name=Qt 4 Linguist
+GenericName=Translation Tool
+X-KDE-StartupNotify=true
+MimeType=application/x-linguist
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/linguist.png
+Categories=Qt;Development;Translation