[rpms/amarok] epel10.2: - qt45 patch

[rpms/amarok] epel10.2: - qt45 patch

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 8e6b66cccfa1b66f2a325bb4ad75b4259252dfba
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2009-02-23T21:08:30+00:00
Stats  : +44/-5 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/8e6b66cccfa1b66f2a325bb4ad75b4259252dfba?branch=epel10.2

Log:
- qt45 patch

---
diff --git a/amarok-2.0.1.1-qt45.patch b/amarok-2.0.1.1-qt45.patch
new file mode 100644
index 0000000..585bb6b
--- /dev/null
+++ b/amarok-2.0.1.1-qt45.patch
@@ -0,0 +1,33 @@
+Index: src/scriptengine/generator/generator/typesystem_gui.xml
+===================================================================
+--- src/scriptengine/generator/generator/typesystem_gui.xml	(revision 926173)
++++ src/scriptengine/generator/generator/typesystem_gui.xml	(working copy)
+@@ -5389,8 +5389,13 @@
+   <object-type name="QInputContextPlugin"/>
+   <object-type name="QPictureFormatPlugin"/>
+   <object-type name="QStylePlugin"/>
+-  <object-type name="QTextCodecPlugin"/>
+-     
++  
++  <object-type name="QTextCodecPlugin">
++    <inject-code class="shell" position="beginning">
++Q_DECLARE_METATYPE(QList&lt;int>)
++    </inject-code>
++  </object-type>
++       
+   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/>
+   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
+   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
+Index: src/scriptengine/generator/generator/shellimplgenerator.cpp
+===================================================================
+--- src/scriptengine/generator/generator/shellimplgenerator.cpp	(revision 926173)
++++ src/scriptengine/generator/generator/shellimplgenerator.cpp	(working copy)
+@@ -105,6 +105,7 @@
+         declareFunctionMetaTypes(s, functions, registeredTypeNames);
+         s << endl;
+     }
++    writeInjectedCode(s, meta_class);
+ 
+     // write constructors
+     foreach (const AbstractMetaFunction *ctor, ctors) {
+

diff --git a/amarok.spec b/amarok.spec
index df20cdb..cb58c26 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,23 +2,24 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # From amarok svn, r871433 (Note that this was reverted later, I believe the
 # reasoning for reverting was incorrect. -- tmz :)
 Patch0:  amarok-libgpod-0.7.0.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch100: amarok-2.0.1.1-qt45.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-# FIXME: bogus deps, from where?
-BuildRequires: giflib-devel pcre-devel
-BuildRequires: kdelibs4-devel >= 4.1.0
+BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
 BuildRequires: libgpod-devel
 BuildRequires: libmp4v2-devel
@@ -52,6 +53,8 @@ Amarok is a multimedia player with:
 %setup -q
 %patch0 -p0 -b .libgpod-0.7.0
 
+%patch100 -p0 -b .qt45
+
 
 %build
 mkdir -p %{_target_platform}
@@ -117,6 +120,9 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Mon Feb 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.0.1.1-4
+- qt45 patch
+
 * Fri Feb 20 2009 Todd Zullinger <tmz@pobox.com> - 2.0.1.1-3
 - Rebuild against libgpod-0.7.0
 - Drop gtk2-devel BR, libgpod properly requires that now