[rpms/amarok] epel10.2: fix try 3

[thomasj <thomasj@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 306f2e33c7114eab8072a5dff2637aeca9bc2d75
Author : thomasj <thomasj@fedoraproject.org>
Date   : 2010-06-10T18:18:10+00:00
Stats  : +15/-13 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/306f2e33c7114eab8072a5dff2637aeca9bc2d75?branch=epel10.2

Log:
fix try 3

---
diff --git a/amarok-2.3.1-fix-unsafe.patch b/amarok-2.3.1-fix-unsafe.patch
index cd8f728..d4e7c17 100644
--- a/amarok-2.3.1-fix-unsafe.patch
+++ b/amarok-2.3.1-fix-unsafe.patch
@@ -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 )