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

Package-Manager: portage-2.1.1_pre4

4 files changed, 102 insertions, 26 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 90a14d8fa5b0..c868a7926096 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.303 2006/07/26 08:17:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.304 2006/07/30 21:02:00 flameeyes Exp $
+
+  30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/nsplugins-3.5.3-applet-redirects.patch, kdebase-3.5.4.ebuild:
+  Add patch to fix redirects on embedded plugins, see KDE BUG #121964.
 
 *kdebase-3.5.4 (26 Jul 2006)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 78d5f97b8a4b..27b39bc28522 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -77,6 +77,10 @@ AUX kwin-3.5.2-parallel-make.diff 920 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b
 MD5 acbb4de9f0ed620e73cf727388f64315 files/kwin-3.5.2-parallel-make.diff 920
 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b2f3d0 files/kwin-3.5.2-parallel-make.diff 920
 SHA256 5160b4419c302cb01a71dd8a28f804bcd8c1eabad5b345d62765d64cee3f0660 files/kwin-3.5.2-parallel-make.diff 920
+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
 AUX post-3.5.0-kdebase-kdm.diff 508 RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f SHA1 327cd873bfeaea0665364b973245d744fa09c938 SHA256 95cc8feb448616e63eae37e3093bbdee690d04f8542f7f04aeab7926a6cffcf2
 MD5 9daecff07d57dabba35da247e752916a files/post-3.5.0-kdebase-kdm.diff 508
 RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f files/post-3.5.0-kdebase-kdm.diff 508
@@ -105,14 +109,14 @@ EBUILD kdebase-3.5.3-r3.ebuild 5698 RMD160 43f43b8a00c235068b445e4de3c9d9b620490
 MD5 09a6a9f47c703d577fe54549e5592a05 kdebase-3.5.3-r3.ebuild 5698
 RMD160 43f43b8a00c235068b445e4de3c9d9b6204903b2 kdebase-3.5.3-r3.ebuild 5698
 SHA256 bb909685fe307f29761b919aa140120ee6c8396d880af804ddb969766b6bb984 kdebase-3.5.3-r3.ebuild 5698
