rpms/amarok/devel amarok-1.4.8-gcc43.patch, 1.4, 1.5 amarok.spec, 1.101, 1.102

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12504

Modified Files:
	amarok-1.4.8-gcc43.patch amarok.spec 
Log Message:
gcc43 patch respin


amarok-1.4.8-gcc43.patch:

Index: amarok-1.4.8-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok-1.4.8-gcc43.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amarok-1.4.8-gcc43.patch	21 Feb 2008 21:20:29 -0000	1.4
+++ amarok-1.4.8-gcc43.patch	22 Feb 2008 03:12:54 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp
 --- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp	2008-02-21 15:02:40.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp	2008-02-21 21:05:18.000000000 -0600
 @@ -30,6 +30,7 @@ email                : aumuell at reserv.at
  #include <audioproperties.h>
  
@@ -11,7 +11,7 @@
  
 diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
 --- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2008-02-21 15:18:24.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2008-02-21 21:05:18.000000000 -0600
 @@ -24,6 +24,7 @@
  
  #include "taglib_mp4filetyperesolver.h"
@@ -22,7 +22,7 @@
          bool readProperties,
 diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp
 --- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp	2008-02-21 15:02:00.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp	2008-02-21 21:05:18.000000000 -0600
 @@ -24,6 +24,8 @@ email                : andrew.leadbetter
  
  #include <tag.h>
@@ -34,7 +34,7 @@
  
 diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp
 --- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp	2008-02-21 15:02:00.000000000 -0600
++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp	2008-02-21 21:05:18.000000000 -0600
 @@ -30,6 +30,7 @@ email                : andrew.leadbetter
  #endif
  
@@ -43,3 +43,37 @@
  
  #ifndef UINT64_TO_DOUBLE
  #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
+diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp
+--- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
++++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp	2008-02-21 21:07:10.000000000 -0600
+@@ -15,6 +15,8 @@
+  the alsa guys
+  ***************************************************************************/
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h
+--- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43	2007-12-17 09:53:18.000000000 -0600
++++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h	2008-02-21 21:07:54.000000000 -0600
+@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe
+ #include <limits.h>
+ #include <sys/param.h>
+ #include <pthread.h>
++#include <string.h>
+ #include <vector>
+ #include <config.h>
+ #include <iostream>
+diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp
+--- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
++++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp	2008-02-21 21:09:38.000000000 -0600
+@@ -15,6 +15,7 @@
+ #include <climits>
+ #include <cmath>
+ #include <stdarg.h>
++#include <string.h>
+ 
+ #include <config.h>
+ 


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- amarok.spec	21 Feb 2008 20:38:42 -0000	1.101
+++ amarok.spec	22 Feb 2008 03:12:54 -0000	1.102
@@ -19,8 +19,6 @@
 Group: 	    Applications/Multimedia
 License:    GPLv2+
 Url:        http://amarok.kde.org
-# http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-#Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -169,6 +167,9 @@
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if ! 0%{?konq}
+rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%endif
 
 
 %find_lang %{name} 
@@ -288,7 +289,7 @@
 - -konqueror subpkg (#426803)
 - fix multiarch conflicts (#340641)
   drop Provides: amarok-devel (f9+), add Obsoletes: amarok-devel
-- gcc43 patch
+- gcc43 patch (#433904)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.8-3
 - Autorebuild for GCC 4.3