From 9333ba6d018b93ae9ff7472f2a0808de05b457fe Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 18 Mar 2007 11:11:26 +0000 Subject: [PATCH] update to 1.4.5 --- audio/amarok/Makefile | 9 +++++---- audio/amarok/distinfo | 9 +++++---- .../patch-amarok_src_contextbrowser_cpp | 8 ++++++++ .../patch-amarok_src_playlistwindow_cpp | 8 ++++++++ audio/amarok/patches/patch-configure_in | 8 ++++---- audio/amarok/pkg/PLIST | 18 +++++++++--------- 6 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 audio/amarok/patches/patch-amarok_src_contextbrowser_cpp create mode 100644 audio/amarok/patches/patch-amarok_src_playlistwindow_cpp diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index f890b592f86..06f32c489d5 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2007/02/14 08:18:25 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2007/03/18 11:11:26 espie Exp $ CATEGORIES= audio x11 x11/kde COMMENT= 'music player for kde' HOMEPAGE= http://amarok.kde.org/ -V= 1.4.4 +V= 1.4.5 MASTER_SITES= ${MASTER_SITE_KDE:=stable/amarok/$V/src/} DISTNAME= amarok-$V PKGNAME= ${DISTNAME} @@ -17,12 +17,13 @@ LIB_DEPENDS+= lib/qt3/qt-mt.>=3.33::x11/qt3,mt \ tag.>=5.0:taglib->=1.4:audio/taglib \ xine::multimedia/xine-lib \ sqlite3::databases/sqlite3 \ - gpod::audio/libgpod + gpod::audio/libgpod \ + njb::audio/libnjb WANTLIB= stdc++ Xext Xrender z X11 util m SM c \ pthread ICE idn freetype \ iconv pcre pcreposix \ - jpeg png art_lgpl_2 intl \ + jpeg png art_lgpl_2 intl usb \ gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0 LIB_DEPENDS+= konqsidebarplugin::x11/kde/base3 diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index 9be41df982b..07aeeb24882 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,4 +1,5 @@ -MD5 (amarok-1.4.4.tar.bz2) = 56a9aec42088c338b81252f8e0651781 -RMD160 (amarok-1.4.4.tar.bz2) = 61cd2748ce0111f4ba388a71e9504abb7362b0d7 -SHA1 (amarok-1.4.4.tar.bz2) = 932ab971407172a86746e473a1d1cf6871aea93c -SIZE (amarok-1.4.4.tar.bz2) = 17635707 +MD5 (amarok-1.4.5.tar.bz2) = 1dac1cb5ac9c9cdabdab5f69b39e92c8 +RMD160 (amarok-1.4.5.tar.bz2) = c2bbfe06f3e613dfc7d3926d086024073390c712 +SHA1 (amarok-1.4.5.tar.bz2) = 882dec8d30c10f609a1f5e21d2e91342e78304c5 +SHA256 (amarok-1.4.5.tar.bz2) = 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8 +SIZE (amarok-1.4.5.tar.bz2) = 18034110 diff --git a/audio/amarok/patches/patch-amarok_src_contextbrowser_cpp b/audio/amarok/patches/patch-amarok_src_contextbrowser_cpp new file mode 100644 index 00000000000..935b0ec03d1 --- /dev/null +++ b/audio/amarok/patches/patch-amarok_src_contextbrowser_cpp @@ -0,0 +1,8 @@ +$OpenBSD: patch-amarok_src_contextbrowser_cpp,v 1.1 2007/03/18 11:11:26 espie Exp $ +--- amarok/src/contextbrowser.cpp.orig Sun Mar 18 11:46:26 2007 ++++ amarok/src/contextbrowser.cpp Sun Mar 18 11:46:34 2007 +@@ -4426,3 +4426,4 @@ ContextBrowser::expandURL( const KURL &url ) + + + #include "contextbrowser.moc" ++#undef e diff --git a/audio/amarok/patches/patch-amarok_src_playlistwindow_cpp b/audio/amarok/patches/patch-amarok_src_playlistwindow_cpp new file mode 100644 index 00000000000..ffb114c5e4a --- /dev/null +++ b/audio/amarok/patches/patch-amarok_src_playlistwindow_cpp @@ -0,0 +1,8 @@ +$OpenBSD: patch-amarok_src_playlistwindow_cpp,v 1.1 2007/03/18 11:11:26 espie Exp $ +--- amarok/src/playlistwindow.cpp.orig Sun Mar 18 11:46:26 2007 ++++ amarok/src/playlistwindow.cpp Sun Mar 18 11:46:39 2007 +@@ -1273,3 +1273,4 @@ void DynamicTitle::paintEvent(QPaintEvent* /*e*/) + } + + #include "playlistwindow.moc" ++#undef e diff --git a/audio/amarok/patches/patch-configure_in b/audio/amarok/patches/patch-configure_in index 23a1721cf80..66cb8cdbbdd 100644 --- a/audio/amarok/patches/patch-configure_in +++ b/audio/amarok/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.2 2006/12/18 16:05:23 espie Exp $ ---- configure.in.orig Thu Oct 26 22:40:21 2006 -+++ configure.in Mon Nov 6 12:13:13 2006 -@@ -850,7 +850,7 @@ AC_MSG_RESULT($amarok_glibcsched_works) +$OpenBSD: patch-configure_in,v 1.3 2007/03/18 11:11:26 espie Exp $ +--- configure.in.orig Thu Feb 1 19:14:18 2007 ++++ configure.in Sat Mar 17 23:29:04 2007 +@@ -844,7 +844,7 @@ AC_MSG_RESULT($amarok_glibcsched_works) ############################################################################### KDE_CHECK_HEADER(konqsidebarplugin.h, have_konqsidebar=yes, have_konqsidebar=no) diff --git a/audio/amarok/pkg/PLIST b/audio/amarok/pkg/PLIST index 8564e04d94b..4f2c805997f 100644 --- a/audio/amarok/pkg/PLIST +++ b/audio/amarok/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2006/12/18 16:05:23 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2007/03/18 11:11:26 espie Exp $ bin/amarok bin/amarok_daapserver.rb bin/amarok_proxy.rb @@ -16,6 +16,8 @@ ${KDE}/libamarok_massstorage-device.la ${KDE}/libamarok_massstorage-device.so ${KDE}/libamarok_nfs-device.la ${KDE}/libamarok_nfs-device.so +${KDE}/libamarok_njb-mediadevice.la +${KDE}/libamarok_njb-mediadevice.so ${KDE}/libamarok_smb-device.la ${KDE}/libamarok_smb-device.so ${KDE}/libamarok_void-engine_plugin.la @@ -40,7 +42,6 @@ share/apps/amarok/data/equalizer_presets.xml share/apps/amarok/data/firstrun.m3u share/apps/amarok/data/grid.png share/apps/amarok/data/magnatune_logo.png -share/apps/amarok/data/magnatune_start_page.html share/apps/amarok/data/wirl1.png share/apps/amarok/data/wirl2.png share/apps/amarok/icons/ @@ -440,7 +441,6 @@ share/apps/amarok/images/currenttrack_repeat.png share/apps/amarok/images/currenttrack_repeat_small.png share/apps/amarok/images/currenttrack_stop.png share/apps/amarok/images/currenttrack_stop_small.png -share/apps/amarok/images/description.png share/apps/amarok/images/eq_active2.png share/apps/amarok/images/eq_inactive2.png share/apps/amarok/images/lastfm.png @@ -479,6 +479,7 @@ 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/mime_types.yml share/apps/amarok/ruby_lib/mongrel/stats.rb share/apps/amarok/ruby_lib/mongrel/tcphack.rb share/apps/amarok/ruby_lib/rbconfig/ @@ -1024,14 +1025,10 @@ share/icons/hicolor/22x22/apps/amarok.png share/icons/hicolor/32x32/apps/amarok.png share/icons/hicolor/48x48/apps/amarok.png share/icons/hicolor/64x64/apps/amarok.png -share/locale/af/ -share/locale/af/LC_MESSAGES/ 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/ -share/locale/br/LC_MESSAGES/ share/locale/br/LC_MESSAGES/amarok.mo share/locale/ca/LC_MESSAGES/amarok.mo share/locale/cs/LC_MESSAGES/amarok.mo @@ -1042,6 +1039,7 @@ share/locale/el/LC_MESSAGES/amarok.mo share/locale/en_GB/LC_MESSAGES/amarok.mo share/locale/es/LC_MESSAGES/amarok.mo share/locale/et/LC_MESSAGES/amarok.mo +share/locale/fa/LC_MESSAGES/amarok.mo share/locale/fi/LC_MESSAGES/amarok.mo share/locale/fr/LC_MESSAGES/amarok.mo share/locale/ga/LC_MESSAGES/amarok.mo @@ -1069,6 +1067,9 @@ share/locale/pt_BR/LC_MESSAGES/amarok.mo share/locale/ro/LC_MESSAGES/amarok.mo share/locale/ru/LC_MESSAGES/amarok.mo share/locale/rw/LC_MESSAGES/amarok.mo +share/locale/se/ +share/locale/se/LC_MESSAGES/ +share/locale/se/LC_MESSAGES/amarok.mo share/locale/sk/LC_MESSAGES/amarok.mo share/locale/sl/LC_MESSAGES/amarok.mo share/locale/sq/LC_MESSAGES/amarok.mo @@ -1082,8 +1083,6 @@ share/locale/tg/LC_MESSAGES/amarok.mo share/locale/th/LC_MESSAGES/amarok.mo share/locale/tr/LC_MESSAGES/amarok.mo share/locale/uk/LC_MESSAGES/amarok.mo -share/locale/uz/ -share/locale/uz/LC_MESSAGES/ share/locale/uz/LC_MESSAGES/amarok.mo share/locale/zh_CN/LC_MESSAGES/amarok.mo share/locale/zh_TW/LC_MESSAGES/amarok.mo @@ -1092,6 +1091,7 @@ share/services/amarok_generic-mediadevice.desktop share/services/amarok_ipod-mediadevice.desktop share/services/amarok_massstorage-device.desktop share/services/amarok_nfs-device.desktop +share/services/amarok_njb-mediadevice.desktop share/services/amarok_smb-device.desktop share/services/amarok_void-engine_plugin.desktop share/services/amarok_xine-engine.desktop