-EBUILD kdebase-3.5.4.ebuild 5552 RMD160 29d67c59f29abae096648b1d3013004c80e39b0c SHA1 8088cbc50aea2302d89248631a048703ae2c0c28 SHA256 c32e106d556fcee090f1b32af7091242e9be5292bf232e00da4ecebdfd9980bb
-MD5 19a135ae10f6764442181939206ac9ef kdebase-3.5.4.ebuild 5552
-RMD160 29d67c59f29abae096648b1d3013004c80e39b0c kdebase-3.5.4.ebuild 5552
-SHA256 c32e106d556fcee090f1b32af7091242e9be5292bf232e00da4ecebdfd9980bb kdebase-3.5.4.ebuild 5552
-MISC ChangeLog 52361 RMD160 7b5d313216a40aa138e898022a345a62fe9728fc SHA1 253aef06e2a319b77717bcd63469673d3b15a6ea SHA256 e59bf09e18acdae8d0712be0bc772ddfca78b9d95227fc448db21e6eb9b5058e
-MD5 9d278df53e6819f50aebd46459fac76f ChangeLog 52361
-RMD160 7b5d313216a40aa138e898022a345a62fe9728fc ChangeLog 52361
-SHA256 e59bf09e18acdae8d0712be0bc772ddfca78b9d95227fc448db21e6eb9b5058e ChangeLog 52361
+EBUILD kdebase-3.5.4.ebuild 5630 RMD160 459b22d7e47416ecf07c97245dca87c794a7c433 SHA1 41e2c47449be3281c01e9e11a921419d44dc68f3 SHA256 e659465ef4e9b487bc661d76e734dca4246d1719240915ed0ef0fde2e00bfae5
+MD5 256c975d708cdb0b2272d59f777253d9 kdebase-3.5.4.ebuild 5630
+RMD160 459b22d7e47416ecf07c97245dca87c794a7c433 kdebase-3.5.4.ebuild 5630
+SHA256 e659465ef4e9b487bc661d76e734dca4246d1719240915ed0ef0fde2e00bfae5 kdebase-3.5.4.ebuild 5630
+MISC ChangeLog 52557 RMD160 6ef77b6b32eeb8f2cd34c8458920bd1ff54eacc5 SHA1 d20d016602c9f8e0fe73841eff8a2f3912c43756 SHA256 b0d6805aee761fb6816e3bdcb62c6335a8a42aa9b726f65f72a5bfdc5d5cb664
+MD5 b8ccb8c0ee6923c5998828f11cdb5c8b ChangeLog 52557
+RMD160 6ef77b6b32eeb8f2cd34c8458920bd1ff54eacc5 ChangeLog 52557
+SHA256 b0d6805aee761fb6816e3bdcb62c6335a8a42aa9b726f65f72a5bfdc5d5cb664 ChangeLog 52557
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -135,7 +139,7 @@ SHA256 8b4afa58e5d6c0863d55164c28b5bdb5e7cf7890e77d67957fa0d01d16930bbf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFExyVAAiZjviIA2XgRAiwxAJ4+l6KG37Y/sSWV1BMR+pYllxIzWgCfat7P
-F5/TkmujZIMRBArlfhfisxw=
-=R6ht
+iD8DBQFEzR5SAiZjviIA2XgRAugAAKDbJu3hcUP89Q5cS24teKbIU5PAoACeMPZF
+i2q3L8dlWzqfWIDFY1bwvgk=
+=+X+I
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/nsplugins-3.5.3-applet-redirects.patch b/kde-base/kdebase/files/nsplugins-3.5.3-applet-redirects.patch
new file mode 100644
index 000000000000..5f8ded2292e0
--- /dev/null
+++ b/kde-base/kdebase/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/kdebase/kdebase-3.5.4.ebuild b/kde-base/kdebase/kdebase-3.5.4.ebuild
index 84005bb2ef7d..f23902c784b4 100644
--- a/kde-base/kdebase/kdebase-3.5.4.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.4.ebuild,v 1.1 2006/07/26 08:17:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.4.ebuild,v 1.2 2006/07/30 21:02:00 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -76,7 +76,8 @@ DEPEND="${DEPEND}
 		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch"
+PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
+	${FILESDIR}/nsplugins-3.5.3-applet-redirects.patch"
 
 pkg_setup() {
 	kde_pkg_setup
@@ -93,7 +94,7 @@ src_unpack() {
 
 	# Avoid using imake (kde bug 114466).
 	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-	rm -f ${S}/configure
+	rm -f "${S}/configure"
 
 	epatch "${FILESDIR}/kdm-3.5.4-strict-aliasing.patch"
 }
@@ -133,38 +134,38 @@ src_install() {
 
 	# startup and shutdown scripts
 	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
+	doins "${FILESDIR}/agent-startup.sh"
 
 	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
+	doexe "${FILESDIR}/agent-shutdown.sh"
 
 	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
+	cat <<EOF > "${T}/xdg.sh"
 export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
 export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
 EOF
 	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
+	doins "${T}/xdg.sh"
 
 	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
+	cat <<EOF > "${T}/kde-${SLOT}"
 #!/bin/sh
 exec ${KDEDIR}/bin/startkde
 EOF
 	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
+	doexe "${T}/kde-${SLOT}"
 
 	# freedesktop compliant session script
 	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
+		"${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop"
 	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
+	doins "${T}/kde-${SLOT}.desktop"
 
 	# Customize the kdmrc configuration
 	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+		"${D}/${KDEDIR}/share/config/kdm/kdmrc" || die
 
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+	rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir"
 }
 
 pkg_postinst() {
@@ -180,7 +181,7 @@ pkg_postinst() {
 			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
 	fi
 
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
+	mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir"
 
 	echo
 	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"