Fixed a compile failure if nspr is installed. Fixes bug 194548. Thanks to Arfrever Frehtes Taifersar Arahesis for providing a patch!

(Portage version: 2.1.3.11)

3 files changed, 57 insertions, 8 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 46e096487038..38d80672f1b7 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.104 2007/10/02 17:27:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.105 2007/10/03 22:14:47 philantrop Exp $
+
+  03 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmplayer-0.10.0-prtypes.patch, kmplayer-0.10.0.ebuild:
+  Fixed a compile failure if nspr is installed. Fixes bug 194548. Thanks to
+  Arfrever Frehtes Taifersar Arahesis for providing a patch!
 
 *kmplayer-0.10.0 (02 Oct 2007)
 
diff --git a/media-video/kmplayer/files/kmplayer-0.10.0-prtypes.patch b/media-video/kmplayer/files/kmplayer-0.10.0-prtypes.patch
new file mode 100644
index 000000000000..1b70dc3d9238
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.10.0-prtypes.patch
@@ -0,0 +1,33 @@
+--- src/moz-sdk/jni_md.h
++++ src/moz-sdk/jni_md.h
+@@ -57,7 +57,7 @@
+ #ifndef JNI_MD_H
+ #define JNI_MD_H
+ 
+-#include "prtypes.h" /* needed for _declspec */
++#include <nspr/prtypes.h> /* needed for _declspec */
+ 
+ /*******************************************************************************
+  * WHAT'S UP WITH THIS FILE?
+--- src/moz-sdk/jri_md.h
++++ src/moz-sdk/jri_md.h
+@@ -43,7 +43,7 @@
+ #define JRI_MD_H
+ 
+ #include <assert.h>
+-#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs */
++#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- src/moz-sdk/npapi.h
++++ src/moz-sdk/npapi.h
+@@ -48,7 +48,7 @@
+ #pragma pack(1)
+ #endif
+ 
+-#include "prtypes.h"
++#include <nspr/prtypes.h>
+ /* Copied from xp_core.h */
+ /* removed #ifdef for hpux defined in /usr/include/model.h */
+ #ifndef XP_MAC
diff --git a/media-video/kmplayer/kmplayer-0.10.0.ebuild b/media-video/kmplayer/kmplayer-0.10.0.ebuild
index 855f1090e507..68897189e9b0 100644
--- a/media-video/kmplayer/kmplayer-0.10.0.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.1 2007/10/02 17:27:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.2 2007/10/03 22:14:47 philantrop Exp $
 
 inherit kde eutils
 
@@ -14,13 +14,17 @@ SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="mplayer xine cairo gstreamer"
+IUSE="mplayer xine cairo gstreamer npp"
 
 DEPEND="x11-libs/libXv
 		>=dev-libs/expat-2.0.1
 		xine? ( >=media-libs/xine-lib-1.1.1 )
 		cairo? ( x11-libs/cairo )
-		gstreamer? ( >=media-libs/gstreamer-0.10.11 )"
+		gstreamer? ( >=media-libs/gstreamer-0.10.11
+					npp? ( >=sys-apps/dbus-1.0.2-r2
+							>=dev-libs/dbus-glib-0.73
+							>=dev-libs/dbus-qt3-old-0.70 ) )
+		npp? ( >=dev-libs/nspr-4.6.7 )"
 RDEPEND="${DEPEND}
 		mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )"
 
@@ -34,6 +38,8 @@ done
 
 need-kde 3.5
 
+PATCHES="${FILESDIR}/${P}-prtypes.patch"
+
 pkg_setup() {
 	if ! use mplayer && ! use xine && ! use cairo && ! use gstreamer ; then
 		echo
@@ -71,12 +77,17 @@ src_unpack() {
 }
 
 src_compile(){
-	local myconf="$(use_with gstreamer)
+	local myconf="--enable-expat
+				$(use_with gstreamer)
 				$(use_with xine)
 				$(use_with cairo)
-				--disable-koffice-plugin
-				--disable-npplayer
-				--enable-expat"
+				--disable-koffice-plugin"
+
+	if use npp ; then
+		myconf="${myconf} --enable-nspr --enable-npplayer"
+	else
+		myconf="${myconf} --disable-nspr --disable-npplayer"
+	fi
 	kde_src_compile
 }