rpms/amarok/EL-5 amarok-1.4.10-gcc44.patch, NONE, 1.1 amarok-20090624svn.patch, NONE, 1.1 svn.sh, NONE, 1.1 amarok-1.4.10-wikipedia.patch, 1.1, 1.2 amarok-1.4.8-gcc43.patch, 1.1, 1.2 amarok.spec, 1.86, 1.87

Rex Dieter rdieter at fedoraproject.org
Thu Jun 25 03:38:08 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5683

Modified Files:
	amarok-1.4.10-wikipedia.patch amarok-1.4.8-gcc43.patch 
	amarok.spec 
Added Files:
	amarok-1.4.10-gcc44.patch amarok-20090624svn.patch svn.sh 
Log Message:
* Wed Jun 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-5.20090624
- pull latest upstream translations, bugfixes
- make buildable on F-10+ as amarok1
- adjust wikipedia patch (to match upstream svn)


amarok-1.4.10-gcc44.patch:

--- NEW FILE amarok-1.4.10-gcc44.patch ---
diff -up amarok-1.4.10/amarok/src/metabundlesaver.cpp.gcc44 amarok-1.4.10/amarok/src/metabundlesaver.cpp
--- amarok-1.4.10/amarok/src/metabundlesaver.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metabundlesaver.cpp	2009-06-24 19:47:33.925393141 -0500
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff -up amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp
--- amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metadata/audible/audibleproperties.cpp	2009-06-24 19:22:02.067392968 -0500
@@ -30,6 +30,7 @@
 #include "taglib_audiblefile.h"
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 
 using namespace TagLib;
 
diff -up amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp
--- amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp.gcc44	2009-06-24 17:56:58.028408629 -0500
+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp	2009-06-24 19:21:48.268393514 -0500
@@ -28,6 +28,7 @@
 #include <taglib/tag.h>
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -up amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp
--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefile.cpp	2009-06-24 19:22:31.418393224 -0500
@@ -26,6 +26,7 @@
 #include "taglib_audiblefile.h"
 
 #include "audibletag.h"
+#include <stdio.h>
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
 
diff -up amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
--- amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metadata/audible/taglib_audiblefiletyperesolver.cpp	2009-06-24 19:30:12.916415686 -0500
@@ -22,6 +22,7 @@
 #include "taglib_audiblefiletyperesolver.h"
 #include "taglib_audiblefile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
diff -up amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp
--- amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfile.cpp	2009-06-24 19:39:27.704414268 -0500
@@ -29,6 +29,8 @@
 #include <taglib/audioproperties.h>
 #include <taglib/tag.h>
 
+#include <stdio.h>
+
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
 // public members
diff -up amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp
--- amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metadata/wav/wavfiletyperesolver.cpp	2009-06-24 19:39:59.069393086 -0500
@@ -22,6 +22,7 @@
 #include "wavfiletyperesolver.h"
 #include "wavfile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
diff -up amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp.gcc44 amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp
--- amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp.gcc44	2008-08-13 16:21:51.000000000 -0500
+++ amarok-1.4.10/amarok/src/metadata/wav/wavproperties.cpp	2009-06-24 19:34:56.846657652 -0500
@@ -30,6 +30,7 @@
 #include "wavfile.h"
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 
 using namespace TagLib;
 

amarok-20090624svn.patch:

--- NEW FILE amarok-20090624svn.patch ---
Index: src/engine/yauap/amarok_yauap-engine_plugin.desktop
===================================================================
--- src/engine/yauap/amarok_yauap-engine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/yauap/amarok_yauap-engine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -73,6 +73,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -81,7 +82,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/engine/mas/amarok_masengine_plugin.desktop
===================================================================
--- src/engine/mas/amarok_masengine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/mas/amarok_masengine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -83,6 +83,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -91,7 +92,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/engine/void/amarok_void-engine_plugin.desktop
===================================================================
--- src/engine/void/amarok_void-engine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/void/amarok_void-engine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -82,6 +82,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -90,7 +91,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/engine/xine/amarok_xine-engine.desktop
===================================================================
--- src/engine/xine/amarok_xine-engine.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/xine/amarok_xine-engine.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -85,6 +85,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -93,7 +94,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/engine/nmm/amarok_nmmengine_plugin.desktop
===================================================================
--- src/engine/nmm/amarok_nmmengine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/nmm/amarok_nmmengine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -94,7 +94,7 @@
 Comment[pa]=ਅਮਰੋਕ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin do Amarok
+Comment[pt_BR]=Plug-in do Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Amarok-lassemoduvla
 Comment[sk]=Amarok modul
Index: src/engine/helix/amarok_helixengine_plugin.desktop
===================================================================
--- src/engine/helix/amarok_helixengine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/amarok_helixengine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -81,6 +81,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -89,7 +90,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/engine/helix/helix-sp/helix-sp.h
===================================================================
--- src/engine/helix/helix-sp/helix-sp.h	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/helix-sp/helix-sp.h	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -23,6 +23,7 @@
 #include <limits.h>
 #include <sys/param.h>
 #include <pthread.h>
