This commit was manufactured by cvs2git to create tag 'auto-th-amarok-

2_1-0_924419_3'.

Sprout from master 2009-02-13 00:05:46 UTC shadzik <shadzik@pld-linux.org> '- force wikipedia to get info from the country you live in, or a least that one locales you use'
Cherrypick from unlabeled-1.123.2 2009-02-16 13:35:22 UTC shadzik <shadzik@pld-linux.org> '- rel .3':
    amarok.spec -> 1.123.2.54
Delete:
    amarok-gcc4.patch
    amarok-helixplayer-morearchs.patch
    amarok-libmtp.patch
    amarok-libnjb.patch
    amarok-mongrel.patch
    amarok-smp.patch
    amarok-sparc.patch
    amarok-titleorder.patch
    kde-ac260-lt.patch
    kde-common-PLD.patch
    kde-common-gcc4.patch
    kde4-kdeextragear-multimedia-NJB.patch

diff --git a/amarok-gcc4.patch b/amarok-gcc4.patch
deleted file mode 100644 (file)
index a9f913c..0000000
--- a/amarok-gcc4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- amarok-1.4.4/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h.orig  2006-10-26 22:40:20.000000000 +0200
-+++ amarok-1.4.4/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h       2006-12-11 23:23:07.181351000 +0100
-@@ -326,16 +326,6 @@
- #endif
- #endif
- 
--#ifndef NOMINMAX
--/* Always use macro versions of these! */
--#ifndef max
--#define max(a, b)  (((a) > (b)) ? (a) : (b))
--#endif
--#ifndef min
--#define min(a, b)  (((a) < (b)) ? (a) : (b))
--#endif
--#endif
--
- /* Should use capitalized macro versions of these, as the lowercase
-               versions conflict with the STL spec */
- //get these from sys/param.h to avoid tons of warnings about redefining them:
---- amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp~ 2008-08-13 23:21:51.000000000 +0200
-+++ amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp  2008-08-26 11:30:52.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <iostream>
- #include <cstring>

