summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/amarok/Makefile7
-rw-r--r--audio/amarok/PLIST50
-rw-r--r--audio/amarok/distinfo12
-rw-r--r--audio/amarok/patches/patch-aa50
-rw-r--r--audio/amarok/patches/patch-ab6
-rw-r--r--audio/amarok/patches/patch-ac15
6 files changed, 49 insertions, 91 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 20aecdb6f31..eb1e1836c9a 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2010/06/13 22:43:47 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2010/06/13 23:39:26 wiz Exp $
#
DISTNAME= amarok-${VERS}
-VERS= 2.3.0
-PKGREVISION= 3
+VERS= 2.3.1
CATEGORIES= audio multimedia
#MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \
# ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
@@ -35,7 +34,7 @@ SUBST_CLASSES+= mysql
SUBST_STAGE.mysql= post-patch
SUBST_MESSAGE.mysql= Fixup paths for MySQL embedded
SUBST_FILES.mysql= cmake/modules/FindMySQLAmarok.cmake
-SUBST_FILES.mysql+= src/collection/sqlcollection/mysqlecollection/CMakeLists.txt
+SUBST_FILES.mysql+= src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt
SUBST_SED.mysql= -e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-server}:
SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib/mysql:
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index d503ec8dfc8..6e24c15311c 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2010/04/10 02:49:36 markd Exp $
+@comment $NetBSD: PLIST,v 1.35 2010/06/13 23:39:26 wiz Exp $
bin/amarok
bin/amarok_afttagger
bin/amarokcollectionscanner
@@ -18,12 +18,16 @@ lib/kde4/amarok_context_applet_currenttrack.so
lib/kde4/amarok_context_applet_info.so
lib/kde4/amarok_context_applet_lyrics.so
lib/kde4/amarok_context_applet_photos.so
+lib/kde4/amarok_context_applet_similarArtists.so
+lib/kde4/amarok_context_applet_upcomingEvents.so
lib/kde4/amarok_context_applet_videoclip.so
lib/kde4/amarok_context_applet_wikipedia.so
lib/kde4/amarok_data_engine_current.so
lib/kde4/amarok_data_engine_info.so
lib/kde4/amarok_data_engine_lyrics.so
lib/kde4/amarok_data_engine_photos.so
+lib/kde4/amarok_data_engine_similarArtists.so
+lib/kde4/amarok_data_engine_upcomingEvents.so
lib/kde4/amarok_data_engine_videoclip.so
lib/kde4/amarok_data_engine_wikipedia.so
lib/kde4/amarok_massstorage-device.so
@@ -41,6 +45,9 @@ lib/kde4/kcm_amarok_service_mp3tunes.so
lib/libamarok-sqlcollection.so
lib/libamarok-sqlcollection.so.1
lib/libamarok-sqlcollection.so.1.0.0
+lib/libamarokcore.so
+lib/libamarokcore.so.1
+lib/libamarokcore.so.1.0.0
lib/libamaroklib.so
lib/libamaroklib.so.1
lib/libamaroklib.so.1.0.0
@@ -143,6 +150,7 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-queue-amarok.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-remove-amarok.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-repeat-amarok.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/playlist-generator.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/podcast-amarok.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-indicator-amarok.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-media-playback-amarok.png
@@ -202,6 +210,7 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-queue-amarok.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-remove-amarok.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-repeat-amarok.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/playlist-generator.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/podcast-amarok.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-indicator-amarok.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-media-playback-amarok.png
@@ -262,6 +271,7 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-queue-amarok.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-remove-amarok.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-repeat-amarok.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/playlist-generator.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/podcast-amarok.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-indicator-amarok.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-media-playback-amarok.png
@@ -345,12 +355,15 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-remove-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-repeat-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/music-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/photos-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/playlist-generator.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/podcast-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-indicator-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-media-playback-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-multimedia-player-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-view-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/similarartists-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/upcomingevents-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
@@ -402,6 +415,10 @@ share/kde/apps/amarok/images/info_frontpage_bg.png
share/kde/apps/amarok/images/info_frontpage_logo.png
share/kde/apps/amarok/images/info_frontpage_shadow.png
share/kde/apps/amarok/images/lastfm-default-cover.png
+share/kde/apps/amarok/images/likeback_bug.png
+share/kde/apps/amarok/images/likeback_dislike.png
+share/kde/apps/amarok/images/likeback_feature.png
+share/kde/apps/amarok/images/likeback_like.png
share/kde/apps/amarok/images/loading1.png
share/kde/apps/amarok/images/loading2.png
share/kde/apps/amarok/images/navigation_arrows.svg
@@ -465,12 +482,16 @@ share/kde4/services/amarok-context-applet-currenttrack.desktop
share/kde4/services/amarok-context-applet-info.desktop
share/kde4/services/amarok-context-applet-lyrics.desktop
share/kde4/services/amarok-context-applet-photos.desktop
+share/kde4/services/amarok-context-applet-similarArtists.desktop
+share/kde4/services/amarok-context-applet-upcomingEvents.desktop
share/kde4/services/amarok-context-applet-videoclip.desktop
share/kde4/services/amarok-context-applet-wikipedia.desktop
share/kde4/services/amarok-data-engine-current.desktop
share/kde4/services/amarok-data-engine-info.desktop
share/kde4/services/amarok-data-engine-lyrics.desktop
share/kde4/services/amarok-data-engine-photos.desktop
+share/kde4/services/amarok-data-engine-similarArtists.desktop
+share/kde4/services/amarok-data-engine-upcomingEvents.desktop
share/kde4/services/amarok-data-engine-videoclip.desktop
share/kde4/services/amarok-data-engine-wikipedia.desktop
share/kde4/services/amarok-scriptengine-applet-simple-javascript.desktop
@@ -538,7 +559,6 @@ share/locale/et/LC_MESSAGES/amarok.mo
share/locale/et/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/et/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/et/LC_MESSAGES/amarokpkg.mo
-share/locale/fi/LC_MESSAGES/amarok.mo
share/locale/fr/LC_MESSAGES/amarok.mo
share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -551,6 +571,11 @@ share/locale/it/LC_MESSAGES/amarok.mo
share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/it/LC_MESSAGES/amarokpkg.mo
+share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/lt/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/lt/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/lt/LC_MESSAGES/amarokpkg.mo
share/locale/lv/LC_MESSAGES/amarok.mo
share/locale/lv/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/lv/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -563,10 +588,6 @@ share/locale/nds/LC_MESSAGES/amarok.mo
share/locale/nds/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/nds/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/nds/LC_MESSAGES/amarokpkg.mo
-share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/nl/LC_MESSAGES/amarokpkg.mo
share/locale/pa/LC_MESSAGES/amarok.mo
share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/pa/LC_MESSAGES/amarokpkg.mo
@@ -582,10 +603,6 @@ share/locale/pt_BR/LC_MESSAGES/amarok.mo
share/locale/pt_BR/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/pt_BR/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/pt_BR/LC_MESSAGES/amarokpkg.mo
-share/locale/ro/LC_MESSAGES/amarok.mo
-share/locale/ro/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ro/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ro/LC_MESSAGES/amarokpkg.mo
share/locale/ru/LC_MESSAGES/amarok.mo
share/locale/ru/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/ru/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -606,13 +623,20 @@ share/locale/sr@ijekavian/LC_MESSAGES/amarok.mo
share/locale/sr@ijekavian/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sr@ijekavian/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sr@ijekavian/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarok.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@latin/LC_MESSAGES/amarok.mo
+share/locale/sr@latin/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sr@latin/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sr@latin/LC_MESSAGES/amarokpkg.mo
share/locale/sv/LC_MESSAGES/amarok.mo
share/locale/sv/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sv/LC_MESSAGES/amarokpkg.mo
share/locale/th/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarokpkg.mo
share/locale/tr/LC_MESSAGES/amarok.mo
share/locale/tr/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -621,9 +645,11 @@ share/locale/uk/LC_MESSAGES/amarok.mo
share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/uk/LC_MESSAGES/amarokpkg.mo
-share/locale/wa/LC_MESSAGES/amarok.mo
-share/locale/wa/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/zh_CN/LC_MESSAGES/amarok.mo
share/locale/zh_CN/LC_MESSAGES/amarok_scriptengine_qscript.mo
share/locale/zh_CN/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/zh_CN/LC_MESSAGES/amarokpkg.mo
+share/locale/zh_TW/LC_MESSAGES/amarok.mo
+share/locale/zh_TW/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 3740ede86e4..ec76cbbb63f 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.40 2010/04/16 13:49:29 wiz Exp $
+$NetBSD: distinfo,v 1.41 2010/06/13 23:39:26 wiz Exp $
-SHA1 (amarok-2.3.0.tar.bz2) = 64856a21907d1ba7d198149a8a46276fc4cda7a6
-RMD160 (amarok-2.3.0.tar.bz2) = ff2a7cea8ffbd0e6b08a9b37ab7529e1b1d43a37
-Size (amarok-2.3.0.tar.bz2) = 9391281 bytes
-SHA1 (patch-aa) = 8d4ceda127a7932cce35b2d0308fb3e555bc84d6
-SHA1 (patch-ab) = 91e6bf8a84d63832641b6270c6f5215baa8f139e
-SHA1 (patch-ac) = cb03c67a811280eafcdb74f4211648cb171edc03
+SHA1 (amarok-2.3.1.tar.bz2) = 00a596384df8d155b91b40bb2484ec0a7f51da80
+RMD160 (amarok-2.3.1.tar.bz2) = 70e581bd681361d7837f1ed295191174e92e9f8f
+Size (amarok-2.3.1.tar.bz2) = 9823411 bytes
+SHA1 (patch-ab) = 7ce50979a50448ffc645a281083105aa8b7fd723
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index 48a871c895e..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2010/04/16 13:49:29 wiz Exp $
-
-Upstream patch for Info applet crash.
-
---- src/context/applets/info/InfoApplet.cpp.orig 2010-03-10 23:12:15.000000000 +0000
-+++ src/context/applets/info/InfoApplet.cpp
-@@ -40,18 +40,30 @@ QString InfoApplet::s_defaultHtml = "<ht
-
- InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
- : Context::Applet( parent, args )
-+ , m_webView( 0 )
- , m_initialized( false )
- , m_currentPlaylist( 0 )
-+
- {
- setHasConfigurationInterface( false );
- setBackgroundHints( Plasma::Applet::NoBackground );
-+}
-+
-+InfoApplet::~InfoApplet()
-+{
-+ delete m_webView;
-+}
-+
-+
-+void InfoApplet::init()
-+{
-
- dataEngine( "amarok-info" )->connectSource( "info", this );
-
- m_webView = new AmarokWebView( this );
-
- resize( 500, -1 );
--
-+
- QPalette p = m_webView->palette();
- p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0) );
- p.setColor( QPalette::Window, QColor( 255, 255, 255, 0) );
-@@ -62,11 +74,6 @@ InfoApplet::InfoApplet( QObject* parent,
- constraintsEvent();
- }
-
--InfoApplet::~InfoApplet()
--{
-- delete m_webView;
--}
--
- void InfoApplet::constraintsEvent( Plasma::Constraints constraints )
- {
- Q_UNUSED( constraints )
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
index 6fff12da192..78b5feefb8b 100644
--- a/audio/amarok/patches/patch-ab
+++ b/audio/amarok/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2010/03/16 19:28:50 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2010/06/13 23:39:26 wiz Exp $
---- src/collection/sqlcollection/mysqlecollection/CMakeLists.txt.orig 2010-03-10 23:12:15.000000000 +0000
-+++ src/collection/sqlcollection/mysqlecollection/CMakeLists.txt
+--- src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt.orig 2010-03-10 23:12:15.000000000 +0000
++++ src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt
@@ -49,6 +49,7 @@ if(APPLE)
SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
endif(APPLE)
diff --git a/audio/amarok/patches/patch-ac b/audio/amarok/patches/patch-ac
deleted file mode 100644
index d26c8ee966d..00000000000
--- a/audio/amarok/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2010/04/16 13:49:29 wiz Exp $
-
-Upstream patch for Info applet crash.
-
---- src/context/applets/info/InfoApplet.h.orig 2010-03-10 23:12:15.000000000 +0000
-+++ src/context/applets/info/InfoApplet.h
-@@ -48,6 +48,8 @@ public:
- InfoApplet( QObject* parent, const QVariantList& args );
- virtual ~InfoApplet();
-
-+ void init();
-+
- void paintInterface( QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect &contentsRect );
- void constraintsEvent( Plasma::Constraints constraints = Plasma::AllConstraints );
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 01:44:32 +0000