packages (AMAROK_1_4): amarok/amarok.spec, amarok/gcc44.patch - one gcc44 f...

[glen]

Author: glen                         Date: Wed Aug 26 09:26:04 2009 GMT
Module: packages                      Tag: AMAROK_1_4
---- Log message:
- one gcc44 fix still needed

---- Files affected:
packages/amarok:
   amarok.spec (1.200.2.4 -> 1.200.2.5) , gcc44.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.200.2.4 packages/amarok/amarok.spec:1.200.2.5
--- packages/amarok/amarok.spec:1.200.2.4	Wed Aug 26 10:53:39 2009
+++ packages/amarok/amarok.spec	Wed Aug 26 11:25:58 2009
@@ -46,6 +46,7 @@
 Patch8:		%{name}-mongrel.patch
 Patch9:		%{name}-libmtp.patch
 Patch10:	kde-am.patch
+Patch11:	gcc44.patch
 URL:		http://amarok.kde.org/
 # Upgrade to 2.0.1.1 required?
 # http://www.trapkit.de/advisories/TKADV2009-002.txt
@@ -213,6 +214,7 @@
 %patch8 -p1
 %patch9 -p0
 %patch10 -p1
+%patch11 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
@@ -459,6 +461,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200.2.5  2009/08/26 09:25:58  glen
+- one gcc44 fix still needed
+
 Revision 1.200.2.4  2009/08/26 08:53:39  glen
 - apply branch diff; gcc44.patch outdated
 

================================================================
Index: packages/amarok/gcc44.patch
diff -u /dev/null packages/amarok/gcc44.patch:1.1.2.3
--- /dev/null	Wed Aug 26 11:26:04 2009
+++ packages/amarok/gcc44.patch	Wed Aug 26 11:25:59 2009
@@ -0,0 +1,12 @@
+--- amarok-1.4.10/amarok/src/engine/helix/helix-sp/helix-sp.cpp~	2009-08-26 11:54:15.000000000 +0300
++++ amarok-1.4.10/amarok/src/engine/helix/helix-sp/helix-sp.cpp	2009-08-26 12:11:01.439976507 +0300
+@@ -1540,8 +1540,7 @@
+          delete [] ppctrl[playerIndex]->pszURL;
+ 
+       // see if the file is already in the form of a url
+-      char *tmp = strstr(file, "://");
+-      if (!tmp)
++      if (!strstr(file, "://"))
+       {
+          char pszURLOrig[MAXPATHLEN];
+          const char* pszAddOn;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.200.2.4&r2=1.200.2.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/gcc44.patch?r1=1.1.2.2&r2=1.1.2.3&f=u