Changes 4.8.1:

Qt 4.8.1 is the first patch release to the 4.8 series with over 200 functional
improvements to the desktop and embedded platforms. The majority of the error
corrections, made primarily by Digia, have been on desktop and embedded
platforms with a large number of fixes with focus on QtCore, QtGUI and
QtNetwork. These fixes benefit all desktop platforms. Qt 4.8.1 also includes
Mac App Store support.

12 files changed, 46 insertions, 107 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 11dd083d8fe..59aac0d8102 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2012/03/03 12:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2012/04/09 09:12:49 adam Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	4
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 1a293e508a3..1896f693108 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2012/02/27 12:41:22 reinoud Exp $
+$NetBSD: distinfo,v 1.73 2012/04/09 09:12:49 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e
-RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e
-Size (qt-everywhere-opensource-src-4.8.0.tar.gz) = 238580694 bytes
-SHA1 (patch-aa) = 4b15483ad6bf94e2b97aa1515fe60e3179446ee5
+SHA1 (qt-everywhere-opensource-src-4.8.1.tar.gz) = a074d0f605f009e23c63e0a4cb9b71c978146ffc
+RMD160 (qt-everywhere-opensource-src-4.8.1.tar.gz) = 538e626fae80ca8ca5aac575919f469a9827ad4f
+Size (qt-everywhere-opensource-src-4.8.1.tar.gz) = 239606696 bytes
+SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
 SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b
@@ -17,9 +17,9 @@ SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4
 SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d
 SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
-SHA1 (patch-ao) = 2bb9563994ab6e2912f45d19cd4a69f774eaaaef
+SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 5fd4806a42950af928a76259e26615902de23d78
+SHA1 (patch-aq) = acff9d38a341a0d686c0379886ee92126d8a950c
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
@@ -38,17 +38,15 @@ SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
 SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
 SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7
 SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef
-SHA1 (patch-qmake_generators_makefile.cpp) = 54184d85fd06c86a62640add6c8334ca323ea863
+SHA1 (patch-qmake_generators_makefile.cpp) = b985fa61c5fe8cc9edbf2502109e3883a81faa85
 SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
-SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 5b5ed1512adcde18ef86044986f36d0bb87e1666
+SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
-SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 384bfccabae5e3a4ea6dea39b912a941133c5632
+SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = 10bfe59d623db5047e2a4c678ee79a217ea8b7ec
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
 SHA1 (patch-src_dbus_qdbusserver.cpp) = 6b49a383ea561e8024184a5939ff143e91a10171
-SHA1 (patch-src_dbus_qdbusserver.h) = 67cc43c0f5e46a0e84b21d5af3ea1e949f26c7b1
-SHA1 (patch-src_network_ssl_qsslsocket__openssl.cpp) = 927582af26ffcfdf5afcb27b36fc27dd5b60865b
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 152b2da94f32e87b649f7f02b11b92145bfc269c
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 3f54beefab0907ed834ec88ecfc84ebf65f84cc5
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 67744fd7eb821cbff5a763c85fc080270bd86922
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
index 984e1814836..402ad7fe8c4 100644
--- a/x11/qt4-libs/patches/patch-aa
+++ b/x11/qt4-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-aa,v 1.14 2012/04/09 09:12:49 adam Exp $
 
---- qmake/generators/unix/unixmake2.cpp.orig	2010-09-10 09:04:41.000000000 +0000
+--- qmake/generators/unix/unixmake2.cpp.orig	2012-03-14 14:01:12.000000000 +0000
 +++ qmake/generators/unix/unixmake2.cpp
