rpms/amarok/devel amarok-2.3.1-glib26_signals_fix.patch, NONE, 1.1 amarok.spec, 1.194, 1.195

[Rex Dieter]

Author: rdieter

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.3.1-glib26_signals_fix.patch 
Log Message:
use upstream glib26 fix


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

--- NEW FILE amarok-2.3.1-glib26_signals_fix.patch ---
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
 }


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- amarok.spec	10 Jun 2010 12:08:12 -0000	1.194
+++ amarok.spec	10 Jun 2010 18:56:01 -0000	1.195
@@ -11,9 +11,9 @@ Source0: http://download.kde.org/stable/
 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}