Update to qt3 3.3.2.

Qt 3.3.2 is a bugfix release. It maintains both forward and backward
compatibility (source and binary) with Qt 3.3.1 and Qt 3.3.0.

X11 specific fixes:

Fixed crash bug when using X Input Method Chinput.

- Drag and Drop
        Ignores accelerator events when dragging.

- QClipboard
        Fixed bug where data()->format() would return the wrong value.
        Fixed potential crashes with regards to iterators.

- QFont
        Avoids badly scaled fonts, and prefers exact matches.
        Made sure symbol fonts get loaded correctly.
        Made it possible to load Latin fonts that do not contain the
        Euro symbol.
        Fixed glyph width bug observed with some Khmer fonts.
        Fixed crash with misconfigured Xft.
        Fixed problem with font selection for Xft2 when having Latin
        text with non-Latin locale.
        Respects custom dpi settings for Xft.
        Does not use Xft if we have FreeType1 but no XRender.
        Fixed memory leak in the font engine when drawing transformed
        fonts.

- QGL
        Fixed crash when rendering text in GL widgets.

- QLocale
        Tru64: Fixed crash when INFINITY is compared to another double.
        Tru64: Uses DBL_INFINITY for Compaq C++ compiler.

- QMimeSource
        Does not re-enter the event loop in provides().

- QPainter
        Fixed rendering of anti-aliased text on non-XRender enabled
        displays.

- QPrinter
        Fixed setFromTo().
        Fixed printing of Arabic text with XLFD fonts.

- QTextEdit
        Fixed bug with extremely long lines.

- QThread
        Fixed bug that made program require superuser privileges on
        some Linux machines.

- QWidget
        Fixed showFullScreen() and showMaximized() for window managers
        that do not support extended window manager hints (EWMH).

3 files changed, 5 insertions, 102 deletions

diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 48136ec5475..3e9457b2ff7 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.18 2004/04/16 14:30:45 recht Exp $
+$NetBSD: distinfo,v 1.19 2004/04/29 12:53:05 markd Exp $
 
-SHA1 (qt-x11-free-3.3.1.tar.bz2) = 55cefb492643dc739883d2d3073209419330c059
-Size (qt-x11-free-3.3.1.tar.bz2) = 14397600 bytes
+SHA1 (qt-x11-free-3.3.2.tar.bz2) = 18b0a1dafbdbe446814949bc814a9c070419743e
+Size (qt-x11-free-3.3.2.tar.bz2) = 14434821 bytes
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
 SHA1 (patch-ae) = 16f35100cccc0b3e325fc8a2fd049bab5aca8056
-SHA1 (patch-af) = cdd5e10d3ae71e288ff0de4995aef3622c1f226e
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 3615a92dc2022d4cdfe21a7068ad966dfbb09e36
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
diff --git a/x11/qt3-libs/patches/patch-af b/x11/qt3-libs/patches/patch-af
deleted file mode 100644
index 821ca7d6df5..00000000000
--- a/x11/qt3-libs/patches/patch-af
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/04/16 14:30:45 recht Exp $
-
---- src/kernel/qclipboard_x11.cpp.orig	2004-02-18 14:22:48.000000000 +0100
-+++ src/kernel/qclipboard_x11.cpp	2004-04-15 01:54:07.000000000 +0200
-@@ -112,10 +112,6 @@
- 
- // event capture mechanism for qt_xclb_wait_for_event
- static bool waiting_for_data = FALSE;
--static bool has_captured_event = FALSE;
--static Window capture_event_win = None;
--static int capture_event_type = -1;
--static XEvent captured_event;
- 
- class QClipboardWatcher; // forward decl
- static QClipboardWatcher *selection_watcher = 0;
-@@ -432,69 +428,36 @@
- { return inSelectionMode_obsolete; }
- 
- 
--// event filter function... captures interesting events while
--// qt_xclb_wait_for_event is running the event loop
--static int qt_xclb_event_filter(XEvent *event)
--{
--    if (event->xany.type == capture_event_type &&
--	event->xany.window == capture_event_win) {
--	VDEBUG( "QClipboard: event_filter(): caught event type %d", event->type );
--	has_captured_event = TRUE;
--	captured_event = *event;
--	return 1;
--    }
--
--    return 0;
--}
--
- bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
- 			     int timeout )
- {
--    if ( waiting_for_data )
--	qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" );
--
--    waiting_for_data = TRUE;
--
-     QTime started = QTime::currentTime();
-     QTime now = started;
--
--    has_captured_event = FALSE;
--    capture_event_win = win;
--    capture_event_type = type;
--
--    QX11EventFilter old_event_filter = qt_set_x11_event_filter(qt_xclb_event_filter);
-+    bool flushed = FALSE;
- 
-     do {
--	if ( XCheckTypedWindowEvent(dpy,win,type,event) ) {
--	    waiting_for_data = FALSE;
--	    qt_set_x11_event_filter(old_event_filter);
-+	if ( XCheckTypedWindowEvent(dpy,win,type,event) )
- 	    return TRUE;
--	}
- 
- 	now = QTime::currentTime();
- 	if ( started > now )			// crossed midnight
- 	    started = now;
- 
--	// 0x08 == ExcludeTimers for X11 only
--	qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput |
--					  QEventLoop::ExcludeSocketNotifiers |
--					  QEventLoop::WaitForMore | 0x08 );
--
--	if ( has_captured_event ) {
--	    waiting_for_data = FALSE;
--	    *event = captured_event;
--	    qt_set_x11_event_filter(old_event_filter);
--	    return TRUE;
-+	if(!flushed) {
-+	    XFlush( dpy );
-+	    flushed = TRUE;
- 	}
--    } while ( started.msecsTo(now) < timeout );
- 
--    waiting_for_data = FALSE;
--    qt_set_x11_event_filter(old_event_filter);
-+	// sleep 50ms, so we don't use up CPU cycles all the time.
-+	struct timeval usleep_tv;
-+	usleep_tv.tv_sec = 0;
-+	usleep_tv.tv_usec = 50000;
-+	select(0, 0, 0, 0, &usleep_tv);
-+    } while ( started.msecsTo(now) < timeout );
- 
-     return FALSE;
- }
- 
--
- static inline int maxSelectionIncr( Display *dpy )
- { return XMaxRequestSize(dpy) > 65536 ? 65536*4 : XMaxRequestSize(dpy)*4 - 100; }
- 
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index d7bf27c7ce2..c75b18703a3 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.13 2004/04/16 14:30:44 recht Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/04/29 12:53:05 markd Exp $
 #
 
-QTVERSION=	3.3.1
+QTVERSION=	3.3.2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html