pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Fix some issues related to html frames, cookie han...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4623cea1e047
branches: trunk
changeset: 479301:4623cea1e047
user: markd <markd%pkgsrc.org@localhost>
date: Wed Aug 11 13:51:14 2004 +0000
description:
Fix some issues related to html frames, cookie handling and temporary filenames.
>From KDE cvs.
Bump PKGREVISION.
diffstat:
x11/kdebase3/Makefile | 3 +-
x11/kdebase3/distinfo | 4 +-
x11/kdebase3/patches/patch-al | 120 ++++++++++++++++++
x11/kdebase3/patches/patch-am | 22 +++
x11/kdelibs3/Makefile | 4 +-
x11/kdelibs3/distinfo | 14 +-
x11/kdelibs3/patches/patch-an | 32 ++++-
x11/kdelibs3/patches/patch-ap | 187 ++++++++++++++++++++++++++++
x11/kdelibs3/patches/patch-aq | 72 +++++++++++
x11/kdelibs3/patches/patch-ar | 37 +++++
x11/kdelibs3/patches/patch-as | 37 +++++
x11/kdelibs3/patches/patch-at | 29 ++++
x11/kdelibs3/patches/patch-au | 19 ++
x11/kdelibs3/patches/patch-av | 272 ++++++++++++++++++++++++++++++++++++++++++
x11/kdelibs3/patches/patch-aw | 52 ++++++++
x11/kdelibs3/patches/patch-ax | 27 ++++
x11/kdelibs3/patches/patch-ay | 47 +++++++
17 files changed, 971 insertions(+), 7 deletions(-)
diffs (truncated from 1082 to 300 lines):
diff -r d8b224010740 -r 4623cea1e047 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile Wed Aug 11 12:52:33 2004 +0000
+++ b/x11/kdebase3/Makefile Wed Aug 11 13:51:14 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2004/06/10 11:51:51 markd Exp $
+# $NetBSD: Makefile,v 1.55 2004/08/11 13:54:06 markd Exp $
DISTNAME= kdebase-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff -r d8b224010740 -r 4623cea1e047 x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo Wed Aug 11 12:52:33 2004 +0000
+++ b/x11/kdebase3/distinfo Wed Aug 11 13:51:14 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2004/06/10 11:51:51 markd Exp $
+$NetBSD: distinfo,v 1.54 2004/08/11 13:54:06 markd Exp $
SHA1 (kdebase-3.2.3.tar.bz2) = bb3543a7ffa95e55a5eb87c4e476d3a800c0113c
Size (kdebase-3.2.3.tar.bz2) = 17330422 bytes
@@ -15,6 +15,8 @@
SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
SHA1 (patch-aj) = 3ed17b109394ce3d24accbbd6afcad40013d6b48
SHA1 (patch-ak) = 234c9a4d01b15ab803a182c51c14a7c0cf249576
+SHA1 (patch-al) = b943f5313caee5b9ce205167e8d6637dea2c885e
+SHA1 (patch-am) = 50a11a0d3d444b32f60790dd1db59c71bd06ac99
SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff -r d8b224010740 -r 4623cea1e047 x11/kdebase3/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-al Wed Aug 11 13:51:14 2004 +0000
@@ -0,0 +1,120 @@
+$NetBSD: patch-al,v 1.5 2004/08/11 13:54:06 markd Exp $
+
+Index: konqueror/konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1274.2.24
+diff -u -p -r1.1274.2.24 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24
++++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000
+@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest(
+ {
+ kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
+
++ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
+ QString frameName = args.frameName;
+
+ if ( !frameName.isEmpty() )
+@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest(
+ frameName.lower() != _parent )
+ {
+ KParts::BrowserHostExtension *hostExtension = 0;
+- KonqView *view = childView( frameName, &hostExtension, 0 );
++ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 );
+ if ( !view )
+ {
+ KonqMainWindow *mainWindow = 0;
+- view = findChildView( frameName, &mainWindow, &hostExtension, 0 );
++ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 );
+
+ if ( !view || !mainWindow )
+ {
+@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest(
+ }
+ }
+
+- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
+- KonqView *view = childView( part );
++ KonqView *view = childView( callingPart );
+ openURL( view, url, args );
+ }
+
+@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow
+ if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" )
+ {
+ KParts::BrowserHostExtension *hostExtension = 0;
+- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) )
++ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) )
+ {
+ // Found a view. If url isn't empty, we should open it - but this never happens currently
+ // findChildView put the resulting part in 'part', so we can just return now
+@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP
+ return 0L;
+ }
+
+-KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
++KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
+ {
+- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
++ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
+
+ MapViews::ConstIterator it = m_mapViews.begin();
+ MapViews::ConstIterator end = m_mapViews.end();
+@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co
+ {
+ KonqView* view = it.data();
+ QString viewName = view->viewName();
+- //kdDebug() << " - viewName=" << viewName << " "
+- // << "frame names:" << view->frameNames().join( "," ) << endl;
++ kdDebug() << " - viewName=" << viewName << " "
++ << "frame names:" << view->frameNames().join( "," ) << endl;
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+- //kdDebug() << "found existing view by name: " << view << endl;
++ kdDebug() << "found existing view by name: " << view << endl;
+ if ( hostExtension )
+ *hostExtension = 0;
+ if ( part )
+@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co
+ }
+
+ // First look for a hostextension containing this frame name
+- // (KonqView looks for it recursively)
+- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++ if ( ext )
++ {
++ ext = ext->findFrameParent(callingPart, name);
++ }
++
++// KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+
+ if ( ext )
+ {
+@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co
+ {
+ if ( frameIt.current()->name() == name )
+ {
+- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
++ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
+ if ( hostExtension )
+ *hostExtension = ext;
+ if ( part )
+@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co
+ }
+
+ // static
+-KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
++KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart
**part )
+ {
+ if ( !s_lstViews )
+ return 0;
+@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView
+ QPtrListIterator<KonqMainWindow> it( *s_lstViews );
+ for (; it.current(); ++it )
+ {
+- KonqView *res = it.current()->childView( name, hostExtension, part );
++ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part );
+ if ( res )
+ {
+ if ( mainWindow )
diff -r d8b224010740 -r 4623cea1e047 x11/kdebase3/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-am Wed Aug 11 13:51:14 2004 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.8 2004/08/11 13:54:06 markd Exp $
+
+Index: konqueror/konq_mainwindow.h
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v
+retrieving revision 1.423.2.4
+diff -u -p -r1.423.2.4 konq_mainwindow.h
+--- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4
++++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000
+@@ -145,10 +145,10 @@ public:
+ void insertChildView( KonqView *childView );
+ void removeChildView( KonqView *childView );
+ KonqView *childView( KParts::ReadOnlyPart *view );
+- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
++ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
+
+ // dcop idl bug! it can't handle KonqMainWindow *&mainWindow
+- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
++ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
+
+ // Total number of views
+ int viewCount() const { return m_mapViews.count(); }
diff -r d8b224010740 -r 4623cea1e047 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile Wed Aug 11 12:52:33 2004 +0000
+++ b/x11/kdelibs3/Makefile Wed Aug 11 13:51:14 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2004/07/06 16:28:53 recht Exp $
+# $NetBSD: Makefile,v 1.64 2004/08/11 13:51:14 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
diff -r d8b224010740 -r 4623cea1e047 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo Wed Aug 11 12:52:33 2004 +0000
+++ b/x11/kdelibs3/distinfo Wed Aug 11 13:51:14 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2004/06/10 11:39:50 markd Exp $
+$NetBSD: distinfo,v 1.39 2004/08/11 13:51:14 markd Exp $
SHA1 (kdelibs-3.2.3.tar.bz2) = 33df00cb44694db306c29504f6ee5f3bd4a71c7d
Size (kdelibs-3.2.3.tar.bz2) = 12737024 bytes
@@ -7,7 +7,17 @@
SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d
SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
-SHA1 (patch-an) = 41d2721bd55d060cde630771dad0377dbe770d73
+SHA1 (patch-an) = 443560cbbca3d29d2e436ac94b4920da081c99f9
+SHA1 (patch-ap) = 807a36fc910679431115f0d03208977d8cae7bc6
+SHA1 (patch-aq) = 26627136717b912e3c1ec884db4e9712398904cd
+SHA1 (patch-ar) = af4fe2fe875f91095aa024c23e17b4144ade283c
+SHA1 (patch-as) = e208b595c0f39094a8db16e6aa6b00c0d90420d2
+SHA1 (patch-at) = 9b114f66dd8b9134e884334d3d2217dd1f6e217e
+SHA1 (patch-au) = 20bebf25372adcb61065927adb093ddd10ec1b00
+SHA1 (patch-av) = 26c026a500f49847eedd56b143317d6661bf2f54
+SHA1 (patch-aw) = 4514ec04885709cfc402e387346c0c5f72408385
+SHA1 (patch-ax) = 36f21f6b3bb42f43deecd837095318d3f4e3b125
+SHA1 (patch-ay) = 27cf47be52f2f643f808d7092a6fe33458b67fc5
SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
SHA1 (patch-bd) = f233a73d0a8148e1ae7f4e777c3f5d50b56d768f
SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
diff -r d8b224010740 -r 4623cea1e047 x11/kdelibs3/patches/patch-an
--- a/x11/kdelibs3/patches/patch-an Wed Aug 11 12:52:33 2004 +0000
+++ b/x11/kdelibs3/patches/patch-an Wed Aug 11 13:51:14 2004 +0000
@@ -1,7 +1,37 @@
-$NetBSD: patch-an,v 1.3 2004/02/04 13:58:39 markd Exp $
+$NetBSD: patch-an,v 1.4 2004/08/11 13:51:14 markd Exp $
--- kdecore/kstandarddirs.cpp.orig 2004-01-26 06:24:42.000000000 +1300
+++ kdecore/kstandarddirs.cpp
+@@ -651,7 +651,28 @@ void KStandardDirs::createSpecialResourc
+ char link[1024];
+ link[1023] = 0;
+ int result = readlink(QFile::encodeName(dir).data(), link, 1023);
+- if ((result == -1) && (errno == ENOENT))
++ bool relink = (result == -1) && (errno == ENOENT);
++ if ((result > 0) && (link[0] == '/'))
++ {
++ link[result] = 0;
++ struct stat stat_buf;
++ int res = lstat(link, &stat_buf);
++ if ((res == -1) && (errno == ENOENT))
++ {
++ relink = true;
++ }
++ else if ((res == -1) || (!S_ISDIR(stat_buf.st_mode)))
++ {
++ fprintf(stderr, "Error: \"%s\" is not a directory.\n", link);
++ relink = true;
++ }
++ else if (stat_buf.st_uid != getuid())
++ {
++ fprintf(stderr, "Error: \"%s\" is owned by uid %d instead of uid %d.\n", link, stat_buf.st_uid, getuid());
++ relink = true;
++ }
++ }
++ if (relink)
+ {
+ QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin"));
+ if (srv.isEmpty())
@@ -847,33 +847,33 @@ static int tokenize( QStringList& tokens
QString KStandardDirs::kde_default(const char *type) {
diff -r d8b224010740 -r 4623cea1e047 x11/kdelibs3/patches/patch-ap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs3/patches/patch-ap Wed Aug 11 13:51:14 2004 +0000
@@ -0,0 +1,187 @@
+$NetBSD: patch-ap,v 1.8 2004/08/11 13:51:14 markd Exp $
+
+Index: dcopserver.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v
+retrieving revision 1.160.2.3
+diff -u -p -r1.160.2.3 dcopserver.cpp
+--- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3
++++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000
+@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE
+ fprintf (addfp, "\n");
+ }
+
++#ifndef HAVE_MKSTEMPS
++#include <string.h>
++#include <strings.h>
+
+-#ifndef HAVE_MKSTEMP
+-static char *unique_filename (const char *path, const char *prefix)
+-#else
+-static char *unique_filename (const char *path, const char *prefix, int *pFd)
+-#endif
++/* this is based on code taken from the GNU libc, distributed under the LGPL license */
++
++/* Generate a unique temporary file name from TEMPLATE.
++
++ TEMPLATE has the form:
++
++ <path>/ccXXXXXX<suffix>
++
++ SUFFIX_LEN tells us how long <suffix> is (it can be zero length).
++
++ The last six characters of TEMPLATE before <suffix> must be "XXXXXX";
Home |
Main Index |
Thread Index |
Old Index