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

1_4_5-1'.

Sprout from AC-branch 2007-02-09 00:05:05 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 1'
Cherrypick from AC-branch 2008-05-04 10:12:14 UTC cvs2git <feedback@pld-linux.org> 'This commit was manufactured by cvs2git to create branch 'AC-branch'.':
    amarok-sparc.patch -> 1.2
Delete:
    amarok-libtunepimp-0.4.0.patch
    amarok-lyricsurl.patch
    kde-common-gcc4.patch

diff --git a/amarok-libtunepimp-0.4.0.patch b/amarok-libtunepimp-0.4.0.patch
deleted file mode 100644 (file)
index dd9fc78..0000000
--- a/amarok-libtunepimp-0.4.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- amarok-1.3.6/amarok/src/ktrm.cpp.orig      2005-11-07 23:19:18.000000000 +0100
-+++ amarok-1.3.6/amarok/src/ktrm.cpp   2005-11-17 12:24:43.006638250 +0100
-@@ -42,7 +42,7 @@
- 
- extern "C"
- {
--    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
-+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus);
- }
- 
- /**
-@@ -66,7 +66,7 @@
-         int id;
- 
-         if(!m_fileMap.contains(lookup->file())) {
--            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
-+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()), 1);
-             m_fileMap.insert(lookup->file(), id);
-         }
-         else {
-@@ -121,7 +121,7 @@
-         tp_SetAutoSaveThreshold(m_pimp, -1);
-         tp_SetMoveFiles(m_pimp, false);
-         tp_SetRenameFiles(m_pimp, false);
--        tp_SetUseUTF8(m_pimp, true);
-+        tp_SetID3Encoding(m_pimp, eUTF8);
-         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
- 
-         if(KProtocolManager::useProxy()) {
-@@ -245,7 +245,7 @@
-  * Callback fuction for TunePimp lookup events.
-  */
- 
--static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
-+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus)
- {
-     if(type != tpFileChanged)
-         return;
-@@ -556,10 +556,10 @@
-                 KTRMResult result;
- 
-                 result.d->title = QString::fromUtf8(tracks[i]->name);
--                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
--                result.d->album = QString::fromUtf8(tracks[i]->album->name);
-+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
-+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
-                 result.d->track = tracks[i]->trackNum;
--                result.d->year = tracks[i]->album->releaseYear;
-+                result.d->year = tracks[i]->album.releaseYear;
-                 result.d->relevance =
-                     4 * stringSimilarity(strList,result.d->title) +
-                     2 * stringSimilarity(strList,result.d->artist) +

diff --git a/amarok-lyricsurl.patch b/amarok-lyricsurl.patch
deleted file mode 100644 (file)
index c1619f4..0000000
--- a/amarok-lyricsurl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./amarok/src/contextbrowser.cpp~   2005-08-16 21:04:08.000000000 +0200
-+++ ./amarok/src/contextbrowser.cpp    2005-08-16 21:10:46.000000000 +0200
-@@ -2407,10 +2407,10 @@
-     }
- 
-     if ( !hash.isEmpty() && hash != QString( "reload" ) )
--        m_lyricCurrentUrl = QString( "http://lyrc.com.ar/en/tema1en.php?hash=%1" )
-+        m_lyricCurrentUrl = QString( "http://glen.alkohol.ee/lyrics.php?hash=%1" )
-                   .arg( hash );
-     else
--        m_lyricCurrentUrl = QString( "http://lyrc.com.ar/en/tema1en.php?artist=%1&songname=%2" )
-+        m_lyricCurrentUrl = QString( "http://glen.alkohol.ee/lyrics.php?artist=%1&songname=%2" )
-                 .arg(
-                 KURL::encode_string_no_slash( EngineController::instance()->bundle().artist() ),
-                 KURL::encode_string_no_slash( title ) );

diff --git a/amarok-sparc.patch b/amarok-sparc.patch
new file mode 100644 (file)
index 0000000..3397e29
--- /dev/null
+++ b/amarok-sparc.patch
@@ -0,0 +1,11 @@
+--- 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/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)