+#include <string.h>
 #include <vector>
 #include <config.h>
 #include <iostream>
@@ -32,6 +33,7 @@
 
 #define MAX_PLAYERS 100 // that should do it...
 #define MAX_SCOPE_SAMPLES 5120
+#undef USE_HELIX_ALSA
 
 class HelixSimplePlayer;
 class CHXURL;
@@ -324,8 +326,8 @@
    struct _snd_mixer*      m_pAlsaMixerHandle;
    struct _snd_mixer_elem* m_pAlsaMasterMixerElem;
    struct _snd_mixer_elem* m_pAlsaPCMMixerElem;
+   char *m_alsaDevice;
 #endif
-   char *m_alsaDevice;
    bool m_urlchanged;
    int m_volBefore;
    int m_volAtStart;
Index: src/engine/helix/helix-sp/hspcontext.cpp
===================================================================
--- src/engine/helix/helix-sp/hspcontext.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/helix-sp/hspcontext.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -153,12 +153,17 @@
 
           if (m_splayer->getOutputSink() == HelixSimplePlayer::ALSA)
              strcpy((char *)outbuf, "3"); // set SoundDriver = kALSA (ie 3) for Alsa native support
+          else if (m_splayer->getOutputSink() == HelixSimplePlayer::ESOUND)
+             strcpy((char *)outbuf, "2"); // set SoundDriver = kESOUND (ie 2) for Enlightenment Sound Daemon
           else if (m_splayer->getOutputSink() == HelixSimplePlayer::OSS)
              strcpy((char *)outbuf, "0"); // set SoundDriver = kOSS (ie 0) for OSS
           buffer = ibuf;
 
-          if (m_splayer->getOutputSink() == HelixSimplePlayer::ALSA || m_splayer->getOutputSink() == HelixSimplePlayer::OSS)
-             m_splayer->print2stderr("Setting Sound System to %s\n", m_splayer->getOutputSink() == HelixSimplePlayer::ALSA ? "ALSA" : "OSS");
+          if (m_splayer->getOutputSink() == HelixSimplePlayer::ALSA || 
+              m_splayer->getOutputSink() == HelixSimplePlayer::ESOUND ||
+              m_splayer->getOutputSink() == HelixSimplePlayer::OSS)
+             m_splayer->print2stderr("Setting Sound System to %s\n", m_splayer->getOutputSink() == HelixSimplePlayer::ALSA ? 
+                                     "ALSA" : (m_splayer->getOutputSink() == HelixSimplePlayer::ESOUND ? "ESD" : "OSS") );
           else
              m_splayer->print2stderr("Setting Sound System to UNKNOWN: %d\n", m_splayer->getOutputSink());
        }
Index: src/engine/helix/helix-sp/helix-sp.cpp
===================================================================
--- src/engine/helix/helix-sp/helix-sp.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/helix-sp/helix-sp.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -383,17 +383,21 @@
 #else
    m_direct(OSS),
 #endif
-   m_AlsaCapableCore(false),
+   m_AlsaCapableCore(true),
    m_nDevID(-1),
+#ifdef USE_HELIX_ALSA
    m_pAlsaMixerHandle(NULL),
    m_pAlsaMasterMixerElem(NULL),
    m_pAlsaPCMMixerElem(NULL),
    m_alsaDevice("default"),
+#endif
    m_urlchanged(0),
    m_volBefore(-1),
-   m_volAtStart(-1),
-   m_MvolBefore(-1),
+   m_volAtStart(-1)
+#ifdef USE_HELIX_ALSA
+   ,m_MvolBefore(-1),
    m_MvolAtStart(-1)
+#endif
 {
 
    pthread_mutexattr_t ma;
@@ -671,6 +675,12 @@
       m_direct = ALSA;
       openAudioDevice();
    }
+   else if (m_outputsink == ESOUND)
+   {
+      closeAudioDevice();
+      m_direct = ESOUND;
+      openAudioDevice();
+   }
    else
    {
       closeAudioDevice();
@@ -895,8 +905,10 @@
       delete ppctrl[i];
   }
 
+#ifdef USE_HELIX_ALSA
    if (pAudioDevice)
       pAudioDevice->Release();
+#endif
 
    if (pAudioDeviceResponse)
       pAudioDeviceResponse->Release();
@@ -997,10 +1009,13 @@
 
 void HelixSimplePlayer::setOutputSink( HelixSimplePlayer::AUDIOAPI out )
 {
-#ifdef USE_HELIX_ALSA
+#ifndef USE_HELIX_ALSA
    m_outputsink = out;
 #else
-   m_outputsink = OSS;
+   if (out == ALSA)
+      m_outputsink = OSS;
+   else
+      m_outputsink = out;
 #endif
 }
 
