Qt 4.8.4 is a bug-fix release. It maintains both forward and backward

compatibility (source and binary) with Qt 4.8.0, 4.8.1, 4.8.2 and 4.8.3.
For more details, refer to the online documentation included in this
distribution. The documentation is also available online:

http://qt-project.org/doc/4.8

The Qt version 4.8 series is binary compatible with the 4.7.x series.
Applications compiled for 4.7 will continue to run with 4.8.

Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Qt Bug Tracker or the Merge Request queue
of the public source repository.

8 files changed, 37 insertions, 36 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index d31256c8ca3..e471d400289 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2012/11/19 10:51:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.83 2012/12/07 10:06:13 adam Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	5
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index b5024713c7d..d33873bf13c 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.81 2012/11/19 10:51:44 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2012/12/07 10:06:13 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.8.3.tar.gz) = bc352a283610e0cd2fe0dbedbc45613844090fcb
-RMD160 (qt-everywhere-opensource-src-4.8.3.tar.gz) = fe56e5da874503a79d6f84a1e15460eba5a6feae
-Size (qt-everywhere-opensource-src-4.8.3.tar.gz) = 233635127 bytes
+SHA1 (qt-everywhere-opensource-src-4.8.4.tar.gz) = f5880f11c139d7d8d01ecb8d874535f7d9553198
+RMD160 (qt-everywhere-opensource-src-4.8.4.tar.gz) = 3c09a3b1411385d0917225f01ac2ff3a2ce83fda
+Size (qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 bytes
 SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -19,12 +19,12 @@ SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
 SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = acff9d38a341a0d686c0379886ee92126d8a950c
+SHA1 (patch-aq) = 5821207c6c2340dd048cb29be23b56af27d5ef79
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
-SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
+SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f
 SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
 SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
 SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
@@ -32,7 +32,7 @@ SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773
 SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd
 SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557
 SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019
-SHA1 (patch-bg) = 76175e659be041ba02c1c07fe8e8fceb029e6759
+SHA1 (patch-bg) = 50d10a94b98b2e0cd8aa1a05dfc1e002c0f2ef2f
 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
 SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
 SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
@@ -51,7 +51,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908
 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_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
-SHA1 (patch-src_corelib_io_io.pri) = eb8ada83d1d5ba18ec4cc8d0ab72d4a400112191
-SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 3eef33da6498014a95f6ef9ff2df2eefcfd736db
-SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 67744fd7eb821cbff5a763c85fc080270bd86922
+SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
+SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
+SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index a58abb43893..3008e6fd2cc 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
+$NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $
 
---- configure.orig	2012-03-14 14:01:12.000000000 +0000
+--- configure.orig	2012-11-23 10:11:23.000000000 +0000
 +++ configure
-@@ -3100,13 +3100,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3224,13 +3224,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
@@ -18,7 +18,7 @@ $NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
          if [ "$OPT_VERBOSE" = "yes" ]; then
              echo "    64-bit PowerPC (powerpc)"
          fi
-@@ -3130,6 +3130,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3254,6 +3254,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
          fi
          CFG_HOST_ARCH=sparc
          ;;
@@ -38,7 +38,7 @@ $NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
      QNX:*:*)
          case "$UNAME_MACHINE" in
          x86pc)
-@@ -3466,7 +3479,7 @@ fi
+@@ -3562,7 +3575,7 @@ fi
  if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
      # get the darwin version. 10.0.0 and up means snow leopard.
      VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -47,7 +47,7 @@ $NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
          echo
          echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
          echo
-@@ -4970,7 +4983,7 @@ if true; then ###[ '!' -f "$outpath/bin/
+@@ -5049,7 +5062,7 @@ if true; then ###[ '!' -f "$outpath/bin/
      done
  
      QMAKE_BUILD_ERROR=no