-@@ -239,6 +239,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -244,6 +244,8 @@ UnixMakefileGenerator::writeMakeParts(QT
          if(!project->isEmpty("QMAKE_BUNDLE")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.13 2012/01/12 22:59:58 adam Exp $
          } else if(!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET")) << endl;
          } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
-@@ -1016,8 +1018,12 @@ void UnixMakefileGenerator::init2()
+@@ -1041,8 +1043,12 @@ void UnixMakefileGenerator::init2()
      } else if (project->isActiveConfig("staticlib")) {
          project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
          project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao
index 58686c05bbe..00d81c7e12a 100644
--- a/x11/qt4-libs/patches/patch-ao
+++ b/x11/qt4-libs/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.9 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-ao,v 1.10 2012/04/09 09:12:49 adam Exp $
 
---- src/corelib/codecs/qiconvcodec.cpp.orig	2011-12-08 05:06:03.000000000 +0000
+--- src/corelib/codecs/qiconvcodec.cpp.orig	2012-03-14 14:01:18.000000000 +0000
 +++ src/corelib/codecs/qiconvcodec.cpp
 @@ -50,9 +50,14 @@
  #include <stdio.h>
@@ -37,7 +37,7 @@ $NetBSD: patch-ao,v 1.9 2012/01/12 22:59:58 adam Exp $
      // GNU doesn't disagree with POSIX :/
      const char *inBytes = chars;
  #else
-@@ -314,7 +322,7 @@ static bool setByteOrder(iconv_t cd)
+@@ -318,7 +326,7 @@ static bool setByteOrder(iconv_t cd)
      size_t outBytesLeft = sizeof buf;
      size_t inBytesLeft = sizeof bom;
  
@@ -46,7 +46,7 @@ $NetBSD: patch-ao,v 1.9 2012/01/12 22:59:58 adam Exp $
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
-@@ -334,7 +342,7 @@ QByteArray QIconvCodec::convertFromUnico
+@@ -338,7 +346,7 @@ QByteArray QIconvCodec::convertFromUnico
      char *outBytes;
      size_t inBytesLeft;
  
@@ -55,8 +55,8 @@ $NetBSD: patch-ao,v 1.9 2012/01/12 22:59:58 adam Exp $
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
-@@ -466,11 +474,13 @@ iconv_t QIconvCodec::createIconv_t(const
-     static const char empty_codeset[] = "";
+@@ -475,11 +483,13 @@ iconv_t QIconvCodec::createIconv_t(const
+ #endif
      const char *codeset = empty_codeset;
      cd = iconv_open(to ? to : codeset, from ? from : codeset);
 +#elif defined(__NetBSD)
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index 074d1cb012e..a58abb43893 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.11 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
 
---- configure.orig	2011-12-08 05:06:02.000000000 +0000
+--- configure.orig	2012-03-14 14:01:12.000000000 +0000
 +++ configure
 @@ -3100,13 +3100,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
@@ -65,7 +65,7 @@ $NetBSD: patch-aq,v 1.11 2012/01/12 22:59:58 adam Exp $
          CFG_MAC_COCOA="no";
          CFG_MAC_CARBON="yes";
      fi
-@@ -8245,7 +8258,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+@@ -8247,7 +8260,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
  [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
  [ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
  [ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
@@ -74,7 +74,7 @@ $NetBSD: patch-aq,v 1.11 2012/01/12 22:59:58 adam Exp $
  
  if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
      [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
-@@ -8450,6 +8463,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
+@@ -8452,6 +8465,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
  #configuration
  CONFIG += $QTCONFIG_CONFIG
  QT_ARCH = $CFG_ARCH
diff --git a/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
index 3dc1ea05627..118263c4933 100644
--- a/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
+++ b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-qmake_generators_makefile.cpp,v 1.1 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2012/04/09 09:12:49 adam Exp $
 
---- qmake/generators/makefile.cpp.orig	2012-01-06 20:25:45.000000000 +0000
+--- qmake/generators/makefile.cpp.orig	2012-03-14 14:01:12.000000000 +0000
 +++ qmake/generators/makefile.cpp
 @@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile()
              bundle = bundle.left(suffix);
@@ -9,5 +9,5 @@ $NetBSD: patch-qmake_generators_makefile.cpp,v 1.1 2012/01/12 22:59:58 adam Exp
 -        pkgConfiglibDir = "-L${libdir}";
 +        pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
          pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
+         pkgConfiglibName += project->first("TARGET_VERSION_EXT");
      }
-     t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp
index 2476ca05188..e73bc281ca0 100644
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp
+++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/16 20:42:46 hans Exp $
+$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/04/09 09:12:49 adam Exp $
 
---- src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2011-12-08 06:06:02.000000000 +0100
-+++ src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp	2012-01-15 02:26:20.184685861 +0100
+--- src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2012-03-14 14:01:26.000000000 +0000
++++ src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp
 @@ -20,6 +20,9 @@
   */
  
@@ -12,7 +12,7 @@ $NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker
  #include "MachineStackMarker.h"
  
  #include "ConservativeRoots.h"
-@@ -60,6 +63,10 @@
+@@ -64,6 +67,10 @@
  #include <unistd.h>
  
  #if OS(SOLARIS)
@@ -23,7 +23,7 @@ $NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker
  #include <thread.h>
  #else
  #include <pthread.h>
-@@ -331,6 +338,7 @@ typedef pthread_attr_t PlatformThreadReg
+@@ -341,6 +348,7 @@ typedef pthread_attr_t PlatformThreadReg
  #error Need a thread register struct for this platform
  #endif
  
@@ -31,7 +31,7 @@ $NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker
  static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
  {
  #if OS(DARWIN)
-@@ -381,6 +389,7 @@ static size_t getPlatformThreadRegisters
+@@ -391,6 +399,7 @@ static size_t getPlatformThreadRegisters
  #error Need a way to get thread registers on this platform
  #endif
  }
@@ -39,7 +39,7 @@ $NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker
  
  static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
  {
-@@ -431,6 +440,7 @@ static inline void* otherThreadStackPoin
+@@ -441,6 +450,7 @@ static inline void* otherThreadStackPoin
  #endif
  }
  
@@ -47,7 +47,7 @@ $NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker
  static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
  {
  #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
-@@ -439,24 +449,40 @@ static void freePlatformThreadRegisters(
+@@ -449,24 +459,40 @@ static void freePlatformThreadRegisters(
      UNUSED_PARAM(regs);
  #endif
  }
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h
index d3bded5711e..cff013ce3d5 100644
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h
+++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h,v 1.1 2012/02/16 20:42:46 hans Exp $
+$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h,v 1.2 2012/04/09 09:12:49 adam Exp $
 
 --- src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h.orig	2011-12-08 06:06:02.000000000 +0100
 +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h	2012-01-15 01:09:37.169459335 +0100
-@@ -248,7 +248,7 @@ inline int clampToInteger(unsigned value
+@@ -252,7 +252,7 @@ inline int clampToInteger(unsigned value
      return static_cast<int>(std::min(value, static_cast<unsigned>(std::numeric_limits<int>::max())));
  }
  
diff --git a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.h b/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.h
deleted file mode 100644
index 9df3845a972..00000000000
--- a/x11/qt4-libs/patches/patch-src_dbus_qdbusserver.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_dbus_qdbusserver.h,v 1.1 2012/01/23 08:16:36 joerg Exp $
-
-http://qt.gitorious.org/qt/qtbase/commit/3de1e6f26b692a8261b40decc2d81286b01c1461
-
---- src/dbus/qdbusserver.h.orig	2011-12-08 05:06:03.000000000 +0000
-+++ src/dbus/qdbusserver.h
-@@ -61,7 +61,8 @@ class Q_DBUS_EXPORT QDBusServer: public 
- {
-     Q_OBJECT
- public:
--    QDBusServer(const QString &address = "unix:tmpdir=/tmp", QObject *parent = 0);
-+    explicit QDBusServer(const QString &address, QObject *parent = 0);
-+    explicit QDBusServer(QObject *parent = 0);
-     virtual ~QDBusServer();
- 
-     bool isConnected() const;
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp
deleted file mode 100644
index 3ea40fbad82..00000000000
--- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl.cpp,v 1.1 2012/01/14 10:23:18 obache Exp $
-
-* fix build with -openssl-linked for OpenSSL 0.9.8*
-  http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a
-
---- src/network/ssl/qsslsocket_openssl.cpp.orig	2011-12-08 05:06:02.000000000 +0000
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -451,11 +451,7 @@ init_context:
-         if (!ace.isEmpty()
-             && !QHostAddress().setAddress(tlsHostName)
-             && !(configuration.sslOptions & QSsl::SslOptionDisableServerNameIndication)) {
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-             if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.data()))
--#else
--            if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.constData()))
--#endif
-                 qWarning("could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled");
-         }
-     }
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
index 6360f8aae51..88dbe2b7ab5 100644
--- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
+++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.3 2012/01/14 10:23:18 obache Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.4 2012/04/09 09:12:49 adam Exp $
 
 * fixes build with OpenSSL 0.9.9-dev
 * fix build with -openssl-linked for OpenSSL 0.9.8*
   http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a
 
---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2011-12-08 05:06:02.000000000 +0000
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2012-03-14 14:01:30.000000000 +0000
 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp
 @@ -171,7 +171,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke
  #endif
@@ -15,18 +15,7 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.3 2012/01/14
  DEFINEFUNC(SSL_CTX *, SSL_CTX_new, const SSL_METHOD *a, a, return 0, return)
  #else
  DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return 0, return)
-@@ -210,18 +210,14 @@ DEFINEFUNC(int, SSL_library_init, void, 
- DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
- DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
- DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
--#else
--DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, const void *parg, parg, return -1, return)
--#endif
- #endif
- DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return)
- DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG)
+@@ -217,7 +217,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
  DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG)
  DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG)
  DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return)
