update to kde 4.3.4

KDE SC 4.3.4 has a number of improvements:

 * A bugfix in Plasma's pixmap cache makes the workspace more responsive
 * Okular, the document viewer improved stability in certain situations
 * Marble, the desktop globe has seen some polish
 * Passphrases with non-ASCII characters have been fixed in the KGpg
   encryption tool

4 files changed, 8 insertions, 113 deletions

diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index dd4ad03b6cd..41515fc2c5e 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/12/04 22:04:07 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -2817,6 +2817,7 @@ share/kde/apps/ksgmltools2/customization/pl/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/pl/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/pl/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/pl/lang.entities
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 3c679720ff9..88471d12b06 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:07 markd Exp $
 
-SHA1 (kdelibs-4.3.3.tar.bz2) = 89b55982e007c44835a9da0f540dd57fa096df45
-RMD160 (kdelibs-4.3.3.tar.bz2) = 3d6a2c971cef12fb2cb9ba64a10200b2cf098043
-Size (kdelibs-4.3.3.tar.bz2) = 10516364 bytes
+SHA1 (kdelibs-4.3.4.tar.bz2) = 1af2d185c88898b71f36b57f033e3a6d9839ab3d
+RMD160 (kdelibs-4.3.4.tar.bz2) = 0719043ddcf251a3fce4c2d4bfb1583e80c4b54d
+Size (kdelibs-4.3.4.tar.bz2) = 10518171 bytes
 SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977
 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d
-SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7
+SHA1 (patch-ac) = f90a566c3eb500f01b463e491748bc50ce963682
 SHA1 (patch-ad) = 2a0dfd3dda071654c89b8dda3db8885e2a55ba2b
 SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
-SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4
 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
diff --git a/x11/kdelibs4/patches/patch-ac b/x11/kdelibs4/patches/patch-ac
index a15a1a169f3..5a5353881c1 100644
--- a/x11/kdelibs4/patches/patch-ac
+++ b/x11/kdelibs4/patches/patch-ac
@@ -1,6 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 19:19:00 markd Exp $
-
-Includes patch from https://bugs.kde.org/show_bug.cgi?id=193215
+$NetBSD: patch-ac,v 1.2 2009/12/04 22:04:07 markd Exp $
 
 --- kio/kssl/kopenssl.cpp.ORIG	2008-10-23 12:05:00.000000000 +1300
 +++ kio/kssl/kopenssl.cpp
@@ -200,12 +198,3 @@ Includes patch from https://bugs.kde.org/show_bug.cgi?id=193215
  
     if (d->sslLib) {
  #ifdef KSSL_HAVE_SSL
-@@ -622,7 +613,7 @@ KOpenSSLProxy::KOpenSSLProxy()
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
- #endif
- 
- 
diff --git a/x11/kdelibs4/patches/patch-ai b/x11/kdelibs4/patches/patch-ai
deleted file mode 100644
index 709287333fb..00000000000
--- a/x11/kdelibs4/patches/patch-ai
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $
-
-From https://bugs.kde.org/show_bug.cgi?id=193215
-
---- kio/kssl/kopenssl.h.orig	2009-05-20 00:06:53.000000000 +1200
-+++ kio/kssl/kopenssl.h
-@@ -43,6 +43,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/evp.h>
- #include <openssl/stack.h>
- #include <openssl/bn.h>
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+typedef _STACK STACK;
-+#endif
- #undef crypt
- #endif
- 
-@@ -499,24 +502,50 @@ public:
-     */
-    char *sk_pop(STACK *s);
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   /*
-+    * Pop off the stack with OpenSSL 1.x
-+    */
-+   char *sk_pop(void *s) { return sk_pop(reinterpret_cast<STACK*>(s)); }
-+#endif
-+
- 
-    /*
-     *   Free the stack
-     */
-    void sk_free(STACK *s);
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   /*
-+    * Free the stack with OpenSSL 1.x
-+    */
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
-+
- 
-    /*
-     *  Number of elements in the stack
-     */
-    int sk_num(STACK *s);
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   /*
-+    * Number of elements in the stack with OpenSSL 1.x
-+    */
-+   int sk_num(void *s) { return sk_num(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /*
-     *  Value of element n in the stack
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   /*
-+    * Value of element n in the stack with OpenSSL 1.x
-+    */
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /*
-     *  Create a new stack
-@@ -529,12 +558,26 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   /*
-+    * Add an element to the stack with OpenSSL 1.x
-+    */
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
-+
- 
-    /*
-     *  Duplicate the stack
-     */
-    STACK *sk_dup(STACK *s);
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   /*
-+    * Duplicate the stack with OpenSSL 1.x
-+    */
-+   STACK *sk_dup(void *s) { return sk_dup(reinterpret_cast<STACK*>(s)); }
-+#endif
-+
- 
-    /*
-     *  Convert an ASN1_INTEGER to its text form