@@ -56,7 +56,7 @@ $NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
      [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
      [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
      [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
-@@ -6994,7 +7007,7 @@ fi
+@@ -7140,7 +7153,7 @@ fi
  # select Carbon on 10.4 Tiger.
  if [ "$PLATFORM_MAC" = "yes" ]; then
      VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -65,7 +65,7 @@ $NetBSD: patch-aq,v 1.12 2012/04/09 09:12:49 adam Exp $
          CFG_MAC_COCOA="no";
          CFG_MAC_CARBON="yes";
      fi
-@@ -8247,7 +8260,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+@@ -8402,7 +8415,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.12 2012/04/09 09:12:49 adam Exp $
  
  if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
      [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
-@@ -8452,6 +8465,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
+@@ -8618,6 +8631,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
  #configuration
  CONFIG += $QTCONFIG_CONFIG
  QT_ARCH = $CFG_ARCH
diff --git a/x11/qt4-libs/patches/patch-aw b/x11/qt4-libs/patches/patch-aw
index a0da8cf79b5..deaf5767a57 100644
--- a/x11/qt4-libs/patches/patch-aw
+++ b/x11/qt4-libs/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.2 2010/07/04 06:00:14 adam Exp $
+$NetBSD: patch-aw,v 1.3 2012/12/07 10:06:13 adam Exp $
 
 --- src/network/kernel/qhostinfo_unix.cpp.orig	2010-06-02 02:03:17.000000000 +0000
 +++ src/network/kernel/qhostinfo_unix.cpp
-@@ -117,6 +117,8 @@ static void resolveLibrary()
+@@ -118,6 +118,8 @@ static void resolveLibrary()
          if (!local_res_nclose)
              local_res_ninit = 0;
      }
diff --git a/x11/qt4-libs/patches/patch-bg b/x11/qt4-libs/patches/patch-bg
index 108040ad3eb..3cce784621e 100644
--- a/x11/qt4-libs/patches/patch-bg
+++ b/x11/qt4-libs/patches/patch-bg
@@ -1,10 +1,10 @@
-$NetBSD: patch-bg,v 1.2 2012/01/12 22:59:58 adam Exp $
+$NetBSD: patch-bg,v 1.3 2012/12/07 10:06:13 adam Exp $
 
 this ends up going into non-const-able interfaces inside qt4
 
 --- src/dbus/qdbusintegrator.cpp.orig	2011-03-30 05:19:07.000000000 +0000
 +++ src/dbus/qdbusintegrator.cpp	2011-08-08 21:44:34.000000000 +0000
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@
  static bool isDebugging;
  #define qDBusDebug              if (!::isDebugging); else qDebug
  
diff --git a/x11/qt4-libs/patches/patch-src_corelib_io_io.pri b/x11/qt4-libs/patches/patch-src_corelib_io_io.pri
index f4317963301..7f7009739ee 100644
--- a/x11/qt4-libs/patches/patch-src_corelib_io_io.pri
+++ b/x11/qt4-libs/patches/patch-src_corelib_io_io.pri
@@ -1,9 +1,10 @@
-$NetBSD: patch-src_corelib_io_io.pri,v 1.1 2012/09/12 17:02:50 jaapb Exp $
+$NetBSD: patch-src_corelib_io_io.pri,v 1.2 2012/12/07 10:06:13 adam Exp $
 
 Use kqueue instead of fam to monitor the file system
+
 --- src/corelib/io/io.pri.orig	2012-04-26 19:46:08.000000000 +0000
 +++ src/corelib/io/io.pri
-@@ -103,7 +103,7 @@ win32 {
+@@ -108,7 +108,7 @@ win32 {
          }
  
          !nacl {
diff --git a/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp b/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp
index 176f42cb5ff..bab2c44d36a 100644
--- a/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp
+++ b/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp
@@ -1,18 +1,19 @@
-$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.1 2012/09/12 17:02:50 jaapb Exp $
+$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.2 2012/12/07 10:06:13 adam Exp $
 
 Use kqueue instead of fam to monitor the file system
---- src/corelib/io/qfilesystemwatcher.cpp.orig	2012-04-26 19:46:08.000000000 +0000
+
+--- src/corelib/io/qfilesystemwatcher.cpp.orig	2012-11-23 10:09:55.000000000 +0000
 +++ src/corelib/io/qfilesystemwatcher.cpp
-@@ -57,7 +57,7 @@
- #elif defined(Q_OS_LINUX)
- #  include "qfilesystemwatcher_inotify_p.h"
+@@ -59,7 +59,7 @@
  #  include "qfilesystemwatcher_dnotify_p.h"
+ #elif defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY)
+ #  include "qfilesystemwatcher_inotify_p.h"
 -#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
 +#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD)
  #  if (defined Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
  #  include "qfilesystemwatcher_fsevents_p.h"
  #  endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-@@ -253,7 +253,7 @@ QFileSystemWatcherEngine *QFileSystemWat
+@@ -257,7 +257,7 @@ QFileSystemWatcherEngine *QFileSystemWat
      if(!eng)
          eng = QDnotifyFileSystemWatcherEngine::create();
      return eng;
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 88dbe2b7ab5..bb19f925453 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,4 +1,4 @@
-$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.4 2012/04/09 09:12:49 adam Exp $
+$NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.5 2012/12/07 10:06:13 adam Exp $
 
 * fixes build with OpenSSL 0.9.9-dev
 * fix build with -openssl-linked for OpenSSL 0.9.8*
@@ -6,7 +6,7 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.4 2012/04/09
 
 --- 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
+@@ -174,7 +174,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke
  #endif
  DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return)
  DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG)
@@ -15,7 +15,7 @@ $NetBSD: patch-src_network_ssl_qsslsocket__openssl__symbols.cpp,v 1.4 2012/04/09
  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)
-@@ -217,7 +217,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
+@@ -220,7 +220,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)