Add patch to fix redirects on embedded plugins, see KDE BUG #121964.

Package-Manager: portage-2.1.1_pre4

5 files changed, 109 insertions, 8 deletions

diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 45d05cde6216..e014875a16ea 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.49 2006/07/25 09:26:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.50 2006/07/30 19:07:55 flameeyes Exp $
+
+*nsplugins-3.5.3-r1 (30 Jul 2006)
+
+  30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/nsplugins-3.5.3-applet-redirects.patch, +nsplugins-3.5.3-r1.ebuild:
+  Add patch to fix redirects on embedded plugins, see KDE BUG #121964.
 
   25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> nsplugins-3.5.3.ebuild:
   Bump to 3.5.4 (pre-release).
diff --git a/kde-base/nsplugins/Manifest b/kde-base/nsplugins/Manifest
index 0631ae9a7d45..64f56ec1d848 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-base/nsplugins/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX nsplugins-3.5.3-applet-redirects.patch 2317 RMD160 dcced9a334b8ffa745f92e934450d96257dcfde8 SHA1 f41bd9752c71c39249850f9ebb192b208f47e196 SHA256 7f6b1f2a81877404326b1aac04ffc30d1c74e2b2d1f54c6111c2911f8afc36da
+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
 DIST kdebase-3.4.3.tar.bz2 22425835 RMD160 7af02903b0fc750e7b9778391ef8948b54f69ce7 SHA256 d7802446a046ed647e5d068b7c4a21cfdb9c883b31de65838f106c5b5d4b8b1c
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
@@ -12,14 +16,18 @@ EBUILD nsplugins-3.5.2.ebuild 429 RMD160 b39dadb723aa6abbc1692ec769df80efb024898
 MD5 ff36654c72d8067583ca2592d875211f nsplugins-3.5.2.ebuild 429
 RMD160 b39dadb723aa6abbc1692ec769df80efb024898b nsplugins-3.5.2.ebuild 429
 SHA256 bc93c1983aaddd38fe80c911e7b2bc069bd948e4702c6522b2d6238b76dae1f6 nsplugins-3.5.2.ebuild 429
+EBUILD nsplugins-3.5.3-r1.ebuild 492 RMD160 bed9807b3e5db4129c0a73a1a2906422a4193d3f SHA1 408b3fcbee57f786639bc219d451c4eb0db1fe58 SHA256 8eee1e3781c9db560546149821ec19245140282e024e8319f5986d1bd56e312f
+MD5 cb6db5fc1986f444558477945665e732 nsplugins-3.5.3-r1.ebuild 492
+RMD160 bed9807b3e5db4129c0a73a1a2906422a4193d3f nsplugins-3.5.3-r1.ebuild 492
+SHA256 8eee1e3781c9db560546149821ec19245140282e024e8319f5986d1bd56e312f nsplugins-3.5.3-r1.ebuild 492
 EBUILD nsplugins-3.5.3.ebuild 440 RMD160 b71b3ebd64d294d046c480aef5c3623f4a84d6fc SHA1 c93c82694e48807c51707529760e34e93f119ebf SHA256 71463f5e1da1354f90ff0a0cec2738ad117cff1a42d9c5a51c7f68f3d39f07e8
 MD5 163f6c09060797f268a7b8edc1251395 nsplugins-3.5.3.ebuild 440
 RMD160 b71b3ebd64d294d046c480aef5c3623f4a84d6fc nsplugins-3.5.3.ebuild 440
 SHA256 71463f5e1da1354f90ff0a0cec2738ad117cff1a42d9c5a51c7f68f3d39f07e8 nsplugins-3.5.3.ebuild 440
-MISC ChangeLog 6158 RMD160 434253044c5f92da1003a47963be639ac9f1d9ea SHA1 b9ce1d1fd7bf4fb24bbb4591db9e9821f90cfa12 SHA256 95fed8badccf4bfbd7c591f6b4b60fcf34f7a000524d2b5a43b19f3a41358f3c
-MD5 0701cefa5443cedc249da1bc7a71c53a ChangeLog 6158
-RMD160 434253044c5f92da1003a47963be639ac9f1d9ea ChangeLog 6158
-SHA256 95fed8badccf4bfbd7c591f6b4b60fcf34f7a000524d2b5a43b19f3a41358f3c ChangeLog 6158
+MISC ChangeLog 6395 RMD160 7e569a7bef084627e8d0d538470b72814ab61273 SHA1 985b93b87fd9897635fafd296f6f10941288ea47 SHA256 49e94c36cfd0b4156a7ea7ed42e9b64adfb053bb6046cd264f05de593901ee95
+MD5 b29be7f4f8c77523d39af387f207eb18 ChangeLog 6395
+RMD160 7e569a7bef084627e8d0d538470b72814ab61273 ChangeLog 6395
+SHA256 49e94c36cfd0b4156a7ea7ed42e9b64adfb053bb6046cd264f05de593901ee95 ChangeLog 6395
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -33,10 +41,13 @@ SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/di
 MD5 c769b4fee1a0c608ff42cda1d49b9ac2 files/digest-nsplugins-3.5.3 250
 RMD160 2453307f2d55a127e9043490c766259d59768fbb files/digest-nsplugins-3.5.3 250
 SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/digest-nsplugins-3.5.3 250