diff --git a/amarok-helixplayer-morearchs.patch b/amarok-helixplayer-morearchs.patch
deleted file mode 100644 (file)
index 8bfdbdc..0000000
--- a/amarok-helixplayer-morearchs.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- amarok/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h.orig     2005-11-03 22:22:27.000000000 +0100
-+++ amarok/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h  2005-11-03 23:14:46.000000000 +0100
-@@ -179,7 +179,7 @@
- #elif defined (__sparc__) && defined (__GNUC__)
- 
- /* Increment by 1 */
--inline void
-+static inline void
- HXAtomicIncUINT32(UINT32* pNum)
- {
-     __asm__ __volatile__(\
-@@ -200,7 +200,7 @@
- }
- 
- /* Decrement by 1 */
--inline void
-+static inline void
- HXAtomicDecUINT32(UINT32* pNum)
- {
-     __asm__ __volatile__(
-@@ -221,7 +221,7 @@
- }
- 
- /* Increment by 1 and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicIncRetUINT32(UINT32* pNum)
- {
-     volatile UINT32 ulRet;
-@@ -245,7 +245,7 @@
- }
- 
- /* Decrement by 1 and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicDecRetUINT32(UINT32* pNum)
- {   volatile UINT32 ulRet;
-     __asm__ __volatile__(
-@@ -268,7 +268,7 @@
- }
- 
- /* Add n */
--inline void
-+static inline void
- HXAtomicAddUINT32(UINT32* pNum, UINT32 ulNum)
- {
-     __asm__ __volatile__(
-@@ -290,7 +290,7 @@
- }
- 
- /* Subtract n */
--inline void
-+static inline void
- HXAtomicSubUINT32(UINT32* pNum, UINT32 ulNum)
- {
-     __asm__ __volatile__(
-@@ -312,7 +312,7 @@
- }
- 
- /* Add n and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicAddRetUINT32(UINT32* pNum, UINT32 ulNum)
- {
-     volatile UINT32 ulRet; \
-@@ -337,7 +337,7 @@
- }
- 
- /* Subtract n and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicSubRetUINT32(UINT32* pNum, UINT32 ulNum)
- {   volatile UINT32 ulRet;
-     __asm__ __volatile__(
-@@ -360,14 +360,14 @@
-         return ulRet;
- }
- 
--inline void HXAtomicIncINT32(INT32* p)              { HXAtomicIncUINT32((UINT32*)p); }
--inline void HXAtomicDecINT32(INT32* p)              { HXAtomicDecUINT32((UINT32*)p); }
--inline void HXAtomicAddINT32(INT32* p, INT32 n)     { HXAtomicAddUINT32((UINT32*)p, (UINT32)n); }
--inline void HXAtomicSubINT32(INT32* p, INT32 n)     { HXAtomicSubUINT32((UINT32*)p, (UINT32)n); }
--inline INT32 HXAtomicIncRetINT32(INT32* p)          { return HXAtomicIncRetUINT32((UINT32*)p); }
--inline INT32 HXAtomicDecRetINT32(INT32* p)          { return HXAtomicDecRetUINT32((UINT32*)p); }
--inline INT32 HXAtomicAddRetINT32(INT32* p, INT32 n) { return HXAtomicAddRetUINT32((UINT32*)p, (UINT32)n); }
--inline INT32 HXAtomicSubRetINT32(INT32* p, INT32 n) { return HXAtomicSubRetUINT32((UINT32*)p, (UINT32)n); }
-+static inline void HXAtomicIncINT32(INT32* p)              { HXAtomicIncUINT32((UINT32*)p); }
-+static inline void HXAtomicDecINT32(INT32* p)              { HXAtomicDecUINT32((UINT32*)p); }
-+static inline void HXAtomicAddINT32(INT32* p, INT32 n)     { HXAtomicAddUINT32((UINT32*)p, (UINT32)n); }
-+static inline void HXAtomicSubINT32(INT32* p, INT32 n)     { HXAtomicSubUINT32((UINT32*)p, (UINT32)n); }
-+static inline INT32 HXAtomicIncRetINT32(INT32* p)          { return HXAtomicIncRetUINT32((UINT32*)p); }
-+static inline INT32 HXAtomicDecRetINT32(INT32* p)          { return HXAtomicDecRetUINT32((UINT32*)p); }
-+static inline INT32 HXAtomicAddRetINT32(INT32* p, INT32 n) { return HXAtomicAddRetUINT32((UINT32*)p, (UINT32)n); }
-+static inline INT32 HXAtomicSubRetINT32(INT32* p, INT32 n) { return HXAtomicSubRetUINT32((UINT32*)p, (UINT32)n); }
- 
- 
- 
-@@ -547,7 +547,7 @@
- #elif defined(__GNUC__) && !defined(_OPENBSD) && \
-       (__GNUC__>2 || (__GNUC__==2 && __GNUC_MINOR__>=95)) && \
-       ( defined (__i486__) || defined (__i586__) || defined (__i686__) || \
--        defined (__pentium__) || defined (__pentiumpro__))
-+        defined (__pentium__) || defined (__pentiumpro__) || defined (__pentium4__) || defined (__athlon__))
- 
- /* Increment by 1 */
- static __inline__ void
-@@ -855,6 +855,114 @@
-  */
- #elif defined (__alpha)
- 
-+#  ifdef __GNUC__
-+
-+/* Increment by 1 and return new value */
-+static inline INT32
-+HXAtomicIncRetINT32(INT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, 1, $1\n"       // Increment value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Decrement by 1 and return new value */
-+static inline INT32
-+HXAtomicDecRetINT32(INT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, 1, $1\n"       // Decrement value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Add n and return new value */
-+static inline INT32
-+HXAtomicAddRetINT32(INT32* pNum, INT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, %1, $1\n"      // Add n to value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Subtract n and return new value */
-+static inline INT32
-+HXAtomicSubRetINT32(INT32* pNum, INT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, %1, $1\n"      // Subtract n from value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Increment by 1 and return new value */
-+static inline UINT32
-+HXAtomicIncRetUINT32(UINT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, 1, $1\n"       // Increment value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Decrement by 1 and return new value */
-+static inline UINT32
-+HXAtomicDecRetUINT32(UINT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, 1, $1\n"       // Decrement value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Add n and return new value */
-+static inline UINT32
-+HXAtomicAddRetUINT32(UINT32* pNum, UINT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, %1, $1\n"      // Add n to value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Subtract n and return new value */
-+static inline UINT32
-+HXAtomicSubRetUINT32(UINT32* pNum, UINT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, %1, $1\n"      // Subtract n from value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+#  else
-+
- #include <c_asm.h>
- 
- /* Increment by 1 and return new value */
-@@ -961,6 +1067,8 @@
-         , pNum, n);
- }
- 
-+#  endif
-+
- #define HXAtomicIncINT32(p)    HXAtomicIncRetINT32((p))
- #define HXAtomicDecINT32(p)    HXAtomicDecRetINT32((p))
- #define HXAtomicAddINT32(p,n)  HXAtomicAddRetINT32((p),(n))

diff --git a/amarok-libmtp.patch b/amarok-libmtp.patch
deleted file mode 100644 (file)
index a450007..0000000
--- a/amarok-libmtp.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- amarok/src/mediadevice/mtp/mtpmediadevice.cpp
-+++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp
-@@ -293,12 +293,13 @@
-         parent_id = getDefaultParentId();
-     }
-     debug() << "Parent id : " << parent_id << endl;
-+    trackmeta->parent_id = parent_id;
- 
-     m_critical_mutex.lock();
-     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
-     int ret = LIBMTP_Send_Track_From_File(
-         m_device, bundle.url().path().utf8(), trackmeta,
--        progressCallback, this, parent_id
-+        progressCallback, this
-     );
-     m_critical_mutex.unlock();
- 
-@@ -529,7 +530,7 @@
-         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
-             album_object->tracks[i++] = it->track()->id();
-         album_object->no_tracks = items->count();
--        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
-+        ret = LIBMTP_Create_New_Album( m_device, album_object );
-         if( ret != 0 )
-         {
-             debug() << "creating album failed : " << ret << endl;
-@@ -608,7 +609,7 @@
- {
-     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
-     char *name_copy = qstrdup( name );
--    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
-+    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
-     delete(name_copy);
-     debug() << "New folder ID: " << new_folder_id << endl;
-     if( new_folder_id == 0 )
-@@ -913,7 +914,7 @@
-     if( item->playlist()->id() == 0 )
-     {
-         debug() << "creating new playlist : " << metadata->name << endl;
--        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
-+        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
-         if( ret == 0 )
-         {
-             item->playlist()->setId( metadata->playlist_id );

diff --git a/amarok-libnjb.patch b/amarok-libnjb.patch
deleted file mode 100644 (file)
index 5643e5d..0000000
--- a/amarok-libnjb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur amarok-1.4.1-beta1/amarok/src/mediadevice/njb/njbmediadevice.h amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/njbmediadevice.h
---- amarok-1.4.1-beta1/amarok/src/mediadevice/njb/njbmediadevice.h     2006-06-18 20:56:09.000000000 +0000
-+++ amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/njbmediadevice.h 2006-06-20 10:08:31.000000000 +0000
-@@ -17,7 +17,7 @@
- // #include <mediadevice.h>
- #include <mediabrowser.h>
- #include <transferdialog.h>
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- 
- #include <qptrlist.h>
- #include <qlistview.h>
-diff -ur amarok-1.4.1-beta1/amarok/src/mediadevice/njb/playlist.h amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/playlist.h
---- amarok-1.4.1-beta1/amarok/src/mediadevice/njb/playlist.h   2006-06-18 20:56:09.000000000 +0000
-+++ amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/playlist.h       2006-06-20 10:28:27.000000000 +0000
-@@ -20,7 +20,7 @@
- #define __playlist_h__
- 
- // libnjb
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- 
- // Qt
- #include <qstringlist.h>
-diff -ur amarok-1.4.1-beta1/amarok/src/mediadevice/njb/track.h amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/track.h
---- amarok-1.4.1-beta1/amarok/src/mediadevice/njb/track.h      2006-06-18 20:56:09.000000000 +0000
-+++ amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/track.h  2006-06-20 10:28:44.000000000 +0000
-@@ -24,7 +24,7 @@
- #include <qstring.h>
- 
- // libnjb
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- 
- #include "metabundle.h"
- 

diff --git a/amarok-mongrel.patch b/amarok-mongrel.patch
deleted file mode 100644 (file)
index cd12b31..0000000
--- a/amarok-mongrel.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp~ 2008-04-10 23:16:37.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp  2008-05-03 20:38:40.854585305 +0300
-@@ -30,9 +30,6 @@
-     m_server = new KProcIO();
-     m_server->setComm( KProcess::All );
-     *m_server << "amarok_daapserver.rb";
--    *m_server << locate( "data", "amarok/ruby_lib/" );
--    *m_server << locate( "lib", "ruby_lib/" );
--    *m_server << locate( "data", "amarok/scripts/ruby_debug/debug.rb" );
-     if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
-         error() << "Failed to start amarok_daapserver.rb" << endl;
-         return;
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:43:00.885572020 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:47:24.272751916 +0300
-@@ -36,10 +36,10 @@
- 
- bin_SCRIPTS = amarok_daapserver.rb
- 
--SUBDIRS = daapreader mongrel
-+SUBDIRS = daapreader
- 
- amarokrubylibdir = \
--    $(kde_datadir)/amarok/ruby_lib
-+    $(ruby_rubylibdir)/amarok
- 
- amarokrubylib_DATA = \
-     codes.rb
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb~   2008-04-10 23:16:37.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb    2008-05-03 20:43:49.504374104 +0300
-@@ -3,15 +3,10 @@
- #A DAAP Server
- # (c) 2006 Ian Monroe <ian@monroe.nu>
- # License: GNU General Public License V2
--$LOAD_PATH.push(ARGV[0])
--puts "here it is: #{ARGV[0]}"
--$LOAD_PATH.push(ARGV[1])
--puts "here it is: #{ARGV[1]}"
- 
--require "codes.rb"
-+require "amarok/codes"
- require 'mongrel'
--require "#{ARGV[2]}" #debug.rb
--
-+require "amarok/debug"
- require 'uri'
- require 'pp'
- #require 'ruby-prof'
---- amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am~  2008-04-10 23:16:37.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am   2008-05-03 20:44:52.908028283 +0300
-@@ -1,5 +1,5 @@
- rubydebugdir = \
--    $(kde_datadir)/amarok/scripts/ruby_debug
-+    $(ruby_rubylibdir)/amarok
- 
- rubydebug_DATA = \
-     debug.rb
---- amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb~      2008-05-03 20:49:32.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb       2008-05-04 13:10:28.364031973 +0300
-@@ -12,7 +12,7 @@
- 
- require "net/http"
- require "rexml/document"
--# require File.dirname( File.expand_path( __FILE__ ) ) + "/../ruby_debug/debug.rb"
-+# require "amarok/debug"
- require "uri"
- 
- @app_name = "Lyrics_Lyrc"

diff --git a/amarok-smp.patch b/amarok-smp.patch
deleted file mode 100644 (file)
index d89fc7d..0000000
--- a/amarok-smp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok-1.4.5/amarok/src/app.cpp~   2007-02-09 00:02:36.637412281 +0200
-+++ amarok-1.4.5/amarok/src/app.cpp    2007-02-15 14:10:19.091799011 +0200
-@@ -186,7 +186,7 @@
-     new Amarok::DcopScriptHandler();
-     new Amarok::DcopDevicesHandler();
- 
--    fixHyperThreading();
-+    // fixHyperThreading();
-     // tell AtomicString that this is the GUI thread
-     if ( !AtomicString::isMainThread() )
-         qWarning("AtomicString was initialized from a thread other than the GUI "

diff --git a/amarok-sparc.patch b/amarok-sparc.patch
deleted file mode 100644 (file)
index 3397e29..0000000
--- a/amarok-sparc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok-1.4.5/admin/acinclude.m4.in~        2007-02-03 13:22:56.983737611 +0200
-+++ amarok-1.4.5/admin/acinclude.m4.in 2007-02-03 13:24:33.815926416 +0200
-@@ -3197,7 +3197,7 @@
-         CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
-         case $host in
-           *-*-linux-gnu)      
--            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-+            CFLAGS="-W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
-             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
-             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])

diff --git a/amarok-titleorder.patch b/amarok-titleorder.patch
deleted file mode 100644 (file)
index 424c421..0000000
--- a/amarok-titleorder.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- amarok-1.4.4/amarok/src/app.cpp~   2006-10-26 23:40:20.000000000 +0300
-+++ amarok-1.4.4/amarok/src/app.cpp    2006-12-26 21:52:35.829202536 +0200
-@@ -994,7 +990,7 @@
-         if ( oldState == Engine::Paused )
-             Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) );
-         if ( !bundle.prettyTitle().isEmpty() )
--            m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
-+            m_pPlaylistWindow->setCaption( i18n("%1 - Amarok").arg( bundle.veryNiceTitle() ) );
-         break;
- 
-     case Engine::Paused:
-@@ -1016,7 +1012,7 @@
- {
-     Amarok::OSD::instance()->show( bundle );
-     if ( !bundle.prettyTitle().isEmpty() )
--        m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
-+        m_pPlaylistWindow->setCaption( i18n("%1 - Amarok").arg( bundle.veryNiceTitle() ) );
- 
-     TrackToolTip::instance()->setTrack( bundle );
- }

diff --git a/amarok.spec b/amarok.spec
index 4537c56134073909246d4b3a4015b236413f56be..e48cccd0f4656d8172ae19a0d3e98cc845fad9f9 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,94 +1,76 @@
-# TODO:
-# - postgresql support alongside mysql
-# - NMM audio backend support (fix build - propably some BRs)
-# - make descriptions less useless
-# - track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324
-# - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby)
-# - main package pulls /usr/bin/ruby
-# - monitor http://bugs.kde.org/show_bug.cgi?id=137390 to remove the temporary fix
-# - ProjectM (see README)
-# - karma & MFS (see README)
-#
-# Conditional builds:
-%bcond_with    gstreamer       # enable gstreamer (gst10 not stable)
-%bcond_without mas             # disable MAS audio backend
-%bcond_without xine            # disable xine engine
-%bcond_without zeroconf        # disable support for zeroconf
-%bcond_without included_sqlite # don't use included sqlite (VERY BAD IDEA), needs sqlite >= 3.3 otherwise
-%bcond_without helix           # disable HelixPlayer engine
-%bcond_without mp3players      # disable iPod and iRiver MP3 players support
-%bcond_with    nmm             # enable NMM audio backend
-%bcond_with    mysql           # enable MySQL support
-%bcond_with    pgsql           # enable PostgreSQL support
-#
-%ifarch i386
-%undefine      with_helix
-%endif
+# TODO
+# - try not to link with static mysql
+
+%define                state   stable
+%define                qtver   4.4.3
+%define                snap    924419
 
 Summary:       A KDE audio player
 Summary(pl.UTF-8):     Odtwarzacz audio dla KDE
 Name:          amarok
-Version:       1.4.10
-Release:       8
+Version:       2.1
+Release:       0.%{snap}.3
 License:       GPL
 Group:         X11/Applications/Multimedia
-Source0:       ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 3bdbf26181bf5e5925f48968caba7ac2
-Patch0:                %{name}-helixplayer-morearchs.patch
-Patch1:                %{name}-libnjb.patch
-Patch2:                %{name}-smp.patch
-Patch3:                %{name}-sparc.patch
-Patch4:                kde-ac260-lt.patch
-Patch5:                kde-common-PLD.patch
-Patch6:                %{name}-gcc4.patch
-Patch7:                %{name}-titleorder.patch
-Patch8:                %{name}-mongrel.patch
-Patch9:                %{name}-libmtp.patch
+#Source0:      ftp://ftp.kde.org/pub/kde/%{state}/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:       %{name}-%{version}.tar.bz2
+# Source0-md5: 165e1bc195432a74a04e85fba404cae9
+Patch0:                %{name}-link.patch
+Patch1:                %{name}-wikilang.patch
 URL:           http://amarok.kde.org/
-# Upgrade to 2.0.1.1 required?
-# http://www.trapkit.de/advisories/TKADV2009-002.txt
-# http://amarok.kde.org/de/node/600
-#BuildRequires:        security(TKADV2009-002)
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-glib-devel
-BuildRequires: gettext-devel
-%{?with_gstreamer:BuildRequires:       gstreamer-devel >= 0.10.0}
-BuildRequires: kdebase-devel
-%{?with_akode:BuildRequires:   kdemultimedia-akode}
-BuildRequires: kdemultimedia-devel >= 9:3.1.93
-%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.6.0}
-%{?with_mp3players:BuildRequires:      libifp-devel >= 1.0.0.2}
-BuildRequires: libltdl-devel
-%{?with_mp3players:BuildRequires:      libmtp-devel >= 0.3.0}
-%{?with_mp3players:BuildRequires:      libnjb-devel >= 2.2.4}
-%{?with_pgsql:BuildRequires:           libpqxx-devel}
-BuildRequires: libtunepimp-devel >= 0.5.1-6
+Buildrequires: Qt3Support-devel >= %{qtver}
+Buildrequires: QtCore-devel >= %{qtver}
+Buildrequires: QtDBus-devel >= %{qtver}
+Buildrequires: QtDesigner-devel >= %{qtver}
+BuildRequires: QtNetwork-devel >= %{qtver}
+Buildrequires: QtOpenGL-devel >= %{qtver}
+BuildRequires: QtScript-devel >= %{qtver}
+BuildRequires: QtSql-devel >= %{qtver}
+BuildRequires: QtSvg-devel >= %{qtver}
+BuildRequires: QtTest-devel >= %{qtver}
+BuildRequires: QtUiTools-devel >= %{qtver}
+BuildRequires: QtWebKit-devel >= %{qtver}
+BuildRequires: QtXml-devel >= %{qtver}
+BuildRequires: automoc4
+BuildRequires: cmake >= 2.6.1-2
+BuildRequires: curl-devel
+BuildRequires: glib2-devel
+BuildRequires: giflib-devel
+BuildRequires: kde4-kdebase-devel
+BuildRequires: kde4-kdemultimedia-devel
+BuildRequires: libgpod-devel >= 0.7.0
+BuildRequires: libifp-devel >= 1.0.0.2
+BuildRequires: libmtp-devel >= 0.3.0
+BuildRequires: libnjb-devel >= 2.2.4
 BuildRequires: libvisual-devel >= 0.4.0
+BuildRequires: loudmouth-devel
 BuildRequires: mpeg4ip-devel >= 1:1.6
-%{?with_mysql:BuildRequires:           mysql-devel}
+BuildRequires: mysql-devel >= 5.1.31-3
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: qt4-build >= %{qtver}
+BuildRequires: qt4-qmake >= %{qtver}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.129
-BuildRequires: ruby-devel >= 1.8
-BuildRequires: sed >= 4.0
-%{!?with_included_sqlite:BuildRequires:        sqlite3-devel >= 3.3}
-BuildRequires: taglib-devel >= 1.4
-%{?with_xine:BuildRequires:    xine-lib-devel >= 1.1.1}
+BuildRequires: soprano-devel >= 2.1
+BuildRequires: strigi-devel >= 0.5.10
+BuildRequires: taglib-devel
+BuildRequires: utempter-devel
+BuildRequires: xorg-lib-libXpm-devel
 Requires(post):        /sbin/ldconfig
-Requires:      %{name}-plugin = %{version}-%{release}
-Requires:      ruby-mongrel
-Suggests:      kdemultimedia(audiocd) >= 9:3.1.93
+Requires:      kde4-kdebase-core
+Requires:      kde4-kdemultimedia-audiocd
+Requires:      kde4-phonon
+# It should require mysql-embeded
+#Requires:     mysql >= 5.1.31-3
+Conflicts:     mysql < 5.1.31-3
 Suggests:      libvisual-plugin-actor-JESS
 Suggests:      libvisual-plugin-actor-bumpscope
 Suggests:      libvisual-plugin-actor-corona
 Suggests:      libvisual-plugin-actor-flower
 Suggests:      libvisual-plugin-actor-gdkpixbuf
 Suggests:      libvisual-plugin-actor-gforce
-%{?with_gstreamer:Suggests:    libvisual-plugin-actor-gstreamer}
+Suggests:      libvisual-plugin-actor-gstreamer
 Suggests:      libvisual-plugin-actor-infinite
 Suggests:      libvisual-plugin-actor-jakdaw
 Suggests:      libvisual-plugin-actor-lv_analyzer
@@ -105,126 +87,24 @@ Suggests: libvisual-plugin-morph-alphablend
 Suggests:      libvisual-plugin-morph-flash
 Suggests:      libvisual-plugin-morph-slide
 Suggests:      libvisual-plugin-morph-tentacle
-Suggests:      python-PyKDE
 Obsoletes:     amarok-arts
 Obsoletes:     amarok-xmms
-Conflicts:     kdelibs-libs < 9:3.5.9
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# temporary hack for proper libgpod::itdb_get_mountpoint() detection.
-%define                filterout_ld    -Wl,--as-needed
-
 %description
 A KDE audio player.
 
 %description -l pl.UTF-8
 Odtwarzacz audio dla KDE.
 
-%package -n konqueror-addon-amarok
-Summary:       Amarok sidebar for Konqueror
-Summary(pl.UTF-8):     Pasek z Amarokiem dla Konquerora
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-
-%description -n konqueror-addon-amarok
-Amarok sidebar for Konqueror.
-
-%description -n konqueror-addon-amarok -l pl.UTF-8
-Pasek z Amarokiem dla Konquerora.
-
-%package akode
-Summary:       Plugin akode
-Summary(pl.UTF-8):     Wtyczka akode
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description akode
-Plugin akode.
-
-%description akode -l pl.UTF-8
-Wtyczka akode.
-
-%package helix
-Summary:       Helix/Realplayer playback support for amarok
-Summary(pl.UTF-8):     Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      helix-core
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description helix
-Helix/Realplayer playback support for amarok.
-
-%description helix -l pl.UTF-8
-Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka.
-
-%package gstreamer
-Summary:       Plugin gstreamer
-Summary(pl.UTF-8):     Wtyczka gstreamer
-Group:         X11/Applications/Multimedia
-# deps, to get it working:
-# mp3 decoder: gstreamer-mad
-# ogg decoder: gstreamer-vorbis
-# audio output driver: gstreamer-audiosink-alsa
-# from gstreamer-audio-effects to control volume, etc
-# needed libs:
-#  at least /usr/lib/gstreamer-0.8/libgstresample.so
-#  probably /usr/lib/gstreamer-0.8/libgstadder.so
-#  and probably /usr/lib/gstreamer-0.8/libgstvolume.so
-# gstreamer-musicbrainz for being able to edit id3 tags on files.
-Requires:      %{name} = %{version}-%{release}
-Requires:      gstreamer-audio-effects
-Requires:      gstreamer-audiosink
-Requires:      gstreamer-mad
-Requires:      gstreamer-musicbrainz
-Requires:      gstreamer-vorbis
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description gstreamer
-Plugin gstreamer.
-
-%description gstreamer -l pl.UTF-8
-Wtyczka gstreamer.
-
-%package xine
-Summary:       Plugin xine
-Summary(pl.UTF-8):     Wtyczka xine
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      xine-plugin-audio
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description xine
-Plugin xine.
-
-%description xine -l pl.UTF-8
-Wtyczka xine.
-
-%package zeroconf
-Summary:       Zeroconf data
-Summary(pl.UTF-8):     Dane dla zeroconf
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      kdenetwork-kdnssd
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description zeroconf
-Zeroconf data.
-
-%description zeroconf -l pl.UTF-8
-Dane dla zeroconf.
-
 %package scripts
 Summary:       amaroK scripts
 Summary(pl.UTF-8):     Skrypty amaroKa
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
-Requires:      /usr/bin/kdialog
-Requires:      python-PyQt
-Requires:      ruby-modules
+Requires:      kde4-kdebase-kdialog
 
 %description scripts
 amaroK scripts allow you extend amaroK functionality.
@@ -240,270 +120,165 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p0
-
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
-       amarok/src/amarok.desktop \
-
-# see kde bug #110909
-%{__sed} -i -e 's/amarok_live//' amarok/src/scripts/Makefile.am
-
-# kill env, call interpreter directly, so rpm automatics could rule
-%{__sed} -i -e '
-       1s,#!.*bin/env.*ruby,#!%{_bindir}/ruby,
-       1s,#!.*bin/env.*python,#!%{__python},
-' amarok/src/scripts/*/*.{py,rb} amarok/src/amarok_proxy.rb
+%patch0 -p0
+%patch1 -p0
 
 %build
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-
-# hack: passing something other than "no" or "yes" to --with-helix allows
-# us to pass HELIX_LIBS
-%configure \
-       HELIX_LIBS=%{_libdir}/helixplayer \
-       --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-       --disable-rpath \
-       --with%{!?with_mas:out}-mas \
-       --with%{!?with_xine:out}-xine \
-       --with%{!?with_gstreamer:out}-gstreamer10 \
-       --with%{!?with_akode:out}-akode \
-       --with%{!?with_helix:out}-helix%{?with_helix:=usegivenpath} \
-       --with%{!?with_nmm:out}-nmm \
-       --with%{!?with_mp3players:out}-libgpod \
-       --with%{!?with_mp3players:out}-libnjb \
-       --with%{!?with_mp3players:out}-libmtp \
-       --with%{!?with_mp3players:out}-ifp \
-       --%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
-       --%{?with_mysql:en}%{!?with_mysql:dis}able-postgresql \
-       --disable-final \
-       --with-mp4v2 \
-       --with-qt-libraries=%{_libdir} \
-       --with%{!?with_included_sqlite:out}-included-sqlite
+install -d build
+cd build
+%cmake \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
+%if "%{_lib}" == "lib64"
+       -DLIB_SUFFIX=64 \
+%endif
+       ../
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT \
-       ruby_rubylibdir=%{ruby_rubylibdir} \
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
 # remove bogus dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 
-rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
-
-# example plugin code
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/amarok/scripts/templates
-
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang amarok --all-name --with-kde
+#%find_lang %{name} --with-kde 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
+%post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f amarok.lang
+#%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/amarok
-%attr(755,root,root) %{_bindir}/amarokapp
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
-%attr(755,root,root) %{_bindir}/amarok_libvisual
-# used by last.fm and daap
-%attr(755,root,root) %{_bindir}/amarok_proxy.rb
-# used by daap
-%attr(755,root,root) %{_bindir}/amarok_daapserver.rb
-%attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libamarok.so.0
-%attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
+%attr(755,root,root) %{_bindir}/amarokmp3tunesharmonydaemon
+%attr(755,root,root) %{_bindir}/amarok_afttagger
+%attr(755,root,root) %ghost %{_libdir}/libamaroklib.so.?
+%attr(755,root,root) %{_libdir}/libamaroklib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libamarok_taglib.so.?
+%attr(755,root,root) %{_libdir}/libamarok_taglib.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libamarokplasma.so.?
+#%attr(755,root,root) %{_libdir}/libamarokplasma.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libamarokpud.so.?
+%attr(755,root,root) %{_libdir}/libamarokpud.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmediadevicelib.so.?
+%attr(755,root,root) %{_libdir}/libmediadevicelib.so.*.*.*
+%attr(755,root,root) %{_libdir}/strigi/strigita_audible.so
+%attr(755,root,root) %{_libdir}/strigi/strigita_mp4.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_containment_vertical.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_bookmark.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_currenttrack.so
+#%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_lastfmevents.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_lyrics.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_serviceinfo.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_wikipedia.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_albums.so
+#%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_video.so
+#%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_cloud.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_opmldirectory.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-ipodcollection.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_current.so
+#%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_lastfm.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_lyrics.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_service.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_wikipedia.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_ampache.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_jamendo.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_lastfm.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_magnatunestore.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_mp3tunes.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_service_shoutcast.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_ampache.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_lastfm.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_magnatunestore.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_mp3tunes.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-daapcollection.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-sqlcollection.so
+%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_mediadevices.so
+%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-mtpcollection.so
+%attr(755,root,root) %{_libdir}/libamarok_service_liblastfm.so
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
-%{_datadir}/apps/amarok/*.rc
 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
 %{_datadir}/apps/amarok/images
-%{_datadir}/apps/amarok/themes
-%{_datadir}/apps/profiles/amarok.profile.xml
-%{_datadir}/config/amarokrc
+%{_datadir}/apps/desktoptheme
 %{_datadir}/config.kcfg/amarok.kcfg
-%{_datadir}/services/amarok_generic-mediadevice.desktop
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_datadir}/services/amarok_daap-mediadevice.desktop
-%{_datadir}/services/amarok_massstorage-device.desktop
-%{_datadir}/services/amarok_nfs-device.desktop
-%{_datadir}/services/amarok_smb-device.desktop
-%{_datadir}/services/amaroklastfm.protocol
-%{_datadir}/services/amarokitpc.protocol
-%{_datadir}/services/amarokpcast.protocol
-%{_datadir}/servicetypes/amarok_codecinstall.desktop
-%{_datadir}/servicetypes/amarok_plugin.desktop
-%{_desktopdir}/kde/amarok.desktop
+%{_datadir}/config/amarok.knsrc
+%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
+%{_datadir}/kde4/services/amarok.protocol
+%{_datadir}/kde4/services/amaroklastfm.protocol
+%{_datadir}/kde4/services/ServiceMenus/amarok_append.desktop
+%{_datadir}/kde4/services/amarok-containment-vertical.desktop
+%{_datadir}/kde4/services/amarok-context-applet-bookmark.desktop
+%{_datadir}/kde4/services/amarok-context-applet-currenttrack.desktop
+#%{_datadir}/kde4/services/amarok-context-applet-lastfmevents.desktop
+%{_datadir}/kde4/services/amarok-context-applet-lyrics.desktop
+%{_datadir}/kde4/services/amarok-context-applet-serviceinfo.desktop
+%{_datadir}/kde4/services/amarok-context-applet-wikipedia.desktop
+%{_datadir}/kde4/services/amarok-context-applet-mediadevices.desktop
+%{_datadir}/kde4/services/amarok_collection-mtpcollection.desktop
+%{_datadir}/kde4/services/amarok-data-engine-current.desktop
+#%{_datadir}/kde4/services/amarok-data-engine-lastfm.desktop
+%{_datadir}/kde4/services/amarok-data-engine-lyrics.desktop
+%{_datadir}/kde4/services/amarok-data-engine-service.desktop
+%{_datadir}/kde4/services/amarok-data-engine-wikipedia.desktop
+%{_datadir}/kde4/services/amarok_collection-daapcollection.desktop
+%{_datadir}/kde4/services/amarok_collection-sqlcollection.desktop
+%{_datadir}/kde4/services/amarok_service_ampache.desktop
+%{_datadir}/kde4/services/amarok_service_ampache_config.desktop
+%{_datadir}/kde4/services/amarok_service_jamendo.desktop
+%{_datadir}/kde4/services/amarok_service_lastfm.desktop
+%{_datadir}/kde4/services/amarok_service_lastfm_config.desktop
+%{_datadir}/kde4/services/amarok_service_magnatunestore.desktop
+%{_datadir}/kde4/services/amarok_service_magnatunestore_config.desktop
+%{_datadir}/kde4/services/amarok_service_mp3tunes.desktop
+%{_datadir}/kde4/services/amarok_service_mp3tunes_config.desktop
+%{_datadir}/kde4/services/amarok_service_shoutcast.desktop
+%{_datadir}/kde4/services/amarok-context-applet-albums.desktop
+#%{_datadir}/kde4/services/amarok-context-applet-video.desktop
+#%{_datadir}/kde4/services/amarok-data-engine-cloud.desktop
+%{_datadir}/kde4/services/amarok_collection-ipodcollection.desktop
+%{_datadir}/kde4/services/amarok_service_opmldirectory.desktop
+%{_datadir}/kde4/servicetypes/amarok_context_applet.desktop
+%{_datadir}/kde4/servicetypes/amarok_data_engine.desktop
+%{_datadir}/kde4/servicetypes/amarok_plugin.desktop
+%{_datadir}/kde4/servicetypes/amarok_codecinstall.desktop
+#%{_datadir}/kde4/servicetypes/amarok_containment.desktop
+%{_desktopdir}/kde4/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
 
-# TODO: move to subpackage
-%dir %{ruby_rubylibdir}/amarok
-# used by daap
-%{ruby_rubylibdir}/amarok/codes.rb
-# used by daap and lyrics_lyrc
-%{ruby_rubylibdir}/amarok/debug.rb
-
-# TODO: move to subpackage
-%if %{with mp3players}
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so
-%attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
-%{_datadir}/services/amarok_mtp-mediadevice.desktop
-%{_datadir}/services/amarok_njb-mediadevice.desktop
-%endif
-
-%files -n konqueror-addon-amarok
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
-%{_datadir}/apps/konqueror/servicemenus/amarok_append.desktop
-%{_datadir}/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-%{_datadir}/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
-%{_datadir}/apps/konqsidebartng/entries/amarok.desktop
-%{_datadir}/apps/konqsidebartng/kicker_entries/amarok.desktop
-
-%if %{with akode}
-%files akode
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/libamarok_aKode-engine.so
-%{_datadir}/services/amarok_aKode-engine.desktop
-%endif
-
-%if %{with gstreamer}
-%files gstreamer
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/libamarok_gst10engine_plugin.so
-%{_datadir}/config.kcfg/gstconfig.kcfg
-%{_datadir}/services/amarok_gst10engine_plugin.desktop
-%endif
-
-%if %{with helix}
-%files helix
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so
-%{_datadir}/config.kcfg/helixconfig.kcfg
-%{_datadir}/services/amarok_helixengine_plugin.desktop
-%endif
-
-%if %{with xine}
-%files xine
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so
-%{_datadir}/config.kcfg/xinecfg.kcfg
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
-%if 0
-%if %{with zeroconf}
-%files zeroconf
-%defattr(644,root,root,755)
-#%{_datadir}/apps/zeroconf/_shoutcast._tcp
-%endif
-%endif
-
 %files scripts
 %defattr(644,root,root,755)
-%dir %{_datadir}/apps/amarok/scripts/common
-%{_datadir}/apps/amarok/scripts/common/Publisher.py
-%{_datadir}/apps/amarok/scripts/common/Zeroconf.py
-
-# amarok searches for executable programs for scripts
-# to figure out which files need to have execute permission, use this
-# find command:
-# $ find $RPM_BUILD_ROOT/usr/share/apps/amarok/scripts -perm +1
-
-#%dir %{_datadir}/apps/amarok/scripts/graphequalizer
-#%{_datadir}/apps/amarok/scripts/graphequalizer/README
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/graphequalizer/graphequalizer
-
-%dir %{_datadir}/apps/amarok/scripts/playlist2html
-%{_datadir}/apps/amarok/scripts/playlist2html/README
-%{_datadir}/apps/amarok/scripts/playlist2html/Playlist.py
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.py
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.py
-%{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.spec
-%{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.spec
-
-%dir %{_datadir}/apps/amarok/scripts/webcontrol
-%{_datadir}/apps/amarok/scripts/webcontrol/README
-%{_datadir}/apps/amarok/scripts/webcontrol/Globals.py
-%{_datadir}/apps/amarok/scripts/webcontrol/Playlist.py
-%{_datadir}/apps/amarok/scripts/webcontrol/RequestHandler.py
-%{_datadir}/apps/amarok/scripts/webcontrol/amarok_cut.png
-%{_datadir}/apps/amarok/scripts/webcontrol/controlbackground.png
-%{_datadir}/apps/amarok/scripts/webcontrol/main.css
-%{_datadir}/apps/amarok/scripts/webcontrol/main.js
-%{_datadir}/apps/amarok/scripts/webcontrol/player_end.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_pause.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_play.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_start.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_stop.png
-%{_datadir}/apps/amarok/scripts/webcontrol/template.thtml
-%{_datadir}/apps/amarok/scripts/webcontrol/vol_speaker.png
-%{_datadir}/apps/amarok/scripts/webcontrol/WebPublisher.py
-%{_datadir}/apps/amarok/scripts/webcontrol/WebControl.spec
-%{_datadir}/apps/amarok/scripts/webcontrol/smallstar.png
-%{_datadir}/apps/amarok/scripts/webcontrol/star.png
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/webcontrol/WebControl.py
-
-%dir %{_datadir}/apps/amarok/scripts/lyrics_astraweb
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/COPYING
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-
-%dir %{_datadir}/apps/amarok/scripts/lyrics_lyrc
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/COPYING
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
-
-%dir %{_datadir}/apps/amarok/scripts/score_default
-%{_datadir}/apps/amarok/scripts/score_default/COPYING
-%{_datadir}/apps/amarok/scripts/score_default/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_default/score_default.rb
-%{_datadir}/apps/amarok/scripts/score_default/score_default.spec
-%dir %{_datadir}/apps/amarok/scripts/score_impulsive
-%{_datadir}/apps/amarok/scripts/score_impulsive/COPYING
-%{_datadir}/apps/amarok/scripts/score_impulsive/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.rb
-%{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.spec
-
-%if 0
-%dir %{_datadir}/apps/amarok/scripts/amarok_live
-%{_datadir}/apps/amarok/scripts/amarok_live/README
-%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/amarok_live/amarok_live.py
-%endif
+%attr(755,root,root) %{_libdir}/kde4/plugins/script/libqtscript_core.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/script/libqtscript_gui.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/script/libqtscript_network.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/script/libqtscript_sql.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/script/libqtscript_uitools.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/script/libqtscript_xml.so
+%dir %{_datadir}/apps/amarok/scripts/radio_station_service
+%{_datadir}/apps/amarok/scripts/radio_station_service/main.js
+%{_datadir}/apps/amarok/scripts/radio_station_service/script.spec
+%dir %{_datadir}/apps/amarok/scripts/script_console
+%{_datadir}/apps/amarok/scripts/script_console/main.js
+%{_datadir}/apps/amarok/scripts/script_console/script.spec
+%dir %{_datadir}/apps/amarok/scripts/lyrics_lyricwiki
+%{_datadir}/apps/amarok/scripts/lyrics_lyricwiki/main.js
+%{_datadir}/apps/amarok/scripts/lyrics_lyricwiki/script.spec
+%dir %{_datadir}/apps/amarok/scripts/librivox_service
+%{_datadir}/apps/amarok/scripts/librivox_service/main.js
+%{_datadir}/apps/amarok/scripts/librivox_service/LibrivoxLogo.png
+%{_datadir}/apps/amarok/scripts/librivox_service/LibrivoxService.html
+%{_datadir}/apps/amarok/scripts/librivox_service/script.spec

diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644 (file)
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in     2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
deleted file mode 100644 (file)
index 21a7c91..0000000
--- a/kde-common-PLD.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- kdelibs-3.5.3.or/admin/acinclude.m4.in     2006-05-23 13:02:06.000000000 +0000
-+++ kdelibs-3.5.3/admin/acinclude.m4.in        2006-07-01 14:55:49.345359250 +0000
-@@ -428,7 +428,7 @@
- if test "$1" = "default"; then
- 
-   if test -z "$kde_htmldir"; then
--    kde_htmldir='\${datadir}/doc/HTML'
-+    kde_htmldir='/usr/share/doc/kde/HTML'
-   fi
-   if test -z "$kde_appsdir"; then
-     kde_appsdir='\${datadir}/applnk'
-@@ -2977,41 +2977,6 @@
- 
- AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
- [
--  AC_MSG_CHECKING([whether $CC is blacklisted])
--
--  dnl In theory we have tu run this test against $CC and $CXX
--  dnl in C and in C++ mode, because its perfectly legal for
--  dnl the user to mix compiler versions, since C has a defined
--  dnl ABI. 
--  dnl 
--  dnl For now, we assume the user is not on crack.
--
--  AC_TRY_COMPILE([
--#ifdef __GNUC__
--#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
--#endif
--#endif
--], ,
--  kde_bad_compiler=no, 
--  kde_bad_compiler=yes
--)
--
--  AC_MSG_RESULT($kde_bad_compiler)
--
--if test "$kde_bad_compiler" = "yes"; then
--  AC_MSG_ERROR([
--
--This particular compiler version is blacklisted because it
--is known to miscompile KDE. Please use a newer version, or
--if that is not yet available, choose an older version. 
--
--Please do not report a bug or bother us reporting this
--configure error. We know about it, and we introduced
--it by intention to avoid untraceable bugs or crashes in KDE.
--
--])
--fi
- 
- ])
- 
-@@ -3153,8 +3118,6 @@
- 
-   AC_PROG_CXX
- 
--  KDE_CHECK_FOR_BAD_COMPILER
--
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-     if test "$kde_use_debug_code" != "no"; then
-       if test "$CXX" = "KCC"; then
-@@ -4579,9 +4542,9 @@
-   LIBPYTHON=-lpython$version
- fi
- 
--AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
- python_moddir=$python_moddir/python$version
--if test ! -r $python_moddir/copy.py; then
-+if test ! -r $python_moddir/copy.pyc; then
-   python_moddir=no
- fi
- 
-@@ -4728,32 +4691,11 @@
- [
-     AC_MSG_CHECKING([for utmp file])
- 
--    AC_CACHE_VAL(kde_cv_utmp_file,
--    [
--    kde_cv_utmp_file=no
-+    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
- 
--    for ac_file in    \
--                      \
--      /var/run/utmp \
--      /var/adm/utmp \
--      /etc/utmp     \
--     ; \
--    do
--     if test -r "$ac_file"; then
--       kde_cv_utmp_file=$ac_file
--       break
--     fi
--    done
--    ])
--
--    if test "$kde_cv_utmp_file" != "no"; then
--      AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
--      $1
--      AC_MSG_RESULT($kde_cv_utmp_file)
--    else
--      $2
--      AC_MSG_RESULT([non found])
--    fi
-+    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+    $1
-+    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
- ])
- 
- 
-@@ -5536,7 +5478,7 @@
-   kde_qtdir="$with_qt_dir"
- fi
- 
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
- 
- AC_SUBST(QTDOCDIR)
---- gwenview-1.4.0/admin/am_edit       2006-09-25 00:04:55.213036950 +0300
-+++ kdelibs-3.5.5/admin/am_edit        2006-10-03 11:40:08.052152886 +0300
-@@ -499,6 +499,15 @@
-         }
-     }
- 
-+    $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
-+    if ($MakefileData =~ m/$lookup/) {
-+        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
-+    }
-+    $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
-+    if ($MakefileData =~ m/$lookup/) {
-+        substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
-+    }
-+
-     $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
- 
-     $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
-@@ -578,6 +587,14 @@
-         local @kde_options = split(/[\034\s]+/, $kde_options_str);
-         if (grep(/^foreign$/, @kde_options)) {
-             push(@foreignfiles, $makefileDir . "/");
-+
-+            # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
-+            $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
-+            if ($MakefileData =~ m/$lookup/) {
-+                substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
-+                updateMakefile ();
-+            }
-+
-             return 0; # don't touch me
-         }
-         for $opt (@kde_options) {
-
---- x/admin/acinclude.m4.in.orig       2008-10-08 10:18:48.844247699 +0200
-+++ x/admin/acinclude.m4.in    2008-10-08 10:21:26.884232831 +0200
-@@ -4612,7 +4612,8 @@
- 
- AC_DEFUN([KDE_CHECK_PYTHON],
- [
--  KDE_CHECK_PYTHON_INTERN("2.5",
-+ KDE_CHECK_PYTHON_INTERN("2.6",
-+  [KDE_CHECK_PYTHON_INTERN("2.5",
-     [KDE_CHECK_PYTHON_INTERN("2.4",
-      [KDE_CHECK_PYTHON_INTERN("2.3", 
-        [KDE_CHECK_PYTHON_INTERN("2.2", 
-@@ -4624,6 +4625,7 @@
-        ])
-      ])
-   ])
-+ ])
- ])
- 
- AC_DEFUN([KDE_CHECK_STL],

diff --git a/kde-common-gcc4.patch b/kde-common-gcc4.patch
deleted file mode 100644 (file)
index 9ccb0ea..0000000
--- a/kde-common-gcc4.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- amaroc/admin/acinclude.m4.in.orig  2006-04-03 18:02:49.000000000 +0200
-+++ amaroc/admin/acinclude.m4.in       2006-04-03 18:20:39.000000000 +0200
-@@ -428,7 +428,7 @@
- if test "$1" = "default"; then
- 
-   if test -z "$kde_htmldir"; then
--    kde_htmldir='\${datadir}/doc/HTML'
-+    kde_htmldir='/usr/share/doc/kde/HTML'
-   fi
-   if test -z "$kde_appsdir"; then
-     kde_appsdir='\${datadir}/applnk'
-@@ -2974,48 +2974,6 @@
-   fi
- ])
- 
--
--AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
--[
--  AC_MSG_CHECKING([whether $CC is blacklisted])
--
--  dnl In theory we have tu run this test against $CC and $CXX
--  dnl in C and in C++ mode, because its perfectly legal for
--  dnl the user to mix compiler versions, since C has a defined
--  dnl ABI. 
--  dnl 
--  dnl For now, we assume the user is not on crack.
--
--  AC_TRY_COMPILE([
--#ifdef __GNUC__
--#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
--#endif
--#endif
--], ,
--  kde_bad_compiler=no, 
--  kde_bad_compiler=yes
--)
--
--  AC_MSG_RESULT($kde_bad_compiler)
--
--if test "$kde_bad_compiler" = "yes"; then
--  AC_MSG_ERROR([
--
--This particular compiler version is blacklisted because it
--is known to miscompile KDE. Please use a newer version, or
--if that is not yet available, choose an older version. 
--
--Please do not report a bug or bother us reporting this
--configure error. We know about it, and we introduced
--it by intention to avoid untraceable bugs or crashes in KDE.
--
--])
--fi
--
--])
--
--
- AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
- [
-   AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
-@@ -3153,8 +3111,6 @@
- 
-   AC_PROG_CXX
- 
--  KDE_CHECK_FOR_BAD_COMPILER
--
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-     if test "$kde_use_debug_code" != "no"; then
-       if test "$CXX" = "KCC"; then
-@@ -4576,9 +4532,9 @@
-   LIBPYTHON=-lpython$version
- fi
- 
--AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
- python_moddir=$python_moddir/python$version
--if test ! -r $python_moddir/copy.py; then
-+if test ! -r $python_moddir/copy.pyc; then
-   python_moddir=no
- fi
- 
-@@ -4725,32 +4681,11 @@
- [
-     AC_MSG_CHECKING([for utmp file])
- 
--    AC_CACHE_VAL(kde_cv_utmp_file,
--    [
--    kde_cv_utmp_file=no
--
--    for ac_file in    \
--                      \
--      /var/run/utmp \
--      /var/adm/utmp \
--      /etc/utmp     \
--     ; \
--    do
--     if test -r "$ac_file"; then
--       kde_cv_utmp_file=$ac_file
--       break
--     fi
--    done
--    ])
-+    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
- 
--    if test "$kde_cv_utmp_file" != "no"; then
--      AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
--      $1
--      AC_MSG_RESULT($kde_cv_utmp_file)
--    else
--      $2
--      AC_MSG_RESULT([non found])
--    fi
-+    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+    $1
-+    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
- ])
- 
- 
-@@ -5533,7 +5468,7 @@
-   kde_qtdir="$with_qt_dir"
- fi
- 
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
- 
- AC_SUBST(QTDOCDIR)

diff --git a/kde4-kdeextragear-multimedia-NJB.patch b/kde4-kdeextragear-multimedia-NJB.patch
deleted file mode 100644 (file)
index 4ee09a0..0000000
--- a/kde4-kdeextragear-multimedia-NJB.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- amarok/cmake/modules/FindNjb.cmake.orig    2008-06-08 11:21:07.000000000 +0200
-+++ amarok/cmake/modules/FindNjb.cmake 2008-06-08 11:27:09.000000000 +0200
-@@ -23,7 +23,7 @@
-     set(NJB_DEFINITIONS ${_NJBCflags})
-   endif(NOT WIN32)
- 
--  FIND_PATH(NJB_INCLUDE_DIR libnjb.h
-+  FIND_PATH(NJB_INCLUDE_DIR libnjb/libnjb.h
-     ${_NJBIncDir}
-   )
-   
---- amarok/src/mediadevice/njb/playlist.h.orig 2008-06-08 11:28:16.000000000 +0200
-+++ amarok/src/mediadevice/njb/playlist.h      2008-06-08 11:29:17.000000000 +0200
-@@ -20,7 +20,7 @@
- #define __playlist_h__
- 
- // libnjb
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- 
- // Qt
- #include <QStringList>
---- amarok/src/mediadevice/njb/track.h.orig    2008-06-08 11:28:30.000000000 +0200
-+++ amarok/src/mediadevice/njb/track.h 2008-06-08 11:29:43.000000000 +0200
-@@ -27,7 +27,7 @@
- #include <Q3PtrList>
- 
- // libnjb
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- 
- #include "metabundle.h"
-