rpms/amarok/devel amarok-2.0.1.1-qt45.patch, NONE, 1.1 amarok.spec, 1.132, 1.133

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16811

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.1.1-qt45.patch 
Log Message:
* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-4
- qt45 patch


amarok-2.0.1.1-qt45.patch:

--- NEW FILE amarok-2.0.1.1-qt45.patch ---
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) {



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- amarok.spec	20 Feb 2009 16:16:44 -0000	1.132
+++ amarok.spec	23 Feb 2009 21:08:30 -0000	1.133
@@ -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 @@
 %setup -q
 %patch0 -p0 -b .libgpod-0.7.0
 
+%patch100 -p0 -b .qt45
+
 
 %build
 mkdir -p %{_target_platform}
@@ -117,6 +120,9 @@
 
 
 %changelog
+* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-4
+- qt45 patch
+
 * Fri Feb 20 2009 Todd Zullinger <tmz at pobox.com> - 2.0.1.1-3
 - Rebuild against libgpod-0.7.0
 - Drop gtk2-devel BR, libgpod properly requires that now