- update to -> 1.4.3

    - introduce Amarok File Tracker
    - DAAP with RendezVous/ZeroConf support
    - Full changelog: http://amarok.kde.org/content/view/81/66/

12 files changed, 108 insertions, 180 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index aeb5d786f515..422e9fcb49c5 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index d64c6cee75d3..c350ffdcd208 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.2.tar.bz2) = a1e5aac4294eb049021d1e2889c0d214
-SHA256 (amarok-1.4.2.tar.bz2) = 4b0b3174edf30c1d78240f7a48aeda1d7d9763a18de409046ef426caa3f6fd82
-SIZE (amarok-1.4.2.tar.bz2) = 17080668
+MD5 (amarok-1.4.3.tar.bz2) = b0b4f8952ad23705c70815d50fd0af52
+SHA256 (amarok-1.4.3.tar.bz2) = e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847
+SIZE (amarok-1.4.3.tar.bz2) = 17175603
diff --git a/audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp b/audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp
deleted file mode 100644
index 81649997cb8f..000000000000
--- a/audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/collectiondb.cpp.orig
-+++ amarok/src/collectiondb.cpp
-@@ -3447,28 +3447,6 @@
-             bundle->copyFrom( peb );
-             valid = true;
-         }
--        else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" )
--        {
--            // try to see if the engine has some info about the
--            // item (the intended behaviour should be that if the
--            // item is an AudioCD track, the engine can return
--            // CDDB data for it)
--            Engine::SimpleMetaBundle smb;
--            if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) )
--            {
--                valid = true;
--                bundle->setTitle( smb.title );
--                bundle->setArtist( smb.artist );
--                bundle->setAlbum( smb.album );
--                bundle->setComment( smb.comment );
--                bundle->setGenre( smb.genre );
--                bundle->setBitrate( smb.bitrate.toInt() );
--                bundle->setSampleRate( smb.samplerate.toInt() );
--                bundle->setLength( smb.length.toInt() );
--                bundle->setYear( smb.year.toInt() );
--                bundle->setTrack( smb.tracknr.toInt() );
--            }
--        }
-     }
- 
-     return valid;
-@@ -5745,7 +5723,8 @@
- {
- 
-     QStringList values;
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5771,6 +5750,7 @@
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on query: " << statement << endl;
-             values = QStringList();
-+            break;
-         }
-         else
-         {
-@@ -5835,7 +5815,8 @@
- 
- int SqliteConnection::insert( const QString& statement, const QString& /* table */ )
- {
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5860,6 +5841,7 @@
-             Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl;
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on insert: " << statement << endl;
-+            break;
-         }
-         else
-         {
diff --git a/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in b/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in
index 8369bddee3c9..0a969a69e2a3 100644
--- a/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in
+++ b/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in
@@ -3,10 +3,10 @@ $FreeBSD$
 
 --- amarok/src/metadata/audible/Makefile.in.orig
 +++ amarok/src/metadata/audible/Makefile.in
-@@ -358,7 +358,7 @@
+@@ -435,7 +435,7 @@
+ xmms_cflags = @xmms_cflags@
  xmms_libs = @xmms_libs@
  SUBDIRS = 
- 
 -INCLUDES = $(all_includes) $(taglib_includes)
 +INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(taglib_includes)
  #>- METASOURCES = AUTO
diff --git a/audio/amarok-kde4/files/patch-amarok_src_scancontroller.h b/audio/amarok-kde4/files/patch-amarok_src_scancontroller.h
deleted file mode 100644
index 369f768096c7..000000000000
--- a/audio/amarok-kde4/files/patch-amarok_src_scancontroller.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/scancontroller.h.orig
-+++ amarok/src/scancontroller.h
-@@ -99,7 +99,7 @@
-         void customEvent( QCustomEvent* );
- 
-         // Member variables:
--        static const uint MAX_RESTARTS = 2;
-+        static const uint MAX_RESTARTS = 20;
- 
-         KProcIO* m_scanner;
-         QStringList m_folders;
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index 69b1d11d2034..a6d73b27f086 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -449,6 +449,50 @@ share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
 share/apps/amarok/images/xine_logo.png
 share/apps/amarok/ruby_lib/codes.rb
+share/apps/amarok/ruby_lib/gemconfigure.rb
+share/apps/amarok/ruby_lib/http11.rb
+share/apps/amarok/ruby_lib/libhttp11.a
+share/apps/amarok/ruby_lib/libhttp11.la
+share/apps/amarok/ruby_lib/libhttp11.so
+share/apps/amarok/ruby_lib/libhttp11.so.0
+share/apps/amarok/ruby_lib/mongrel.rb
+share/apps/amarok/ruby_lib/rubygems.rb
+share/apps/amarok/ruby_lib/mongrel/cgi.rb
+share/apps/amarok/ruby_lib/mongrel/command.rb
+share/apps/amarok/ruby_lib/mongrel/configurator.rb
+share/apps/amarok/ruby_lib/mongrel/debug.rb
+share/apps/amarok/ruby_lib/mongrel/handlers.rb
+share/apps/amarok/ruby_lib/mongrel/init.rb
+share/apps/amarok/ruby_lib/mongrel/stats.rb
+share/apps/amarok/ruby_lib/mongrel/tcphack.rb
+share/apps/amarok/ruby_lib/rbconfig/datadir.rb
+share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
+share/apps/amarok/ruby_lib/rubygems/builder.rb
+share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
+share/apps/amarok/ruby_lib/rubygems/command.rb
+share/apps/amarok/ruby_lib/rubygems/config_file.rb
+share/apps/amarok/ruby_lib/rubygems/custom_require.rb
+share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
+share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
+share/apps/amarok/ruby_lib/rubygems/format.rb
+share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
+share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
+share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
+share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
+share/apps/amarok/ruby_lib/rubygems/installer.rb
+share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
+share/apps/amarok/ruby_lib/rubygems/old_format.rb
+share/apps/amarok/ruby_lib/rubygems/open-uri.rb
+share/apps/amarok/ruby_lib/rubygems/package.rb
+share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
+share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
+share/apps/amarok/ruby_lib/rubygems/security.rb
+share/apps/amarok/ruby_lib/rubygems/source_index.rb
+share/apps/amarok/ruby_lib/rubygems/specification.rb
+share/apps/amarok/ruby_lib/rubygems/timer.rb
+share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
+share/apps/amarok/ruby_lib/rubygems/validator.rb
+share/apps/amarok/ruby_lib/rubygems/version.rb
 share/apps/amarok/scripts/common/Publisher.py
 share/apps/amarok/scripts/common/Zeroconf.py
 share/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -915,6 +959,7 @@ share/icons/hicolor/32x32/apps/amarok.png
 share/icons/hicolor/48x48/apps/amarok.png
 share/icons/hicolor/64x64/apps/amarok.png
 share/locale/af/LC_MESSAGES/amarok.mo
+share/locale/ar/LC_MESSAGES/amarok.mo
 share/locale/az/LC_MESSAGES/amarok.mo
 share/locale/bg/LC_MESSAGES/amarok.mo
 share/locale/br/LC_MESSAGES/amarok.mo
@@ -1037,6 +1082,9 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/apps/amarok/scripts/common
 @dirrm share/apps/amarok/scripts
+@dirrm share/apps/amarok/ruby_lib/rubygems
+@dirrm share/apps/amarok/ruby_lib/rbconfig
+@dirrm share/apps/amarok/ruby_lib/mongrel
 @dirrm share/apps/amarok/ruby_lib
 @dirrm share/apps/amarok/images
 @dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index aeb5d786f515..422e9fcb49c5 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index d64c6cee75d3..c350ffdcd208 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.2.tar.bz2) = a1e5aac4294eb049021d1e2889c0d214
-SHA256 (amarok-1.4.2.tar.bz2) = 4b0b3174edf30c1d78240f7a48aeda1d7d9763a18de409046ef426caa3f6fd82
-SIZE (amarok-1.4.2.tar.bz2) = 17080668
+MD5 (amarok-1.4.3.tar.bz2) = b0b4f8952ad23705c70815d50fd0af52
+SHA256 (amarok-1.4.3.tar.bz2) = e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847
+SIZE (amarok-1.4.3.tar.bz2) = 17175603
diff --git a/audio/amarok/files/patch-amarok_src_collectiondb.cpp b/audio/amarok/files/patch-amarok_src_collectiondb.cpp
deleted file mode 100644
index 81649997cb8f..000000000000
--- a/audio/amarok/files/patch-amarok_src_collectiondb.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/collectiondb.cpp.orig
-+++ amarok/src/collectiondb.cpp
-@@ -3447,28 +3447,6 @@
-             bundle->copyFrom( peb );
-             valid = true;
-         }
--        else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" )
--        {
--            // try to see if the engine has some info about the
--            // item (the intended behaviour should be that if the
--            // item is an AudioCD track, the engine can return
--            // CDDB data for it)
--            Engine::SimpleMetaBundle smb;
--            if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) )
--            {
--                valid = true;
--                bundle->setTitle( smb.title );
--                bundle->setArtist( smb.artist );
--                bundle->setAlbum( smb.album );
--                bundle->setComment( smb.comment );
--                bundle->setGenre( smb.genre );
--                bundle->setBitrate( smb.bitrate.toInt() );
--                bundle->setSampleRate( smb.samplerate.toInt() );
--                bundle->setLength( smb.length.toInt() );
--                bundle->setYear( smb.year.toInt() );
--                bundle->setTrack( smb.tracknr.toInt() );
--            }
--        }
-     }
- 
-     return valid;
-@@ -5745,7 +5723,8 @@
- {
- 
-     QStringList values;
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5771,6 +5750,7 @@
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on query: " << statement << endl;
-             values = QStringList();
-+            break;
-         }
-         else
-         {
-@@ -5835,7 +5815,8 @@
- 
- int SqliteConnection::insert( const QString& statement, const QString& /* table */ )
- {
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5860,6 +5841,7 @@
-             Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl;
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on insert: " << statement << endl;
-+            break;
-         }
-         else
-         {
diff --git a/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in b/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in
index 8369bddee3c9..0a969a69e2a3 100644
--- a/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in
+++ b/audio/amarok/files/patch-amarok_src_metadata_audible_Makefile.in
@@ -3,10 +3,10 @@ $FreeBSD$
 
 --- amarok/src/metadata/audible/Makefile.in.orig
 +++ amarok/src/metadata/audible/Makefile.in
-@@ -358,7 +358,7 @@
+@@ -435,7 +435,7 @@
+ xmms_cflags = @xmms_cflags@
  xmms_libs = @xmms_libs@
  SUBDIRS = 
- 
 -INCLUDES = $(all_includes) $(taglib_includes)
 +INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(taglib_includes)
  #>- METASOURCES = AUTO
diff --git a/audio/amarok/files/patch-amarok_src_scancontroller.h b/audio/amarok/files/patch-amarok_src_scancontroller.h
deleted file mode 100644
index 369f768096c7..000000000000
--- a/audio/amarok/files/patch-amarok_src_scancontroller.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/scancontroller.h.orig
-+++ amarok/src/scancontroller.h
-@@ -99,7 +99,7 @@
-         void customEvent( QCustomEvent* );
- 
-         // Member variables:
--        static const uint MAX_RESTARTS = 2;
-+        static const uint MAX_RESTARTS = 20;
- 
-         KProcIO* m_scanner;
-         QStringList m_folders;
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 69b1d11d2034..a6d73b27f086 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -449,6 +449,50 @@ share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
 share/apps/amarok/images/xine_logo.png
 share/apps/amarok/ruby_lib/codes.rb
+share/apps/amarok/ruby_lib/gemconfigure.rb
+share/apps/amarok/ruby_lib/http11.rb
+share/apps/amarok/ruby_lib/libhttp11.a
+share/apps/amarok/ruby_lib/libhttp11.la
+share/apps/amarok/ruby_lib/libhttp11.so
+share/apps/amarok/ruby_lib/libhttp11.so.0
+share/apps/amarok/ruby_lib/mongrel.rb
+share/apps/amarok/ruby_lib/rubygems.rb
+share/apps/amarok/ruby_lib/mongrel/cgi.rb
+share/apps/amarok/ruby_lib/mongrel/command.rb
+share/apps/amarok/ruby_lib/mongrel/configurator.rb
+share/apps/amarok/ruby_lib/mongrel/debug.rb
+share/apps/amarok/ruby_lib/mongrel/handlers.rb
+share/apps/amarok/ruby_lib/mongrel/init.rb
+share/apps/amarok/ruby_lib/mongrel/stats.rb
+share/apps/amarok/ruby_lib/mongrel/tcphack.rb
+share/apps/amarok/ruby_lib/rbconfig/datadir.rb
+share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
+share/apps/amarok/ruby_lib/rubygems/builder.rb
+share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
+share/apps/amarok/ruby_lib/rubygems/command.rb
+share/apps/amarok/ruby_lib/rubygems/config_file.rb
+share/apps/amarok/ruby_lib/rubygems/custom_require.rb
+share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
+share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
+share/apps/amarok/ruby_lib/rubygems/format.rb
+share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
+share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
+share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
+share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
+share/apps/amarok/ruby_lib/rubygems/installer.rb
+share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
+share/apps/amarok/ruby_lib/rubygems/old_format.rb
+share/apps/amarok/ruby_lib/rubygems/open-uri.rb
+share/apps/amarok/ruby_lib/rubygems/package.rb
+share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
+share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
+share/apps/amarok/ruby_lib/rubygems/security.rb
+share/apps/amarok/ruby_lib/rubygems/source_index.rb
+share/apps/amarok/ruby_lib/rubygems/specification.rb
+share/apps/amarok/ruby_lib/rubygems/timer.rb
+share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
+share/apps/amarok/ruby_lib/rubygems/validator.rb
+share/apps/amarok/ruby_lib/rubygems/version.rb
 share/apps/amarok/scripts/common/Publisher.py
 share/apps/amarok/scripts/common/Zeroconf.py
 share/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -915,6 +959,7 @@ share/icons/hicolor/32x32/apps/amarok.png
 share/icons/hicolor/48x48/apps/amarok.png
 share/icons/hicolor/64x64/apps/amarok.png
 share/locale/af/LC_MESSAGES/amarok.mo
+share/locale/ar/LC_MESSAGES/amarok.mo
 share/locale/az/LC_MESSAGES/amarok.mo
 share/locale/bg/LC_MESSAGES/amarok.mo
 share/locale/br/LC_MESSAGES/amarok.mo
@@ -1037,6 +1082,9 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/apps/amarok/scripts/common
 @dirrm share/apps/amarok/scripts
+@dirrm share/apps/amarok/ruby_lib/rubygems
+@dirrm share/apps/amarok/ruby_lib/rbconfig
+@dirrm share/apps/amarok/ruby_lib/mongrel
 @dirrm share/apps/amarok/ruby_lib
 @dirrm share/apps/amarok/images
 @dirrm share/apps/amarok/icons/crystalsvg/64x64/actions