+MD5 c769b4fee1a0c608ff42cda1d49b9ac2 files/digest-nsplugins-3.5.3-r1 250
+RMD160 2453307f2d55a127e9043490c766259d59768fbb files/digest-nsplugins-3.5.3-r1 250
+SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/digest-nsplugins-3.5.3-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFExePeAiZjviIA2XgRAiVxAKDjTgUUzC1k5JcIzOZksjqcz9l+GQCeNg+3
-EuliJ5hHJNtE0SqNQYzpWXo=
-=bsa3
+iD8DBQFEzQOdAiZjviIA2XgRAtQfAJ4g55Vnc7/0oOKy+wLa/0FZtjbWHQCgnS7h
+hxMCE+Naow8S+hblMoOCCZ8=
+=+4/b
 -----END PGP SIGNATURE-----
diff --git a/kde-base/nsplugins/files/digest-nsplugins-3.5.3-r1 b/kde-base/nsplugins/files/digest-nsplugins-3.5.3-r1
new file mode 100644
index 000000000000..f6eb5d9b686e
--- /dev/null
+++ b/kde-base/nsplugins/files/digest-nsplugins-3.5.3-r1
@@ -0,0 +1,3 @@
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/nsplugins/files/nsplugins-3.5.3-applet-redirects.patch b/kde-base/nsplugins/files/nsplugins-3.5.3-applet-redirects.patch
new file mode 100644
index 000000000000..5f8ded2292e0
--- /dev/null
+++ b/kde-base/nsplugins/files/nsplugins-3.5.3-applet-redirects.patch
@@ -0,0 +1,67 @@
+Index: nsplugins/viewer/nsplugin.cpp
+===================================================================
+--- nsplugins/viewer/nsplugin.cpp	(revision 565997)
++++ nsplugins/viewer/nsplugin.cpp	(revision 565998)
+@@ -1602,6 +1602,12 @@
+     return true;
+ }
+ 
++void NSPluginStreamBase::updateURL( const KURL& newURL )
++{
++    _url = newURL;
++    free(const_cast<char*>(_stream->url));
++    _stream->url = strdup(_url.url().ascii());
++}
+ 
+ int NSPluginStreamBase::process( const QByteArray &data, int start )
+ {
+@@ -1824,6 +1830,8 @@
+                 SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
+         connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
+                 SLOT(mimetype(KIO::Job *, const QString &)));
++        connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
++                SLOT(redirection(KIO::Job *, const KURL&)));
+     }
+ 
+     return false;
+@@ -1847,6 +1855,8 @@
+                 SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
+         connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
+                 SLOT(mimetype(KIO::Job *, const QString &)));
++        connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
++                SLOT(redirection(KIO::Job *, const KURL&)));
+     }
+ 
+     return false;
+@@ -1863,6 +1873,11 @@
+     }
+ }
+ 
++void NSPluginStream::redirection(KIO::Job * /*job*/, const KURL& url)
++{
++    updateURL( url );
++}
++
+ void NSPluginStream::totalSize(KIO::Job * job, KIO::filesize_t size)
+ {
+     kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << KIO::number(size) << endl;
+Index: nsplugins/viewer/nsplugin.h
+===================================================================
+--- nsplugins/viewer/nsplugin.h	(revision 565997)
++++ nsplugins/viewer/nsplugin.h	(revision 565998)
+@@ -85,6 +85,7 @@
+   bool create( const QString& url, const QString& mimeType, void *notify, bool forceNotify = false );
+   int tries() { return _tries; }
+   void inform( );
++  void updateURL( const KURL& newURL );
+ 
+   class NSPluginInstance *_instance;
+   uint16 _streamType;
+@@ -126,6 +127,7 @@
+   void totalSize(KIO::Job *job, KIO::filesize_t size);
+   void mimetype(KIO::Job * job, const QString &mimeType);
+   void result(KIO::Job *job);
++  void redirection(KIO::Job *job, const KURL& url);
+   void resume();
+ 
+ protected:
diff --git a/kde-base/nsplugins/nsplugins-3.5.3-r1.ebuild b/kde-base/nsplugins/nsplugins-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..64a003fc06d4
--- /dev/null
+++ b/kde-base/nsplugins/nsplugins-3.5.3-r1.ebuild
@@ -0,0 +1,14 @@
+# 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.3-r1.ebuild,v 1.1 2006/07/30 19:07:55 flameeyes Exp $
+
+KMNAME=kdebase
+MAXKDEVER=3.5.4
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="Netscape plugins support for konqueror"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+PATCHES="${FILESDIR}/${P}-applet-redirects.patch"