@@ -1148,6 +1163,9 @@
       }
       break;
 
+      case ESOUND:
+         break;
+
       default:
          print2stderr("Unknown audio interface in openAudioDevice()\n");
    }
@@ -1206,6 +1224,9 @@
       }
       break;
 
+      case ESOUND:
+         break;
+
       default:
          print2stderr("Unknown audio interface in closeAudioDevice()\n");
    }
@@ -1347,7 +1368,9 @@
 
          if (m_nDevID < 0 || (::ioctl( m_nDevID, MIXER_READ(HX_VOLUME), &nVolume) < 0))
          {
+#ifdef USE_HELIX_ALSA
             print2stderr("ioctl fails when reading HW volume: mnDevID=%d, errno=%d\n", m_nDevID, errno);
+#endif
             nRetVolume = 50; // sensible default
          }
          else
@@ -1412,6 +1435,9 @@
       }
       break;
 
+      case ESOUND:
+         break;
+
       default:
          print2stderr("Unknown audio interface in getDirectPCMVolume()\n");
    }
@@ -1482,6 +1508,9 @@
       }
       break;
 
+      case ESOUND:
+         break;
+
       default:
          print2stderr("Unknown audio interface in setDirectPCMVolume()\n");
    }
@@ -1503,7 +1532,9 @@
       if (len >= MAXPATHLEN)
          return -1;;
 
+#ifdef USE_HELIX_ALSA
       print2stderr("SETURL MASTER VOL: %d\n",getDirectMasterVolume());
+#endif
 
       if (ppctrl[playerIndex]->pszURL)
          delete [] ppctrl[playerIndex]->pszURL;
@@ -1699,7 +1730,9 @@
       if (!ppctrl[playerIndex]->pszURL)
          return;
 
+#ifdef USE_HELIX_ALSA
       print2stderr("START MASTER VOL: %d\n",getDirectMasterVolume());
