rpms/amarok/devel amarok-2.3.1-fix-unsafe.patch,1.3,1.4

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13971

Modified Files:
	amarok-2.3.1-fix-unsafe.patch 
Log Message:
fix try 4

amarok-2.3.1-fix-unsafe.patch:
 IpodHandler.cpp |    4 ++++
 1 file changed, 4 insertions(+)

Index: amarok-2.3.1-fix-unsafe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok-2.3.1-fix-unsafe.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- amarok-2.3.1-fix-unsafe.patch	10 Jun 2010 18:18:10 -0000	1.3
+++ amarok-2.3.1-fix-unsafe.patch	10 Jun 2010 19:04:01 -0000	1.4
@@ -1,20 +1,13 @@
---- src/core-impl/collections/ipodcollection/IpodCollection.cpp	2010-05-27 20:37:21.000000000 +0200
-+++ src/core-impl/collections/ipodcollection/IpodCollection.cpp.old	2010-06-10 20:15:52.000000000 +0200
-@@ -27,6 +27,17 @@
- #include <KUrl>
- #include <KStandardDirs>
- 
-+extern "C" {
-+#include <glib-object.h> // g_type_init
-+#ifdef GDK_FOUND
+--- src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp	2010-05-27 20:37:21.000000000 +0200
++++ src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp.old	2010-06-10 21:02:35.000000000 +0200
+@@ -28,6 +28,10 @@
+ extern "C" {
+ #include <glib-object.h> // g_type_init
+ #ifdef GDK_FOUND
 +// work around compile issue with glib >= 2.25
 +#ifdef signals
 +#undef signals
 +#endif
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+#endif
-+}
-+
- using namespace Collections;
- 
- AMAROK_EXPORT_COLLECTION( IpodCollectionFactory, ipodcollection )
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #endif
+ }