head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.4
	OPENPKG_E1_MP:1.4;
locks; strict;
comment	@# @;


1.4
date	2005.09.28.19.44.20;	author thl;	state Exp;
branches;
next	1.3;

1.3
date	2004.10.26.12.38.37;	author tho;	state dead;
branches;
next	1.2;

1.2
date	2004.08.03.07.58.45;	author tho;	state Exp;
branches;
next	1.1;

1.1
date	2004.04.06.13.45.42;	author rse;	state Exp;
branches;
next	;


desc
@@


1.4
log
@upgrading package: kde-libs 3.3.1 -> 3.4.2
@
text
@--- kjs/Makefile.in.orig	2005-09-28 18:00:15.027670000 +0200
+++ kjs/Makefile.in	2005-09-28 18:13:29.595755958 +0200
@@@@ -669,7 +669,7 @@@@
 #>+ 2
 @@KDE_USE_CLOSURE_TRUE@@libkjs.la: libkjs.la.closure $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES) 
 @@KDE_USE_CLOSURE_FALSE@@libkjs.la: $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkjs_la_LDFLAGS) $(libkjs_la_OBJECTS) $(libkjs_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkjs_la_LDFLAGS) $(libkjs_la_OBJECTS) $(libkjs_la_LIBADD) $(LIBS) -lpcre
 
 clean-checkPROGRAMS:
 	@@list='$(check_PROGRAMS)'; for p in $$list; do \

@


1.3
log
@upgrading package: kde-libs 3.2.3 -> 3.3.1
@
text
@d1 8
a8 4
--- kdecore/kextsock.cpp	11 Dec 2003 22:54:36 -0000	1.67
+++ kdecore/kextsock.cpp	22 Jan 2004 19:59:13 -0000
@@@@ -1892,7 +1892,11 @@@@ int KExtendedSocket::doLookup(const QStr
   err = kde_getaddrinfo(_host, _serv, &hint, res);
d10 3
a12 22
 #ifdef HAVE_RES_INIT
-  if (err == EAI_NONAME || err == EAI_NODATA || err == EAI_AGAIN)
+  if (err == EAI_NONAME || 
+#ifdef EAI_NODATA
+	err == EAI_NODATA || 
+#endif
+	err == EAI_AGAIN)
     {
       // A loookup error occurred and nothing was resolved
       // However, since the user could have just dialed up to the ISP
@@@@ -2274,7 +2278,11 @@@@ void KExtendedSocket::dnsResultsReady()
   else
     {
       d->status = nothing;
+#ifdef EAI_NODATA
       setError(IO_LookupError, EAI_NODATA);
+#else
+      setError(IO_LookupError, EAI_NONAME);
+#endif
     }
 
   emit lookupFinished(n);
@


1.2
log
@upgrading package: kde-libs 3.2.1 -> 3.2.3
@
text
@@


1.1
log
@upgrading package: kde-libs 3.1.4 -> 3.2.1
@
text
@a0 28
--- kdecore/kcharsets.cpp	2003/09/06 19:06:29	1.144
+++ kdecore/kcharsets.cpp	2004/03/12 09:18:03	1.144.2.1
@@@@ -497,19 +497,19 @@@@ QString KCharsets::languageForEncoding( 
 
 QString KCharsets::encodingForName( const QString &descriptiveName )
 {
-    const int left = descriptiveName.find( '(' );
+    const int left = descriptiveName.findRev( '(' );
     
     if (left<0) // No parenthesis, so assume it is a normal encoding name
-	return descriptiveName;
+	return descriptiveName.stripWhiteSpace();
     
-    QString name(descriptiveName.mid(left+2));
+    QString name(descriptiveName.mid(left+1));
     
-    const int right = name.find( ')' );
+    const int right = name.findRev( ')' );
     
     if (right<0) 
         return name;
-	
-    return name.left(right-1);
+
+    return name.left(right).stripWhiteSpace();
 }
 
 QStringList KCharsets::descriptiveEncodingNames()
a27 11
--- khtml/khtml_part.cpp.orig	Mon Mar  1 09:25:09 2004
+++ khtml/khtml_part.cpp	Sat Mar 13 20:48:58 2004
@@@@ -5395,7 +5395,7 @@@@
       pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
     }
 
-    KURLDrag* urlDrag = new KURLDrag( u, 0 );
+    KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
     if ( !d->m_referrer.isEmpty() )
       urlDrag->metaData()["referrer"] = d->m_referrer;
 
@