new version with patches. see #9542 for details.

5 files changed, 168 insertions, 2 deletions

diff --git a/media-sound/kmms/ChangeLog b/media-sound/kmms/ChangeLog
index fef3451d6668..e7a2be4e542b 100644
--- a/media-sound/kmms/ChangeLog
+++ b/media-sound/kmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/kmms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kmms/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmms/ChangeLog,v 1.2 2002/12/06 15:31:46 danarmak Exp $
+
+*kmms-0.8_beta1 (06 Dec 2002)
+
+  06 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Add the new ebuild and patches from bug #9542. Credit goes to John Steele
+  Scott for bothe the patches and ebuild.
 
 *kmms-0.7_beta6 (1 Feb 2002)
 
diff --git a/media-sound/kmms/files/digest-kmms-0.8_beta1 b/media-sound/kmms/files/digest-kmms-0.8_beta1
new file mode 100644
index 000000000000..f45dd488eefc
--- /dev/null
+++ b/media-sound/kmms/files/digest-kmms-0.8_beta1
@@ -0,0 +1 @@
+MD5 e0c0057d8d8e5b1df85dbb97432455bd kmms-0.8beta1.tar.gz 513811
diff --git a/media-sound/kmms/files/kmms-0.8_beta1-fix-memory-leak.diff b/media-sound/kmms/files/kmms-0.8_beta1-fix-memory-leak.diff
new file mode 100644
index 000000000000..b3bb4d807fce
--- /dev/null
+++ b/media-sound/kmms/files/kmms-0.8_beta1-fix-memory-leak.diff
@@ -0,0 +1,14 @@
+diff -ru kmms-0.8beta1.orig/kmms/kmmsdock.cpp kmms-0.8beta1-fix-memory-leak/kmms/kmmsdock.cpp
+--- kmms/kmmsdock.cpp	2002-08-19 10:54:37.000000000 +0930
++++ kmms/kmmsdock.cpp	2002-11-29 18:21:26.000000000 +1030
+@@ -313,7 +313,9 @@
+   volume          = xmms_remote_get_main_volume(0); if (volume > 100 || volume < 0) volume = 0;
+   currentTime     = xmms_remote_get_output_time(0);
+   trackTime       = xmms_remote_get_playlist_time(0, playlistpos);
+-  temptitle       = xmms_remote_get_playlist_title(0, playlistpos);
++  char * tempstring = xmms_remote_get_playlist_title(0, playlistpos);
++  temptitle       = tempstring;
++  free(tempstring);
+ 
+ 	// speedup scrolling when title has changed
+   if( qstrcmp(temptitle, lasttitle) != 0 && welcomeDisplayed ) {
diff --git a/media-sound/kmms/files/kmms-0.8_beta1-gentoo.diff b/media-sound/kmms/files/kmms-0.8_beta1-gentoo.diff
new file mode 100644
index 000000000000..8df6d18e746c
--- /dev/null
+++ b/media-sound/kmms/files/kmms-0.8_beta1-gentoo.diff
@@ -0,0 +1,125 @@
+diff -ru kmms-0.8beta1.orig/kmms/kmmsdock.cpp kmms-0.8beta1/kmms/kmmsdock.cpp
+--- kmms/kmmsdock.cpp	2002-08-19 10:54:37.000000000 +0930
++++ kmms/kmmsdock.cpp	2002-11-04 16:32:24.000000000 +1030
+@@ -188,62 +188,58 @@
+ {
+   //load and paint Skin
+   QPixmap mainPixmap;
+-//  QPixmap cbuttonsPixmap;
+-  bool skinloadfailed = FALSE;
++
++  // first check if the user has a skin in their ~/.kmms/Skin directory
++  // to keep compatibility with official KMMS
++  bool userskinloadfailed = FALSE;
+   // main.bmp
+   if ( !mainPixmap.load( homeDir + "/.kmms/Skin/main.bmp") )
+-   	skinloadfailed = TRUE;
++    userskinloadfailed = TRUE;
+   // cbuttons.bmp
+   if ( !cbuttonsPixmap.load( homeDir + "/.kmms/Skin/cbuttons.bmp") )
+-    skinloadfailed = TRUE;
+-	// failed?
+-  if(skinloadfailed)
+-  {
+-		// draw error message to skin buffer
+-    pskin->drawText( 2, 12, "SKIN LOAD ERROR!" );
+-    pskin->drawText( 8, 28, "( ~/.kmms/Skin )" );
+-    pskin->drawText( 8, 40, "view README file" );
+-  }
+-	// success?
+-  else
+-  {
+-		// draw skin to buffer
+-		/* //old version
+-    pskin->drawPixmap( -135, 0, mainPixmap );
+-    pskin->drawPixmap( 0, 36, cbuttonsPixmap );
+-		*/
+-		// new version
+-		
+-		// Top:
+-    pskin->drawPixmap( 0, 0, mainPixmap, 120, 15, KMMSDOCK_WIDTH, 5 );
+-		pskin->drawPixmap( 0, 5, mainPixmap, 120, 15, KMMSDOCK_WIDTH, 8 );
+-
+-		// Top of Text field
+-		pskin->drawPixmap( 0, 13, mainPixmap, 120, 23, KMMSDOCK_WIDTH, 6 );
+-
+-		// Text field extension
+-		pskin->drawPixmap( 0, 19, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 20, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 21, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 22, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
+-
+-		pskin->drawPixmap( 0, 23, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
+-			//pskin->drawPixmap( 0, 23, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 24, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 25, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 26, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
+-
+-		pskin->drawPixmap( 0, 27, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 28, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 29, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
+-			pskin->drawPixmap( 0, 30, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
++    userskinloadfailed = TRUE;
++  
++  if(userskinloadfailed){
++    // no user defined skin in ~/.kmms/Skin, use default
++    // define a kmms_skin resource which can be in a KDE-relative directory
++    KGlobal::dirs()->addResourceType("kmms_skin", "share/apps/kmms/Skin");
++
++    // main.bmp
++    mainPixmap.load(KGlobal::dirs()->findResource("kmms_skin", "main.bmp"));
++
++    // cbuttons.bmp
++    cbuttonsPixmap.load(KGlobal::dirs()->findResource("kmms_skin", "cbuttons.bmp"));
++  }
++
++  // draw skin to buffer
++  // Top:
++  pskin->drawPixmap( 0, 0, mainPixmap, 120, 15, KMMSDOCK_WIDTH, 5 );
++  pskin->drawPixmap( 0, 5, mainPixmap, 120, 15, KMMSDOCK_WIDTH, 8 );
++
++  // Top of Text field
++  pskin->drawPixmap( 0, 13, mainPixmap, 120, 23, KMMSDOCK_WIDTH, 6 );
++
++  // Text field extension
++  pskin->drawPixmap( 0, 19, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 20, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 21, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 22, mainPixmap, 120, 29, KMMSDOCK_WIDTH, 1 );
++
++  pskin->drawPixmap( 0, 23, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 24, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 25, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 26, mainPixmap, 120, 30, KMMSDOCK_WIDTH, 1 );
++
++  pskin->drawPixmap( 0, 27, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 28, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 29, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
++  pskin->drawPixmap( 0, 30, mainPixmap, 120, 31, KMMSDOCK_WIDTH, 1 );
+ 
+-		// Bottom of Text field
+-		pskin->drawPixmap( 0, 31, mainPixmap, 120, 32 );
++  // Bottom of Text field
++  pskin->drawPixmap( 0, 31, mainPixmap, 120, 32 );
+ 
+-		// Control Buttons
+-    pskin->drawPixmap( 0, 36, cbuttonsPixmap, 0, 0, 114, 18); //painting just the top part of the c buttons
+-  }
++  // Control Buttons
++  pskin->drawPixmap( 0, 36, cbuttonsPixmap, 0, 0, 114, 18); //painting just the top part of the c buttons
+ }
+ 
+ void kmmsdock::scroll()
+diff -ru kmms-0.8beta1.orig/kmms/kmmsdock.h kmms-0.8beta1/kmms/kmmsdock.h
+--- kmms/kmmsdock.h	2002-08-19 10:54:37.000000000 +0930
++++ kmms/kmmsdock.h	2002-10-23 20:26:34.000000000 +0930
+@@ -20,7 +20,8 @@
+ 
+ #include "kmmsprefsImpl.h"
+ 
+-
++#include <kglobal.h>
++#include <kstandarddirs.h>
+ #include <klocale.h>
+ #include <kprocess.h>
+ #include <ksimpleconfig.h>
diff --git a/media-sound/kmms/kmms-0.8_beta1.ebuild b/media-sound/kmms/kmms-0.8_beta1.ebuild
new file mode 100644
index 000000000000..aa7dee0fd957
--- /dev/null
+++ b/media-sound/kmms/kmms-0.8_beta1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+inherit kde-base
+#export KDEBASE="true" # needs to install into kde's share/apps/ heirarchy
+
+need-kde 3
+
+S="${WORKDIR}/kmms-0.8beta1"
+SRC_URI="http://luizpaulo.virtualave.net/kmms/kmms-0.8beta1.tar.gz"
+HOMEPAGE="http://www.base2.de/"
+DESCRIPTION="A KDE-Taskbar DockApplet control and title display for XMMS." 
+
+newdepend "media-sound/xmms"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~x86"
+
+PATCHES="${FILESDIR}/${P}-gentoo.diff ${FILESDIR}/${P}-fix-memory-leak.diff"