Update QT3 to 3.2.3.

Far too many new features and bug fixes to list here. Includes a fix for
Hangul (Korean character) handling from Bang Jun-Young <junyoung at netbsd
dot org>. Thanks.

"Better late than never"

7 files changed, 36 insertions, 67 deletions

diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa
index 3983e6e2cab..5748b72bd53 100644
--- a/x11/qt3-libs/patches/patch-aa
+++ b/x11/qt3-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2003/12/19 15:43:31 skrll Exp $
 
---- Makefile.orig	Thu May 30 09:42:36 2002
+--- Makefile.orig	2003-08-03 12:45:14.000000000 +0100
 +++ Makefile
-@@ -47,7 +47,7 @@
+@@ -52,7 +52,7 @@ tools-uninstall: .qmake.cache
  	cd tools && $(MAKE) uninstall
  tools-install: sub-tools
  	cd tools && $(MAKE) install
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $
 +sub-tools: FORCE
  	cd tools && $(MAKE)
  
- #qmake
+ #plugins
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
index 2eabcb34035..61bf8a8b021 100644
--- a/x11/qt3-libs/patches/patch-ad
+++ b/x11/qt3-libs/patches/patch-ad
@@ -1,22 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2003/10/23 07:48:21 junyoung Exp $
+$NetBSD: patch-ad,v 1.5 2003/12/19 15:43:31 skrll Exp $
 
---- src/kernel/qthread_unix.cpp.orig	2002-12-09 09:40:39.000000000 +0000
-+++ src/kernel/qthread_unix.cpp
-@@ -378,10 +378,17 @@ void QThread::start()
-     int ret;
-     pthread_attr_t attr;
-     pthread_attr_init( &attr );
-+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-     pthread_attr_setinheritsched( &attr, PTHREAD_INHERIT_SCHED );
-+#endif
-     pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
-     if ( d->stacksize > 0 ) {
-+#if defined(_POSIX_THREAD_ATTR_STACKSIZE)
- 	ret = pthread_attr_setstacksize( &attr, d->stacksize );
-+#else
-+	ret = 1;
-+#endif
-+
- 	if ( ret ) {
- #ifdef QT_CHECK_STATE
- 	    qWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ;
+--- src/kernel/qscriptengine_x11.cpp.orig	2003-11-10 10:22:02.000000000 +0000
++++ src/kernel/qscriptengine_x11.cpp
+@@ -2671,7 +2671,7 @@ static void hangul_shape_syllable( const
+     } else if (syllableLength == 3) {
+ 	int LIndex = ch[0].unicode() - Hangul_LBase;
+ 	int VIndex = ch[1].unicode() - Hangul_VBase;
+-	int TIndex = ch[1].unicode() - Hangul_TBase;
++	int TIndex = ch[2].unicode() - Hangul_TBase;
+ 	if (LIndex >= 0 && LIndex < Hangul_LCount &&
+ 	    VIndex >= 0 && VIndex < Hangul_VCount &&
+ 	    TIndex >= 0 && TIndex < Hangul_TCount )
diff --git a/x11/qt3-libs/patches/patch-ae b/x11/qt3-libs/patches/patch-ae
new file mode 100644
index 00000000000..e6eb20c93aa
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2003/12/19 15:43:31 skrll Exp $
+
+--- src/kernel/qinputcontext_x11.cpp.orig	2003-10-10 10:47:35.000000000 +0900
++++ src/kernel/qinputcontext_x11.cpp	2003-12-15 23:15:04.000000000 +0900
+@@ -255,9 +255,8 @@
+ 		qDebug( "compose emptied" );
+ #endif // QT_XIM_DEBUG
+ 
+-		// don't send an empty compose, since we will send an IMEnd with
+-		// either the correct compose text (or null text if the user has
+-		// cancelled the compose or deleted all chars).
++		QIMComposeEvent event( QEvent::IMCompose, qic->text, 0, 0 );
++		QApplication::sendEvent(qic->focusWidget, &event);
+ 		return 0;
+ 	    }
+ 	}
diff --git a/x11/qt3-libs/patches/patch-ag b/x11/qt3-libs/patches/patch-ag
deleted file mode 100644
index 725dd8e0043..00000000000
--- a/x11/qt3-libs/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/03/18 08:36:25 skrll Exp $
-
---- tools/designer/plugins/cppeditor/cppeditor.pro.orig	2003-01-14 17:56:20.000000000 +0000
-+++ tools/designer/plugins/cppeditor/cppeditor.pro
-@@ -13,7 +13,7 @@ INCLUDEPATH	+= ../../interfaces ../../ed
- win32{
-     LIBS	+= $$QT_BUILD_TREE/lib/editor.lib
- } else {
--    LIBS	+= -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.a
-+    LIBS	+= -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.la
- }
- 
- target.path += $$plugins.path/designer
diff --git a/x11/qt3-libs/patches/patch-ah b/x11/qt3-libs/patches/patch-ah
deleted file mode 100644
index 112b3064beb..00000000000
--- a/x11/qt3-libs/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/09/28 05:27:30 grant Exp $
-
---- configure.orig	2003-02-11 14:19:48.000000000 +1100
-+++ configure
-@@ -501,7 +501,6 @@ while [ "$#" -gt 0 ]; do
- 	    CFG_EXCEPTION_SUPPORT=no
- 	    QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-fno-exceptions\""
- 	    QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-fno-exceptions\""
--	    QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\""
- 	else
- 	    UNKNOWN_OPT=yes
- 	fi
diff --git a/x11/qt3-libs/patches/patch-bb b/x11/qt3-libs/patches/patch-bb
index e41fcc06c68..814cdbe24e6 100644
--- a/x11/qt3-libs/patches/patch-bb
+++ b/x11/qt3-libs/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2003/02/04 18:09:16 skrll Exp $
+$NetBSD: patch-bb,v 1.3 2003/12/19 15:43:31 skrll Exp $
 
---- src/sql/drivers/psql/qsql_psql.cpp.orig	Wed Jan  8 14:24:52 2003
+--- src/sql/drivers/psql/qsql_psql.cpp.orig	2003-05-27 16:34:03.000000000 +0100
 +++ src/sql/drivers/psql/qsql_psql.cpp
-@@ -44,14 +44,14 @@
+@@ -47,14 +47,14 @@
  #if defined(DEBUG)
  # undef DEBUG
  #endif
@@ -18,5 +18,5 @@ $NetBSD: patch-bb,v 1.2 2003/02/04 18:09:16 skrll Exp $
 -#include <catalog/pg_type.h>
 +#include <pgsql/server/catalog/pg_type.h>
  #undef errno
- #include <math.h>
  
+ QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
diff --git a/x11/qt3-libs/patches/patch-bd b/x11/qt3-libs/patches/patch-bd
deleted file mode 100644
index adb5df4620c..00000000000
--- a/x11/qt3-libs/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2003/07/22 17:17:20 drochner Exp $
-
---- tools/designer/designer/designer.pro.orig	2003-07-16 13:13:29.000000000 +0200
-+++ tools/designer/designer/designer.pro	2003-07-16 13:14:48.000000000 +0200
-@@ -416,7 +416,7 @@
- 
- INCLUDEPATH	+= ../shared ../uilib
- win32:LIBS	+= $$QT_BUILD_TREE/lib/qui.lib $$QT_BUILD_TREE/lib/qassistantclient.lib
--unix:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui $$QT_BUILD_TREE/lib/libqassistantclient.a
-+unix:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui -lqassistantclient
- 
- TRANSLATIONS	= designer_de.ts designer_fr.ts
-