Add patch for KDE bug #134341. Thanks Piotr Jaroszynski (Peper) for reporting.

(Portage version: 2.1.2_rc2-r1)

4 files changed, 55 insertions, 1 deletions

diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index adf1f57df38e..c9bc9e3c4bdf 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.62 2006/11/19 14:16:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.63 2006/11/22 18:56:25 flameeyes Exp $
+
+*nsplugins-3.5.5-r1 (22 Nov 2006)
+
+  22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/nsplugins-3.5.5-npapi-64bit.patch, +nsplugins-3.5.5-r1.ebuild:
+  Add patch for KDE bug #134341. Thanks Piotr Jaroszynski (Peper) for reporting.
 
   19 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   -nsplugins-3.5.3.ebuild, -nsplugins-3.5.3-r1.ebuild:
diff --git a/kde-base/nsplugins/files/digest-nsplugins-3.5.5-r1 b/kde-base/nsplugins/files/digest-nsplugins-3.5.5-r1
new file mode 100644
index 000000000000..f51965cf1cbe
--- /dev/null
+++ b/kde-base/nsplugins/files/digest-nsplugins-3.5.5-r1
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
+RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
+SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
diff --git a/kde-base/nsplugins/files/nsplugins-3.5.5-npapi-64bit.patch b/kde-base/nsplugins/files/nsplugins-3.5.5-npapi-64bit.patch
new file mode 100644
index 000000000000..090219caa0b4
--- /dev/null
+++ b/kde-base/nsplugins/files/nsplugins-3.5.5-npapi-64bit.patch
@@ -0,0 +1,20 @@
+--- kdebase-3.4.2/nsplugins/sdk/npapi.h.npapi-64bit-fixes	2005-05-23 14:14:25.000000000 +0200
++++ kdebase-3.4.2/nsplugins/sdk/npapi.h	2006-11-13 10:49:45.000000000 +0100
+@@ -58,7 +58,7 @@
+ typedef unsigned short uint16;
+ #endif
+ #ifndef _UINT32
+-#if defined(__alpha)
++#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
+ typedef unsigned int uint32;
+ #else /* __alpha */
+ typedef unsigned long uint32;
+@@ -68,7 +68,7 @@ typedef unsigned long uint32;
+ typedef short int16;
+ #endif
+ #ifndef _INT32
+-#if defined(__alpha) || defined(_AIX)
++#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
+ typedef int int32;
+ #else /* __alpha || _AIX */
+ typedef long int32;
diff --git a/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild b/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..1619dc09d2dc
--- /dev/null
+++ b/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild,v 1.1 2006/11/22 18:56:25 flameeyes Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="Netscape plugins support for Konqueror."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+PATCHES="${FILESDIR}/${P}-npapi-64bit.patch"
+
+src_unpack() {
+	kde-meta_src_unpack
+	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
+}
\ No newline at end of file