From 510b2944aefbcd24099bdffb7f1b28ab779a5da8 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Thu, 2 Jul 2009 10:43:13 +0000
Subject: [PATCH] - pregenerate PNG, drop BR on GraphicsMagick (bz#509244)

---
 .cvsignore |  6 ++++++
 qt.spec    | 24 ++++++++++++++++--------
 sources    |  6 ++++++
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1d68e22..4c7bf95 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,9 @@ hi48-app-qt4-logo.png
 gstreamer-logo.svg
 qt-x11-opensource-src-4.5.2.tar.bz2
 qt-copy-patches-20090626svn.tar.bz2
+hi128-phonon-gstreamer.png
+hi16-phonon-gstreamer.png
+hi22-phonon-gstreamer.png
+hi32-phonon-gstreamer.png
+hi48-phonon-gstreamer.png
+hi64-phonon-gstreamer.png
diff --git a/qt.spec b/qt.spec
index 6f0f26e..bb7674b 100644
--- a/qt.spec
+++ b/qt.spec
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -72,6 +72,12 @@ Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Provides: qt4-copy = %{qt_copy}}
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+Source14: hi48-phonon-gstreamer.png
+Source15: hi64-phonon-gstreamer.png
+Source16: hi128-phonon-gstreamer.png
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -164,8 +170,6 @@ BuildRequires: mysql-devel >= 4.0
 %if "%{?phonon_backend}" == "-phonon-backend"
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel 
-# icon-generation
-BuildRequires: GraphicsMagick
 %endif
 
 %if "%{?gtkstyle}" == "-gtkstyle"
@@ -655,11 +659,12 @@ popd
 
 %if "%{?phonon_backend}" == "-phonon-backend"
 install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
-for i in 16 22 32 48 64 128; do
-  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  gm convert -background None -geometry ${i}x${i}  %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
-  touch --reference %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
-done
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
 %endif
 
 
@@ -909,6 +914,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Thu Jul 02 2009 Than Ngo <than@redhat.com> - 4.5.2-3
+- pregenerate PNG, drop BR on GraphicsMagick (bz#509244)
+
 * Fri Jun 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.2-2
 - take current qt-copy-patches snapshot (20090626)
 - disable patches which are already in 4.5.2
diff --git a/sources b/sources
index 1f3f24c..b57029b 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,9 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.tar.bz2
 9865efce56f62a441a76626226b5f946  qt-copy-patches-20090626svn.tar.bz2
+60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
+7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
+0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
+12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
+86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
+153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png