[rpms/amarok] epel10.2: use upstream glib26 fix

[rpms/amarok] epel10.2: use upstream glib26 fix

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 7bf5b2693f052afd302b2f8a69d728263670ac7c
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-06-10T18:56:01+00:00
Stats  : +16/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/7bf5b2693f052afd302b2f8a69d728263670ac7c?branch=epel10.2

Log:
use upstream glib26 fix

---
diff --git a/amarok-2.3.1-glib26_signals_fix.patch b/amarok-2.3.1-glib26_signals_fix.patch
new file mode 100644
index 0000000..308978e
--- /dev/null
+++ b/amarok-2.3.1-glib26_signals_fix.patch
@@ -0,0 +1,14 @@
+diff -up amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp.signals_fix amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
+--- amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp.signals_fix	2010-05-27 13:37:21.000000000 -0500
++++ amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp	2010-06-10 13:57:50.291880276 -0500
+@@ -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
+ }

diff --git a/amarok.spec b/amarok.spec
index 192b3bb..2d91dee 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -11,9 +11,9 @@ Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.2.1.90-qtscript_not_required.patch
-Patch60: amarok-2.3.1-fix-unsafe.patch
 
 ## upstream patches
+Patch100: amarok-2.3.1-glib26_signals_fix.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -82,7 +82,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch60 -p0
+%patch100 -p1 -b .glib26_signals_fix
 
 %build
 mkdir -p %{_target_platform}