4 files changed, 27 insertions, 91 deletions

diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index 66be3fcd902f..ebe96691b5ea 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kplayer
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4.0
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/kplayer-kde4/distinfo b/multimedia/kplayer-kde4/distinfo
index 57289689720c..d4c88724acbf 100644
--- a/multimedia/kplayer-kde4/distinfo
+++ b/multimedia/kplayer-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (kplayer-0.3.1.tar.bz2) = 3fc9bb78b60f9d21e725feb71a9714b0
-SIZE (kplayer-0.3.1.tar.bz2) = 548845
+MD5 (kplayer-0.4.0.tar.bz2) = d7e24c314b0b533b0111b2c316abc22b
+SIZE (kplayer-0.4.0.tar.bz2) = 621078
diff --git a/multimedia/kplayer-kde4/files/patch-kplayer.cpp b/multimedia/kplayer-kde4/files/patch-kplayer.cpp
deleted file mode 100644
index b5e50da0b4da..000000000000
--- a/multimedia/kplayer-kde4/files/patch-kplayer.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
---- kplayer/kplayer.cpp~	Sat Jul 26 15:49:07 2003
-+++ kplayer/kplayer.cpp	Sun Aug  3 10:36:45 2003
-@@ -395,7 +395,7 @@
-   setSaturation (value);
-   if ( kPlayerProcess() -> length() > 0 )
-     sliderAction ("player_progress") -> slider() ->
--      setPageStep (int (roundf (kPlayerProcess() -> length() * settings -> progressMarks())));
-+      setPageStep (int (rintf (kPlayerProcess() -> length() * settings -> progressMarks())));
-   QApplication::postEvent (this, new QEvent (QEvent::LayoutHint));
- //layout() -> activate();
-   recentFilesAction() -> setMaxItems (settings -> recentFileListSize());
-@@ -1192,7 +1192,7 @@
-   KPlayerSettings* settings = kPlayerSettings();
-   int seek = settings -> progressNormalSeekUnits() ? settings -> progressNormalSeek() :
-     kPlayerProcess() -> length() == 0 ? 10 :
--    int (roundf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
-+    int (rintf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
-   if ( seek == 0 )
-     seek = 1;
-   kPlayerProcess() -> relativeSeek (seek);
-@@ -1203,7 +1203,7 @@
-   KPlayerSettings* settings = kPlayerSettings();
-   int seek = settings -> progressFastSeekUnits() ? settings -> progressFastSeek() :
-     kPlayerProcess() -> length() == 0 ? 60 :
--    int (roundf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
-+    int (rintf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
-   if ( seek == 0 )
-     seek = 2;
-   kPlayerProcess() -> relativeSeek (seek);
-@@ -1214,7 +1214,7 @@
-   KPlayerSettings* settings = kPlayerSettings();
-   int seek = settings -> progressNormalSeekUnits() ? settings -> progressNormalSeek() :
-     kPlayerProcess() -> length() == 0 ? 10 :
--    int (roundf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
-+    int (rintf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
-   if ( seek == 0 )
-     seek = 1;
-   kPlayerProcess() -> relativeSeek (- seek);
-@@ -1225,7 +1225,7 @@
-   KPlayerSettings* settings = kPlayerSettings();
-   int seek = settings -> progressFastSeekUnits() ? settings -> progressFastSeek() :
-     kPlayerProcess() -> length() == 0 ? 60 :
--    int (roundf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
-+    int (rintf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
-   if ( seek == 0 )
-     seek = 2;
-   kPlayerProcess() -> relativeSeek (- seek);
-@@ -1586,7 +1586,7 @@
-     return;
-   kdDebug() << "Seek to " << progress << ": " << kPlayerProcess() -> position() << " => " << ((progress + 50) / 100) << " / " << kPlayerProcess() -> length() << "\n";
-   kPlayerProcess() -> absoluteSeek ((progress + 50) / 100);
--/*int seek = int (roundf (float (progress) / 100 - kPlayerProcess() -> position()));
-+/*int seek = int (rintf (float (progress) / 100 - kPlayerProcess() -> position()));
-   if ( seek == 0 )
-     return;
-   kPlayerProcess() -> relativeSeek (seek);*/
-@@ -1714,7 +1714,7 @@
-   int maxValue = slider -> maxValue();
-   if ( maxValue )
-   {
--    int value = int (roundf (progress * 100));
-+    int value = int (rintf (progress * 100));
-     if ( value > maxValue )
-       slider -> setMaxValue (value);
-     slider -> setValue (value);
-@@ -1757,8 +1757,8 @@
-   KPlayerSettings* settings = kPlayerSettings();
-   kdDebug() << "Info available. Detected length: " << kPlayerProcess() -> length() << "\n";
-   KPlayerSlider* slider = sliderAction ("player_progress") -> slider();
--  slider -> setMaxValue (int (roundf (kPlayerProcess() -> length() * 100)));
--  slider -> setPageStep (int (roundf (kPlayerProcess() -> length() * settings -> progressMarks())));
-+  slider -> setMaxValue (int (rintf (kPlayerProcess() -> length() * 100)));
-+  slider -> setPageStep (int (rintf (kPlayerProcess() -> length() * settings -> progressMarks())));
-   enablePlayerActions();
- }
- 
diff --git a/multimedia/kplayer-kde4/pkg-plist b/multimedia/kplayer-kde4/pkg-plist
index faa20ab4495f..63b4f66e7863 100644
--- a/multimedia/kplayer-kde4/pkg-plist
+++ b/multimedia/kplayer-kde4/pkg-plist
@@ -1,19 +1,22 @@
 bin/kplayer
+lib/kde3/libkplayerpart.la
+lib/kde3/libkplayerpart.so
 share/applnk/Multimedia/kplayer.desktop
 share/apps/kplayer/icons/hicolor/16x16/actions/brightness.png
 share/apps/kplayer/icons/hicolor/16x16/actions/contrast.png
 share/apps/kplayer/icons/hicolor/16x16/actions/fileopen.png
 share/apps/kplayer/icons/hicolor/16x16/actions/fileopenurl.png
 share/apps/kplayer/icons/hicolor/16x16/actions/hue.png
+share/apps/kplayer/icons/hicolor/16x16/actions/lock.png
+share/apps/kplayer/icons/hicolor/16x16/actions/loop.png
 share/apps/kplayer/icons/hicolor/16x16/actions/mute.png
-share/apps/kplayer/icons/hicolor/16x16/actions/next.png
 share/apps/kplayer/icons/hicolor/16x16/actions/player_fwd.png
 share/apps/kplayer/icons/hicolor/16x16/actions/player_pause.png
 share/apps/kplayer/icons/hicolor/16x16/actions/player_play.png
 share/apps/kplayer/icons/hicolor/16x16/actions/player_rew.png
 share/apps/kplayer/icons/hicolor/16x16/actions/player_stop.png
-share/apps/kplayer/icons/hicolor/16x16/actions/previous.png
 share/apps/kplayer/icons/hicolor/16x16/actions/saturation.png
+share/apps/kplayer/icons/hicolor/16x16/actions/shuffle.png
 share/apps/kplayer/icons/hicolor/16x16/actions/viewmag+.png
 share/apps/kplayer/icons/hicolor/16x16/actions/viewmag-.png
 share/apps/kplayer/icons/hicolor/16x16/actions/viewmagfit.png
@@ -24,15 +27,16 @@ share/apps/kplayer/icons/hicolor/22x22/actions/contrast.png
 share/apps/kplayer/icons/hicolor/22x22/actions/fileopen.png
 share/apps/kplayer/icons/hicolor/22x22/actions/fileopenurl.png
 share/apps/kplayer/icons/hicolor/22x22/actions/hue.png
+share/apps/kplayer/icons/hicolor/22x22/actions/lock.png
+share/apps/kplayer/icons/hicolor/22x22/actions/loop.png
 share/apps/kplayer/icons/hicolor/22x22/actions/mute.png
-share/apps/kplayer/icons/hicolor/22x22/actions/next.png
 share/apps/kplayer/icons/hicolor/22x22/actions/player_fwd.png
 share/apps/kplayer/icons/hicolor/22x22/actions/player_pause.png
 share/apps/kplayer/icons/hicolor/22x22/actions/player_play.png
 share/apps/kplayer/icons/hicolor/22x22/actions/player_rew.png
 share/apps/kplayer/icons/hicolor/22x22/actions/player_stop.png
-share/apps/kplayer/icons/hicolor/22x22/actions/previous.png
 share/apps/kplayer/icons/hicolor/22x22/actions/saturation.png
+share/apps/kplayer/icons/hicolor/22x22/actions/shuffle.png
 share/apps/kplayer/icons/hicolor/22x22/actions/viewmag+.png
 share/apps/kplayer/icons/hicolor/22x22/actions/viewmag-.png
 share/apps/kplayer/icons/hicolor/22x22/actions/viewmagfit.png
@@ -43,30 +47,38 @@ share/apps/kplayer/icons/hicolor/32x32/actions/contrast.png
 share/apps/kplayer/icons/hicolor/32x32/actions/fileopen.png
 share/apps/kplayer/icons/hicolor/32x32/actions/fileopenurl.png
 share/apps/kplayer/icons/hicolor/32x32/actions/hue.png
+share/apps/kplayer/icons/hicolor/32x32/actions/lock.png
+share/apps/kplayer/icons/hicolor/32x32/actions/loop.png
 share/apps/kplayer/icons/hicolor/32x32/actions/mute.png
-share/apps/kplayer/icons/hicolor/32x32/actions/next.png
 share/apps/kplayer/icons/hicolor/32x32/actions/player_fwd.png
 share/apps/kplayer/icons/hicolor/32x32/actions/player_pause.png
 share/apps/kplayer/icons/hicolor/32x32/actions/player_play.png
 share/apps/kplayer/icons/hicolor/32x32/actions/player_rew.png
 share/apps/kplayer/icons/hicolor/32x32/actions/player_stop.png
-share/apps/kplayer/icons/hicolor/32x32/actions/previous.png
 share/apps/kplayer/icons/hicolor/32x32/actions/saturation.png
+share/apps/kplayer/icons/hicolor/32x32/actions/shuffle.png
 share/apps/kplayer/icons/hicolor/32x32/actions/viewmag+.png
 share/apps/kplayer/icons/hicolor/32x32/actions/viewmag-.png
 share/apps/kplayer/icons/hicolor/32x32/actions/viewmagfit.png
 share/apps/kplayer/icons/hicolor/32x32/actions/volume.png
 share/apps/kplayer/icons/hicolor/32x32/actions/window_fullscreen.png
 share/apps/kplayer/input.conf
+share/apps/kplayer/kplayerpartui.rc
 share/apps/kplayer/kplayerui.rc
 share/doc/HTML/en/kplayer/index.cache.bz2
 share/doc/HTML/en/kplayer/index.docbook
-share/icons/hicolor/16x16/apps/kplayer.png
-share/icons/hicolor/22x22/apps/kplayer.png
-share/icons/hicolor/32x32/apps/kplayer.png
-share/icons/locolor/16x16/apps/kplayer.png
-share/icons/locolor/32x32/apps/kplayer.png
-share/doc/HTML/en/kplayer/common
+share/locale/ca/LC_MESSAGES/kplayer.mo
+share/locale/da/LC_MESSAGES/kplayer.mo
+share/locale/de/LC_MESSAGES/kplayer.mo
+share/locale/es/LC_MESSAGES/kplayer.mo
+share/locale/fr/LC_MESSAGES/kplayer.mo
+share/locale/it/LC_MESSAGES/kplayer.mo
+share/locale/ru/LC_MESSAGES/kplayer.mo
+share/services/kplayerpart.desktop
+@exec ln -sf ../common %D/share/doc/HTML/en/kplayer/common
+@unexec rm -f %D/share/doc/HTML/en/kplayer/common
+@unexec rmdir %D/lib/kde3 >/dev/null 2>&1 || true
+@unexec rmdir %D/share/services >/dev/null 2>&1 || true
 @dirrm share/doc/HTML/en/kplayer
 @dirrm share/apps/kplayer/icons/hicolor/32x32/actions
 @dirrm share/apps/kplayer/icons/hicolor/32x32