+#endif
 
       if (bEnableVerboseMode)
       {
Index: src/engine/helix/helix-configdialog.cpp
===================================================================
--- src/engine/helix/helix-configdialog.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/helix-configdialog.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -117,6 +117,9 @@
 #ifdef USE_HELIX_ALSA
    deviceComboBox->insertItem("alsa"); // and neither are the equivalents in gst (osssink and alsasink)
 #endif
+#ifdef USE_HELIX_ESD
+   deviceComboBox->insertItem("esd");
+#endif
    deviceComboBox->setCurrentItem(HelixConfig::outputplugin());
    QLabel* op = new QLabel( i18n("Output plugin:"), parent );
    op->setAlignment( QLabel::WordBreak | QLabel::AlignVCenter );
@@ -204,6 +207,8 @@
       HelixConfig::setOutputplugin(deviceComboBox->currentText());
       if (deviceComboBox->currentText() == "oss")
          m_engine->setOutputSink(HelixSimplePlayer::OSS);
+      else if (deviceComboBox->currentText() == "esd")
+         m_engine->setOutputSink(HelixSimplePlayer::ESOUND);
       else
          m_engine->setOutputSink(HelixSimplePlayer::ALSA);
 
@@ -223,6 +228,7 @@
    switch (api)
    {
       case HelixSimplePlayer::OSS:
+      case HelixSimplePlayer::ESOUND:
          deviceComboBox->setCurrentItem("oss");
          checkBox_outputDevice->setEnabled( false );
          lineEdit_outputDevice->setEnabled(false);
@@ -473,7 +479,7 @@
    }
    else
    {
-      HelixConfig::setOutputplugin(api ? "alsa" : "oss");
+      HelixConfig::setOutputplugin(api ? "alsa" : ( api ? "esd" : "oss") );
       HelixConfig::writeConfig();
       return 1;
    }
Index: src/engine/helix/helix-engine.cpp
===================================================================
--- src/engine/helix/helix-engine.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/helix-engine.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -15,6 +15,7 @@
 #include <climits>
 #include <cmath>
 #include <stdarg.h>
+#include <string.h>
 
 #include <config.h>
 
@@ -196,6 +197,8 @@
 
    if (HelixConfig::outputplugin() == "oss")
       setOutputSink( HelixSimplePlayer::OSS );
+   else if (HelixConfig::outputplugin() == "esd")
+      setOutputSink( HelixSimplePlayer::ESOUND );
    else
    {
       setOutputSink( HelixSimplePlayer::ALSA );
Index: src/engine/helix/hxplayercontrol.cpp
===================================================================
--- src/engine/helix/hxplayercontrol.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/helix/hxplayercontrol.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -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>
Index: src/engine/kdemm/amarok_kdemmengine_plugin.desktop
===================================================================
--- src/engine/kdemm/amarok_kdemmengine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/engine/kdemm/amarok_kdemmengine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -83,6 +83,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -91,7 +92,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/device/smb/amarok_smb-device.desktop
===================================================================
--- src/device/smb/amarok_smb-device.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/device/smb/amarok_smb-device.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -81,7 +81,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਜੰਤਰ ਪਲੱਗਇਨ, ਜੋ ਕਿ SMBFS ਲਈ ਸਹਾਇਕ ਹੈ
 Comment[pl]=Wtyczka urządzenia dla Amaroka obsługująca SMBFS
 Comment[pt]=Um 'plugin' de dispositivo para o Amarok que suporta o SMBFS
-Comment[pt_BR]=Plugin de dispositivo para o Amarok, que suporta SMBFS
+Comment[pt_BR]=Plug-in de dispositivo para o Amarok, que suporta SMBFS
 Comment[se]=Ovttadatlassemoduvla Amarokii mii doarju SMBFS
 Comment[sk]=Modul zariadenia pre Amarok, ktorý podporuje SMBFS
 Comment[sr]=Уређајски прикључак за Amarok који подржава SMBFS
Index: src/device/nfs/amarok_nfs-device.desktop
===================================================================
--- src/device/nfs/amarok_nfs-device.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/device/nfs/amarok_nfs-device.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -82,7 +82,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਜੰਤਰ ਪਲੱਗਇਨ, ਜੋ ਕਿ NFS ਲਈ ਸਹਾਇਕ ਹੈ
 Comment[pl]=Wtyczka urządzenia dla Amaroka z obsługą NFS
 Comment[pt]=Um 'plugin' de dispositivo para o Amarok que suporta o NFS
-Comment[pt_BR]=Plugin de dispositivo para o Amarok, que suporta NFS
+Comment[pt_BR]=Plug-in de dispositivo para o Amarok, que suporta NFS
 Comment[se]=Ovttadatlassemoduvla Amarokii mii doarju NFS
 Comment[sk]=Modul zariadenia pre Amarok, ktorý podporuje NFS
 Comment[sr]=Уређајски прикључак за Amarok који подржава NFS
Index: src/device/massstorage/amarok_massstorage-device.desktop
===================================================================
--- src/device/massstorage/amarok_massstorage-device.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/device/massstorage/amarok_massstorage-device.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -26,6 +26,7 @@
 Name[km]=ឧបករណ៍​ផ្ទុក​ធំ
 Name[lt]=Duomenų saugojimo įrenginys
 Name[mk]=Уред за складирање податоци
+Name[ms]=Peranti Mass Storage
 Name[nb]=Masselagerenhet
 Name[nds]=Bültspieker-Reedschap
 Name[ne]=बृहत भण्डारण यन्त्र
@@ -83,7 +84,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਜੰਤਰ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka urzÄ…dzenia dla Amaroka
 Comment[pt]='Plugin' de dispositivo para o Amarok
-Comment[pt_BR]=Plugin de dispositivo para o Amarok
+Comment[pt_BR]=Plug-in de dispositivo para o Amarok
 Comment[se]=Ovttadatlassemoduvla Amarok:ii
 Comment[sk]=Modul zariadenia pre Amarok
 Comment[sr]=Уређајски прикључак за Amarok
Index: src/amarok.desktop
===================================================================
--- src/amarok.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/amarok.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -88,6 +88,7 @@
 Comment[ja]=Amarok - あなたの音楽を再発見
 Comment[km]=Amarok - រកឃើញ​តន្ត្រី​របស់​អ្នក​ឡើង​វិញ !
 Comment[lt]=Amarok – atraskite savo muziką iš naujo!
+Comment[ms]=Amarok - Terokai Muzik Anda!
 Comment[nds]=Amarok - Beleev Dien Musik nieg!
 Comment[nl]=Amarok - Herontdek uw muziek!
 Comment[nn]=Amarok – gjenoppdag musikken din!
Index: src/metadata/mp4/mp4file.cpp
===================================================================
--- src/metadata/mp4/mp4file.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/mp4/mp4file.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -30,6 +30,7 @@
 #include <audioproperties.h>
 
 #include <stdint.h>
+#include <stdlib.h>
 
 #define MP4V2_HAS_WRITE_BUG 1
 
Index: src/metadata/mp4/taglib_mp4filetyperesolver.cpp
===================================================================
--- src/metadata/mp4/taglib_mp4filetyperesolver.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/mp4/taglib_mp4filetyperesolver.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -24,6 +24,7 @@
 
 #include "taglib_mp4filetyperesolver.h"
 #include "mp4file.h"
+#include <string.h>
 
 TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
         bool readProperties,
Index: src/metadata/mp4/mp4tag.cpp
===================================================================
--- src/metadata/mp4/mp4tag.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/mp4/mp4tag.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -24,6 +24,8 @@
 
 #include <tag.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 using namespace TagLib;
 
Index: src/metadata/mp4/mp4properties.cpp
===================================================================
--- src/metadata/mp4/mp4properties.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/mp4/mp4properties.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -30,6 +30,7 @@
 #endif
 
 #include <stdint.h>
+#include <string.h>
 
 #ifndef UINT64_TO_DOUBLE
 #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
Index: src/metadata/audible/audibletag.cpp
===================================================================
--- src/metadata/audible/audibletag.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/audible/audibletag.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -28,6 +28,7 @@
 #include <taglib/tag.h>
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -71,7 +72,8 @@
 {
     char buf[1023];
     fseek(fp, OFF_PRODUCT_ID, SEEK_SET);
-    fread(buf, strlen("product_id"), 1, fp);
+    if (fread(buf, strlen("product_id"), 1, fp) != 1)
+        return;
     if(memcmp(buf, "product_id", strlen("product_id")))
     {
         buf[20]='\0';
@@ -130,24 +132,65 @@
 
 bool Audible::Tag::readTag( FILE *fp, char **name, char **value)
 {
+    // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags                                                                                         
+    const uint32_t maxtaglen = 100000;    
+
     uint32_t nlen;
-    fread(&nlen, sizeof(nlen), 1, fp);
+    if (fread(&nlen, sizeof(nlen), 1, fp) != 1)
+        return false;
     nlen = ntohl(nlen);
     //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen);
-    *name = new char[nlen+1];
-    (*name)[nlen] = '\0';
+    if (nlen > maxtaglen)
+        return false;
 
     uint32_t vlen;
-    fread(&vlen, sizeof(vlen), 1, fp);
+    if (fread(&vlen, sizeof(vlen), 1, fp) != 1)
+        return false;
     vlen = ntohl(vlen);
     //fprintf(stderr, "tag len=%x\n", (unsigned)vlen);
+    if (vlen > maxtaglen)
+        return false;
+
+    *name = new char[nlen+1];
+    if (!*name)
+        return false;
+        
     *value = new char[vlen+1];
+    if (!*value)
+    {
+        delete[] *name;
+        *name = 0;
+        return false;
+    }
+
+    (*name)[nlen] = '\0';
     (*value)[vlen] = '\0';
 
-    fread(*name, nlen, 1, fp);
-    fread(*value, vlen, 1, fp);
+    if (fread(*name, nlen, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
+    if (fread(*value, vlen, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
     char lasttag;
-    fread(&lasttag, 1, 1, fp);
+    if (fread(&lasttag, 1, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
     //fprintf(stderr, "%s: \"%s\"\n", *name, *value);
 
     m_tagsEndOffset += 2 * 4 + nlen + vlen + 1;
Index: src/metadata/audible/audibleproperties.cpp
===================================================================
--- src/metadata/audible/audibleproperties.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/audible/audibleproperties.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -30,6 +30,7 @@
 #include "taglib_audiblefile.h"
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 
 using namespace TagLib;
 
Index: src/metadata/audible/taglib_audiblefile.cpp
===================================================================
--- src/metadata/audible/taglib_audiblefile.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/audible/taglib_audiblefile.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -26,6 +26,7 @@
 #include "taglib_audiblefile.h"
 
 #include "audibletag.h"
+#include <stdio.h>
 #include <taglib/tfile.h>
 #include <taglib/audioproperties.h>
 
Index: src/metadata/audible/taglib_audiblefiletyperesolver.cpp
===================================================================
--- src/metadata/audible/taglib_audiblefiletyperesolver.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/audible/taglib_audiblefiletyperesolver.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -22,6 +22,7 @@
 #include "taglib_audiblefiletyperesolver.h"
 #include "taglib_audiblefile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
Index: src/metadata/wav/wavfiletyperesolver.cpp
===================================================================
--- src/metadata/wav/wavfiletyperesolver.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/wav/wavfiletyperesolver.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -22,6 +22,7 @@
 #include "wavfiletyperesolver.h"
 #include "wavfile.h"
 
+#include <stdio.h>
 #include <string.h>
 
 TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
Index: src/metadata/wav/wavproperties.cpp
===================================================================
--- src/metadata/wav/wavproperties.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/wav/wavproperties.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -30,6 +30,7 @@
 #include "wavfile.h"
 
 #include <netinet/in.h> // ntohl
+#include <stdio.h>
 
 using namespace TagLib;
 
Index: src/metadata/wav/wavfile.cpp
===================================================================
--- src/metadata/wav/wavfile.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metadata/wav/wavfile.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -29,6 +29,8 @@
 #include <taglib/audioproperties.h>
 #include <taglib/tag.h>
 
+#include <stdio.h>
+
 namespace TagLib {
 ////////////////////////////////////////////////////////////////////////////////
 // public members
Index: src/amarok_addaspodcast.desktop
===================================================================
--- src/amarok_addaspodcast.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/amarok_addaspodcast.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -24,6 +24,7 @@
 Name[ja]=ポッドキャストとして Amarok に追加
 Name[km]=បន្ថែម​ជា​ផតខាស់​ទៅ Amarok
 Name[lt]=Įterpti Podcast į Amarok grojaraštį
+Name[ms]=Tambah sebagai Podcast kepada Amarok
 Name[nb]= Legg til Amarok som podkast
 Name[nds]=As Podcast na Amarok tofögen
 Name[ne]=अमारोकमा पोडकास्टको रूपमा थप्नुहोस्
Index: src/amarok_play_audiocd.desktop
===================================================================
--- src/amarok_play_audiocd.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/amarok_play_audiocd.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -29,6 +29,7 @@
 Name[km]=ចាក់​ស៊ីឌី​អូឌីយ៉ូ​ជា​មួយ Amarok
 Name[lt]=Groti audio CD su Amarok
 Name[mk]=Свири аудиоцд со Амарок
+Name[ms]=Main CD Audio dengan Amarok
 Name[nb]=Spill lyd-CD med Amarok
 Name[nds]=Audio-CD mit Amarok afspelen
 Name[ne]=अमारोकसँग अडियो सीडी बजाउनुहोस्
Index: src/metabundlesaver.cpp
===================================================================
--- src/metabundlesaver.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/metabundlesaver.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
Index: src/amarok_append.desktop
===================================================================
--- src/amarok_append.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/amarok_append.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -40,6 +40,7 @@
 Name[km]=បន្ថែម​ទៅ​ខាង​ចុង​បញ្ជីចាក់
 Name[lt]=Pridėti prie Amarok grojaraščio
 Name[mk]=Додај на листата
+Name[ms]=Tambah ke Senaraimain
 Name[nb]=Legg til spilleliste
 Name[nds]=Na Afspeellist tofögen
 Name[ne]=बजाउने सूचीमा थप्नुहोस्
@@ -94,6 +95,7 @@
 Name[km]=បន្ថែម​ខាង​ចុង & ចាក់
 Name[lt]=PridÄ—ti ir groti
 Name[mk]=Додај и пушти
+Name[ms]=Tambah & Main
 Name[nb]=Legg til og spill
 Name[nds]=Tofögen un afspelen
 Name[ne]=थप्नुहोस् र बजाउनुहोस्
@@ -148,6 +150,7 @@
 Name[km]=ដាក់​បទ​ក្នុង​ជួរ
 Name[lt]=Pridėti į eilę
 Name[mk]=Стави нумера во редица
+Name[ms]=Susun Trek
 Name[nb]=Legg spor i kø
 Name[nds]=Stück inregen
 Name[ne]=लाम ट्रयाक
Index: src/mediadevice/mtp/amarok_mtp-mediadevice.desktop
===================================================================
--- src/mediadevice/mtp/amarok_mtp-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/mtp/amarok_mtp-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -76,6 +76,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -84,7 +85,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/mediadevice/daap/amarok_daap-mediadevice.desktop
===================================================================
--- src/mediadevice/daap/amarok_daap-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/daap/amarok_daap-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -76,6 +76,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -84,7 +85,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop
===================================================================
--- src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/riokarma/amarok_riokarma-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -75,6 +75,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -83,7 +84,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/mediadevice/njb/amarok_njb-mediadevice.desktop
===================================================================
--- src/mediadevice/njb/amarok_njb-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/njb/amarok_njb-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -26,6 +26,7 @@
 Name[km]=ឧបករណ៍​មេឌៀ Nomad Jukebox របស់ Creative
 Name[lt]=Creative Nomad Jukebox daugialypės terpės įrenginys
 Name[mk]=Уред за мултимедија Creative Nomad Jukebox
+Name[ms]=Peranti Media Creative Nomad Jukebox
 Name[nb]=Creative Nomad Jukebox medieenhet
 Name[nds]=Creative-Medienreedschap Nomad Jukebox
 Name[ne]=सिर्जानात्मक नोम्याड जुकेबक्स मिडिया यन्त्र
@@ -76,6 +77,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -84,7 +86,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
===================================================================
--- src/mediadevice/ipod/amarok_ipod-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/ipod/amarok_ipod-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -28,6 +28,7 @@
 Name[km]=ឧបករណ៍​មេឌៀ iPod របស់​អ៊េផល
 Name[lt]=Apple iPod daugialypės terpės įrenginys
 Name[mk]=Уред за мултимедија Apple iPod
+Name[ms]=Peranti Media Apple iPod
 Name[nb]=Apple iPod medieenhet
 Name[nds]=Apple-iPott
 Name[ne]=एप्पल iPod मिडिया यन्त्र
@@ -78,6 +79,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -86,7 +88,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/mediadevice/generic/amarok_generic-mediadevice.desktop
===================================================================
--- src/mediadevice/generic/amarok_generic-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/generic/amarok_generic-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -77,6 +77,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -85,7 +86,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
===================================================================
--- src/mediadevice/ifp/amarok_ifp-mediadevice.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/mediadevice/ifp/amarok_ifp-mediadevice.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -28,6 +28,7 @@
 Name[km]=ឧបករណ៍​មេឌៀ iFP របស់ iRiver
 Name[lt]=iRiver iFP media įrenginys
 Name[mk]=Уред за мултимедија iRiver iFP
+Name[ms]=Peranti Media iRiver iFP
 Name[nb]=iRiver iFP medieenhet
 Name[nds]=iFP-Medienreedschap vun iRiver
 Name[ne]=iRiver iFP मिडिया यन्त्र
@@ -78,6 +79,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -86,7 +88,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop
===================================================================
--- src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -68,6 +68,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -76,7 +77,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/amarok_plugin.desktop
===================================================================
--- src/amarok_plugin.desktop	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/amarok_plugin.desktop	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -28,6 +28,7 @@
 Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់ Amarok
 Comment[lt]=Amarok įskiepis
 Comment[mk]=Приклучок за Амарок
+Comment[ms]=Plugin untuk Amarok
 Comment[nb]=Programtillegg for Amarok
 Comment[nds]=Moduul för Amarok
 Comment[ne]=अमारोकका लागि प्लगइन
@@ -36,7 +37,7 @@
 Comment[pa]=ਅਮਰੋਕ ਲਈ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Amaroka
 Comment[pt]='Plugin' para o Amarok
-Comment[pt_BR]=Plugin para o Amarok
+Comment[pt_BR]=Plug-in para o Amarok
 Comment[ru]=Модуль amaroK
 Comment[se]=Lassemoduvla Amarok:ii
 Comment[sk]=Amarok modul
Index: src/contextbrowser.cpp
===================================================================
--- src/contextbrowser.cpp	(.../tags/amarok/1.4.10/multimedia/amarok)	(revision 986793)
+++ src/contextbrowser.cpp	(.../branches/stable/extragear/multimedia/amarok)	(revision 986793)
@@ -4189,7 +4189,7 @@
     }
 
     // Ok lets remove the top and bottom parts of the page
-    m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
+    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\"" ) );
     m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
     // Adding back license information
     m_wiki += copyright;


--- NEW FILE svn.sh ---

svn diff \
  svn://anonsvn.kde.org/home/kde/tags/amarok/1.4.10/multimedia/amarok/ \
  svn://anonsvn.kde.org/home/kde/branches/stable/extragear/multimedia/amarok/

amarok-1.4.10-wikipedia.patch:

Index: amarok-1.4.10-wikipedia.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok-1.4.10-wikipedia.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amarok-1.4.10-wikipedia.patch	13 Apr 2009 17:13:42 -0000	1.1
+++ amarok-1.4.10-wikipedia.patch	25 Jun 2009 03:38:07 -0000	1.2
@@ -6,7 +6,7 @@ diff -up amarok-1.4.10/amarok/src/contex
  
      // Ok lets remove the top and bottom parts of the page
 -    m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
-+    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\">" ) );
++    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\"" ) );
      m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
      // Adding back license information
      m_wiki += copyright;

amarok-1.4.8-gcc43.patch:

Index: amarok-1.4.8-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok-1.4.8-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amarok-1.4.8-gcc43.patch	15 Apr 2008 20:00:33 -0000	1.1
+++ amarok-1.4.8-gcc43.patch	25 Jun 2009 03:38:07 -0000	1.2
@@ -5,7 +5,7 @@ diff -up amarok-1.4.8/amarok/src/metadat
  #include <audioproperties.h>
  
  #include <stdint.h>
-+#include <cstdlib>
++#include <stdlib.h>
  
  #define MP4V2_HAS_WRITE_BUG 1
  
@@ -16,7 +16,7 @@ diff -up amarok-1.4.8/amarok/src/metadat
  
  #include "taglib_mp4filetyperesolver.h"
  #include "mp4file.h"
-+#include <cstring>
++#include <string.h>
  
  TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
          bool readProperties,
@@ -27,8 +27,8 @@ diff -up amarok-1.4.8/amarok/src/metadat
  
  #include <tag.h>
  #include <stdint.h>
-+#include <cstdlib>
-+#include <cstring>
++#include <stdlib.h>
++#include <string.h>
  
  using namespace TagLib;
  
@@ -39,7 +39,7 @@ diff -up amarok-1.4.8/amarok/src/metadat
  #endif
  
  #include <stdint.h>
-+#include <cstring>
++#include <string.h>
  
  #ifndef UINT64_TO_DOUBLE
  #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
@@ -50,8 +50,8 @@ diff -up amarok-1.4.8/amarok/src/engine/
   the alsa guys
   ***************************************************************************/
  
-+#include <cstdlib>
-+#include <cstring>
++#include <stdlib.h>
++#include <string.h>
  #include <sys/time.h>
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -62,7 +62,7 @@ diff -up amarok-1.4.8/amarok/src/engine/
  #include <limits.h>
  #include <sys/param.h>
  #include <pthread.h>
-+#include <cstring>
++#include <string.h>
  #include <vector>
  #include <config.h>
  #include <iostream>
@@ -73,7 +73,7 @@ diff -up amarok-1.4.8/amarok/src/engine/
  #include <climits>
  #include <cmath>
  #include <stdarg.h>
-+#include <cstring>
++#include <string.h>
  
  #include <config.h>
  


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- amarok.spec	14 Apr 2009 14:13:46 -0000	1.86
+++ amarok.spec	25 Jun 2009 03:38:07 -0000	1.87
@@ -1,5 +1,3 @@
-# TODO:
-# Rio Karma support : libkarma
 
 %if 0%{?fedora} < 9
 # define to include konquisidebar support for kde3 desktop
@@ -33,10 +31,18 @@ BuildRequires:  libutempter-devel
 %endif
 %define _with_mp4v2 --with-mp4v2
 
+%define snap 20090624
+
+%if 0%{?fedora} > 9
+Conflicts: amarok > 1.9
+Obsoletes: amarok < 1.5
+Name:       amarok1
+%else
 Name:       amarok
+%endif
 Summary:    Media player
 Version:    1.4.10
-Release:    4%{?dist}
+Release:    5.%{snap}svn%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -49,6 +55,7 @@ Patch1:     amarok-1.4.8-gcc43.patch
 Patch2:     amarok-1.4.7-xdg.patch
 # Fix for newer libmtp >= 0.3
 Patch3:     amarok-1.4.10-libmtp03.patch 
+Patch4:     amarok-1.4.10-gcc44.patch
 
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
@@ -56,6 +63,9 @@ Patch100:   amarok-1.4.10-aa_security.pa
 # fix wikipedia, see also https://bugs.edge.launchpad.net/ubuntu/+source/amarok/+bug/316140
 Patch101:   amarok-1.4.10-wikipedia.patch
 
+# basically output from svn.sh, edited manually a bit to apply
+Patch200: amarok-%{snap}svn.patch
+
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
@@ -65,7 +75,7 @@ BuildRequires:  %{kdelibs3}-devel
 %if 0%{?konq}
 BuildRequires:  %{kdebase3}-devel
 %else
-Obsoletes: %{name}-konqueror < %{version}-%{release}
+Obsoletes: amarok-konqueror < %{version}-%{release}
 %endif
 BuildRequires:  taglib-devel 
 %{?_with_ifp:BuildRequires:  libifp-devel}
@@ -141,6 +151,9 @@ Summary:    Visualisation plugins for Am
 Group:      Applications/Multimedia
 Requires:   %{name} = %{version}-%{release}
 # No plugins by default, we need libvisual-plugins
+%if "%{name}" != "amarok"
+Obsoletes: amarok-visualisation < 1.5
+%endif
 Requires:   libvisual-plugins
 %description visualisation
 Amarok can use visualisation plugins from different origins.
@@ -150,18 +163,24 @@ use any of xmms' visualisation plugins w
 
 
 %prep
-%setup -q 
+%setup -q -n amarok-%{version}
 
+%if 0%{?snap:1} 
+pushd amarok
+%patch200 -p0 -b .svn
+popd
+%else
+%patch100 -p4 -b .aa_security
+%patch101 -p1 -b .wikipedia
 %patch1 -p1 -b .gcc43
-%patch2 -p1 -b .xdg
+%patch4 -p1 -b .gcc44
+%endif
 
+%patch2 -p1 -b .xdg
 %if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.3.0"
 %patch3 -p1 -b .libmtp03
 %endif
 
-%patch100 -p4 -b .aa_security
-%patch101 -p1 -b .wikipedia
-
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
@@ -179,13 +198,7 @@ unset QTDIR && . %{_sysconfdir}/profile.
      %{?_with_libvisual} %{!?_with_libvisual:--without-libvisual} \
      %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
 
-#     --enable-final \
-#     --with-nmm \
-#     --with-mas
-
-# fails with smp flags
-#make %{?_smp_mflags}
-make
+make %{?_smp_mflags}
 
 
 %install
@@ -199,13 +212,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/apps/ko
 %endif
 
 
-%find_lang %{name} 
+%find_lang amarok 
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
-    [ "$lang" == "en" ] && d=en/%{name} || d=$lang
-    echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+    [ "$lang" == "en" ] && d=en/amarok || d=$lang
+    echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> amarok.lang
   fi
 done
 
@@ -235,7 +248,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 rm -fr $RPM_BUILD_ROOT
 
 
-%files -f %{name}.lang
+%files -f amarok.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/amarok
@@ -326,6 +339,11 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-5.20090624
+- pull latest upstream translations, bugfixes
+- make buildable on F-10+ as amarok1
+- adjust wikipedia patch (to match upstream svn)
+
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
 - libmtp03 patch (unused here, but others may find it useful)
 - optimize scriptlets

More information about the fedora-extras-commits mailing list