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

Package-Manager: portage-2.1.2_rc2-r1

5 files changed, 73 insertions, 8 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/Manifest b/kde-base/nsplugins/Manifest
index 991321baa63e..f46df0cf96b4 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-base/nsplugins/Manifest
@@ -5,6 +5,10 @@ AUX nsplugins-3.5.3-applet-redirects.patch 2317 RMD160 dcced9a334b8ffa745f92e934
 MD5 70a6642163fca943fb5beb6fd73fc5d6 files/nsplugins-3.5.3-applet-redirects.patch 2317
 RMD160 dcced9a334b8ffa745f92e934450d96257dcfde8 files/nsplugins-3.5.3-applet-redirects.patch 2317
 SHA256 7f6b1f2a81877404326b1aac04ffc30d1c74e2b2d1f54c6111c2911f8afc36da files/nsplugins-3.5.3-applet-redirects.patch 2317
+AUX nsplugins-3.5.5-npapi-64bit.patch 718 RMD160 c4420f4625bfde9eb5e647371297192f8831a28f SHA1 dd5c2a8f60810eaeee06fdb94537d33b698cae7f SHA256 932895b1724ad7bc21d0732130169b967f8704696a86cfa2a154f0129b6472f2
+MD5 da09cd773016524764a40b2106a098dc files/nsplugins-3.5.5-npapi-64bit.patch 718
+RMD160 c4420f4625bfde9eb5e647371297192f8831a28f files/nsplugins-3.5.5-npapi-64bit.patch 718
+SHA256 932895b1724ad7bc21d0732130169b967f8704696a86cfa2a154f0129b6472f2 files/nsplugins-3.5.5-npapi-64bit.patch 718
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
@@ -12,14 +16,18 @@ EBUILD nsplugins-3.5.2.ebuild 429 RMD160 11ad2b371ac0014c032fab25bb083aa7a9517cb
 MD5 bfa83c84f070a6628ec66d7ff46909a1 nsplugins-3.5.2.ebuild 429
 RMD160 11ad2b371ac0014c032fab25bb083aa7a9517cb5 nsplugins-3.5.2.ebuild 429
 SHA256 2f46db014353ff60154820f447349d735bf7213f7678269f2553ea13ea13ce25 nsplugins-3.5.2.ebuild 429
+EBUILD nsplugins-3.5.5-r1.ebuild 697 RMD160 437d23a439bd9f527edf7306c9e60ae9318bd797 SHA1 45422555c00f9c26a95e1b7cbcb6c16da68d4fa3 SHA256 66a1aae700627995c610cb7f802807b93898d372cf3cce39c7099babfe2e6011
+MD5 11739e5df67d6931cd8e4ded74f7e9cb nsplugins-3.5.5-r1.ebuild 697
+RMD160 437d23a439bd9f527edf7306c9e60ae9318bd797 nsplugins-3.5.5-r1.ebuild 697
+SHA256 66a1aae700627995c610cb7f802807b93898d372cf3cce39c7099babfe2e6011 nsplugins-3.5.5-r1.ebuild 697
 EBUILD nsplugins-3.5.5.ebuild 641 RMD160 373f93b37c70a049c0e337f5caf397fbc5f2bd01 SHA1 f53d0920d9039659a079260cd317e914e408f700 SHA256 91891ef9f5e109c1218fe3fee1a2e27cbc428825900642b643ddb250a7fb148a
 MD5 e903fc2c1a9b8fdad6aba21029a6e239 nsplugins-3.5.5.ebuild 641
 RMD160 373f93b37c70a049c0e337f5caf397fbc5f2bd01 nsplugins-3.5.5.ebuild 641
 SHA256 91891ef9f5e109c1218fe3fee1a2e27cbc428825900642b643ddb250a7fb148a nsplugins-3.5.5.ebuild 641
-MISC ChangeLog 7767 RMD160 194658a201f30c1e1758f804b93a2a2786874579 SHA1 3488634a86d50a32b1a5526cd67cc073ec4b3896 SHA256 02ce9710210a8d97dff77b84047800fd645290ebd721b90e932b90c7c240910b
-MD5 c60381558330ebe9dc283da1126caafa ChangeLog 7767
-RMD160 194658a201f30c1e1758f804b93a2a2786874579 ChangeLog 7767
-SHA256 02ce9710210a8d97dff77b84047800fd645290ebd721b90e932b90c7c240910b ChangeLog 7767
+MISC ChangeLog 8009 RMD160 e75f8ecf5184e27f06de7b2880477259ae4f5b35 SHA1 2ffff5e75acf61e2a912b45fb47d73214e0399b5 SHA256 584d9e69ff6204a18b316c2cc5a06935176dd0f113a923b7e4a81a1a308302a6
+MD5 877c22db56d5b6e03b70768ba93b72f4 ChangeLog 8009
+RMD160 e75f8ecf5184e27f06de7b2880477259ae4f5b35 ChangeLog 8009
+SHA256 584d9e69ff6204a18b316c2cc5a06935176dd0f113a923b7e4a81a1a308302a6 ChangeLog 8009
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -30,10 +38,13 @@ SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/di
 MD5 4413bb62e0a3313d499ee48fb91adfaf files/digest-nsplugins-3.5.5 521
 RMD160 4631b6a312d8f0a17d62d4a7f98bb92ab09fa8d1 files/digest-nsplugins-3.5.5 521
 SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/digest-nsplugins-3.5.5 521
+MD5 4413bb62e0a3313d499ee48fb91adfaf files/digest-nsplugins-3.5.5-r1 521
+RMD160 4631b6a312d8f0a17d62d4a7f98bb92ab09fa8d1 files/digest-nsplugins-3.5.5-r1 521
+SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/digest-nsplugins-3.5.5-r1 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYGdhAiZjviIA2XgRAp5gAKCcQjSyWoRYbfL+hcG3DfjhcaP4+gCgtYGD
-9oj1eVuTCMcOj9fE9IPMcM4=
-=9KxP
+iD8DBQFFZJ1kAiZjviIA2XgRArB/AJ0XrG/VD8gpuPKnWguYu7fofbnERQCfUiOw
+ev1Q5Bv/FkkaaQzeH+daMYI=
+=omv6
 -----END PGP SIGNATURE-----
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