diff --git a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
index fd45503d906..b7066566fec 100644
--- a/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
+++ b/x11/qt4-libs/patches/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
@@ -1,11 +1,10 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.3 2012/01/14 10:23:18 obache Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.4 2012/04/09 09:12:49 adam Exp $
 
 * fixes build with OpenSSL 0.9.9-dev
 * fix build with -openssl-linked for OpenSSL 0.9.8*
   http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a
 
-
---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2011-12-08 05:06:02.000000000 +0000
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2012-03-14 14:01:30.000000000 +0000
 +++ src/network/ssl/qsslsocket_openssl_symbols_p.h
 @@ -279,7 +279,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX 
  #endif
@@ -16,18 +15,7 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols__p.h,v 1.3 2012/01/1
  SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
  #else
  SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a);
-@@ -318,18 +318,14 @@ int q_SSL_library_init();
- void q_SSL_load_error_strings();
- SSL *q_SSL_new(SSL_CTX *a);
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
- long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
--#else
--long q_SSL_ctrl(SSL *ssl,int cmd, long larg, const void *parg);
--#endif
- #endif
- int q_SSL_read(SSL *a, void *b, int c);
- void q_SSL_set_bio(SSL *a, BIO *b, BIO *c);
+@@ -325,7 +325,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
  void q_SSL_set_accept_state(SSL *a);
  void q_SSL_set_connect_state(SSL *a);
  int q_SSL_shutdown(SSL *a);