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

[thomasj]

Author: thomasj

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

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

amarok-2.3.1-fix-unsafe.patch:
 IpodCollection.cpp |   11 +++++++++++
 1 file changed, 11 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- amarok-2.3.1-fix-unsafe.patch	10 Jun 2010 13:43:05 -0000	1.2
+++ amarok-2.3.1-fix-unsafe.patch	10 Jun 2010 18:18:10 -0000	1.3
@@ -1,18 +1,20 @@
 --- 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 15:42:15.000000000 +0200
-@@ -16,6 +16,15 @@
++++ src/core-impl/collections/ipodcollection/IpodCollection.cpp.old	2010-06-10 20:15:52.000000000 +0200
+@@ -27,6 +27,17 @@
+ #include <KUrl>
+ #include <KStandardDirs>
  
- #define DEBUG_PREFIX "IpodCollection"
- 
-+#define signals glib_signals
-+// Libgdk includes.
-+
-+extern "C"
-+{
++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
 +}
-+#undef signals
 +
- #include "IpodCollection.h"
- #include "IpodConnectionAssistant.h"
- #include "IpodDeviceInfo.h"
+ using namespace Collections;
+ 
+ AMAROK_EXPORT_COLLECTION( IpodCollectionFactory, ipodcollection )