From ae3ef1513389056a61280db184943bb0ede3a1ae Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 18 Dec 2010 17:20:57 +0100
Subject: [PATCH] qt-devel-tools: do not install the phonon-gstreamer.png file,
 qt-plugin-gstreamer pkg was removed.

---
 srcpkgs/qt/files/gstreamer-logo.png | Bin 2442 -> 0 bytes
 srcpkgs/qt/qt-devel-tools.template  |   1 +
 srcpkgs/qt/template                 |  23 ++++++++++-------------
 3 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/qt/files/gstreamer-logo.png

diff --git a/srcpkgs/qt/files/gstreamer-logo.png b/srcpkgs/qt/files/gstreamer-logo.png
deleted file mode 100644
index 0994c819fa29abae0f04ab1e53c3a2b983d7a14f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2442
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
IM6N<$g1RD~I{*Lx

diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template
index a32dfd540e6..bf5d1ebc771 100644
--- a/srcpkgs/qt/qt-devel-tools.template
+++ b/srcpkgs/qt/qt-devel-tools.template
@@ -6,6 +6,7 @@ long_desc="${long_desc}
  This packages contains tools used to assist in Qt development, including
  the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications. "
 
+revision=1
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run libgcc
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index b3012da0f6b..4fa2df599c9 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -89,36 +89,33 @@ do_build()
 		-plugin-sql-mysql -plugin-sql-psql -no-sql-oci \
 		-no-sql-odbc -no-sql-sqlite2 \
 		-no-cups -dbus-linked -no-nas-sound -iconv -shared \
-		-release -fast -no-sql-tds || return 1
+		-release -fast -no-sql-tds
 
-	make ${makejobs} || return 1
+	make ${makejobs}
 }
 
 do_install()
 {
 	local hicolordir=${DESTDIR}/usr/share/icons/hicolor
 
-	cd ${wrksrc} || return 1
-	make INSTALL_ROOT=${DESTDIR} install || return 1
+	cd ${wrksrc}
+	make INSTALL_ROOT=${DESTDIR} install
 
 	# install missing icons and desktop files
 	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
 		size=$(echo $(basename ${icon}) | cut -d- -f2)
 		install -D -m644 ${icon} \
-			${hicolordir}/${size}x${size}/apps/linguist.png \
-			|| return 1
+			${hicolordir}/${size}x${size}/apps/linguist.png
 	done
 	install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-		${hicolordir}/64x64/apps/qtlogo.png || return 1
+		${hicolordir}/64x64/apps/qtlogo.png
 	install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-		${DESTDIR}/usr/share/pixmaps/qtlogo.png || return 1
+		${DESTDIR}/usr/share/pixmaps/qtlogo.png
 	install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
-		${hicolordir}/32x32/apps/assistant.png || return 1
+		${hicolordir}/32x32/apps/assistant.png
 	install -D -m644 tools/designer/src/designer/images/designer.png \
-		${hicolordir}/128x128/apps/designer.png || return 1
-	install -D -m644 ${FILESDIR}/gstreamer-logo.png \
-		${hicolordir}/128x128/apps/phonon-gstreamer.png || return 1
+		${hicolordir}/128x128/apps/designer.png
 	install -d ${DESTDIR}/usr/share/applications
 	install -m644 ${FILESDIR}/*.desktop \
-		${DESTDIR}/usr/share/applications || return 1
+		${DESTDIR}/usr/share/applications
 }