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"

11 files changed, 67 insertions, 96 deletions

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 23d6e75d54f..2480bc9a8c7 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/11/30 22:58:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/12/19 15:43:31 skrll Exp $
 #
 
 LIBQT=			${WRKSRC}/lib/libqt-mt.la
@@ -6,7 +6,6 @@ LIBQT=			${WRKSRC}/lib/libqt-mt.la
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-libs-${QTVERSION}
-PKGREVISION=		3
 COMMENT=		C++ X GUI toolkit
 
 USE_BUILDLINK2=		yes
@@ -18,12 +17,6 @@ PTHREAD_OPTS+=		require
 
 UNLIMIT_RESOURCES=	datasize
 
-post-extract:
-	${RM} -f ${WRKSRC}/include/qmotif.h
-	${RM} -f ${WRKSRC}/include/qmotifdialog.h
-	${RM} -f ${WRKSRC}/include/qmotifwidget.h
-	${RM} -f ${WRKSRC}/include/qxtwidget.h
-
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index ff5b7b6ab8a..2b098f516e4 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2003/03/19 17:29:50 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 2003/12/19 15:43:31 skrll Exp $
 qt3/bin/moc
+qt3/include/jri.h
+qt3/include/jri_md.h
+qt3/include/jritypes.h
+qt3/include/npapi.h
+qt3/include/npupp.h
 qt3/include/private/qapplication_p.h
 qt3/include/private/qcolor_p.h
 qt3/include/private/qcom_p.h
@@ -7,12 +12,14 @@ qt3/include/private/qcomlibrary_p.h
 qt3/include/private/qcomplextext_p.h
 qt3/include/private/qcomponentfactory_p.h
 qt3/include/private/qcriticalsection_p.h
+qt3/include/private/qdialogbuttons_p.h
 qt3/include/private/qdir_p.h
 qt3/include/private/qeffects_p.h
 qt3/include/private/qeventloop_p.h
 qt3/include/private/qfiledefs_p.h
 qt3/include/private/qfontcodecs_p.h
 qt3/include/private/qfontdata_p.h
+qt3/include/private/qfontengine_p.h
 qt3/include/private/qgfxdriverinterface_p.h
 qt3/include/private/qgpluginmanager_p.h
 qt3/include/private/qimageformatinterface_p.h
@@ -27,8 +34,10 @@ qt3/include/private/qmutex_p.h
 qt3/include/private/qmutexpool_p.h
 qt3/include/private/qpainter_p.h
 qt3/include/private/qpluginmanager_p.h
+qt3/include/private/qprinter_p.h
 qt3/include/private/qpsprinter_p.h
 qt3/include/private/qrichtext_p.h
+qt3/include/private/qscriptengine_p.h
 qt3/include/private/qsettings_p.h
 qt3/include/private/qsharedmemory_p.h
 qt3/include/private/qsqldriverinterface_p.h
@@ -36,19 +45,18 @@ qt3/include/private/qsqlextension_p.h
 qt3/include/private/qsqlmanager_p.h
 qt3/include/private/qstyleinterface_p.h
 qt3/include/private/qsvgdevice_p.h
+qt3/include/private/qt_x11_p.h
 qt3/include/private/qtextcodecinterface_p.h
+qt3/include/private/qtextengine_p.h
+qt3/include/private/qtextlayout_p.h
+qt3/include/private/qthreadinstance_p.h
 qt3/include/private/qtitlebar_p.h
 qt3/include/private/qucom_p.h
 qt3/include/private/qucomextra_p.h
+qt3/include/private/qunicodetables_p.h
 qt3/include/private/qwidget_p.h
 qt3/include/private/qwidgetinterface_p.h
 qt3/include/private/qwidgetresizehandler_p.h
-qt3/include/jri.h
-qt3/include/jri_md.h
-qt3/include/jritypes.h
-qt3/include/npapi.h
-qt3/include/npupp.h
-qt3/include/qnp.h
 qt3/include/q1xcompatibility.h
 qt3/include/qabstractlayout.h
 qt3/include/qaccel.h
@@ -216,6 +224,7 @@ qt3/include/qmutex.h
 qt3/include/qnamespace.h
 qt3/include/qnetwork.h
 qt3/include/qnetworkprotocol.h
+qt3/include/qnp.h
 qt3/include/qobjcoll.h
 qt3/include/qobjdefs.h
 qt3/include/qobject.h
@@ -298,6 +307,7 @@ qt3/include/qsocknot.h
 qt3/include/qsortedlist.h
 qt3/include/qsound.h
 qt3/include/qspinbox.h
+qt3/include/qsplashscreen.h
 qt3/include/qsplitter.h
 qt3/include/qsql.h
 qt3/include/qsqlcursor.h
@@ -313,6 +323,7 @@ qt3/include/qsqlpropertymap.h
 qt3/include/qsqlquery.h
 qt3/include/qsqlrecord.h
 qt3/include/qsqlresult.h
+qt3/include/qsqlselectcursor.h
 qt3/include/qstack.h
 qt3/include/qstatusbar.h
 qt3/include/qstring.h
@@ -325,7 +336,6 @@ qt3/include/qstyleplugin.h
 qt3/include/qstylesheet.h
 qt3/include/qsyntaxhighlighter.h
 qt3/include/qt.h
-qt3/include/qt_x11.h
 qt3/include/qtabbar.h
 qt3/include/qtabdialog.h
 qt3/include/qtabdlg.h
@@ -339,9 +349,11 @@ qt3/include/qtextedit.h
 qt3/include/qtextstream.h
 qt3/include/qtextview.h
 qt3/include/qthread.h
+qt3/include/qthreadstorage.h
 qt3/include/qtimer.h
 qt3/include/qtl.h
 qt3/include/qtoolbar.h
+qt3/include/qtoolbox.h
 qt3/include/qtoolbutton.h
 qt3/include/qtooltip.h
 qt3/include/qtranslator.h
@@ -375,7 +387,6 @@ qt3/include/qwindefs.h
 qt3/include/qwindow.h
 qt3/include/qwindowdefs.h
 qt3/include/qwindowsstyle.h
-qt3/include/qwindowsxpstyle.h
 qt3/include/qwinexport.h
 qt3/include/qwizard.h
 qt3/include/qwmatrix.h
@@ -385,7 +396,7 @@ qt3/lib/libqt-mt.a
 qt3/lib/libqt-mt.la
 qt3/lib/libqt-mt.so
 qt3/lib/libqt-mt.so.3
-qt3/lib/libqt-mt.so.3.1
+qt3/lib/libqt-mt.so.3.2
 qt3/plugins/imageformats/libqjpeg.a
 qt3/plugins/imageformats/libqjpeg.la
 qt3/plugins/imageformats/libqjpeg.so
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index ae5678c97d8..5023f0af9be 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.16 2003/08/06 10:45:02 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.17 2003/12/19 15:43:31 skrll Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.2nb2
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.2.3
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 4319e298fa7..b02a8365a80 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.16 2003/10/23 07:48:21 junyoung Exp $
+$NetBSD: distinfo,v 1.17 2003/12/19 15:43:31 skrll Exp $
 
-SHA1 (qt-x11-free-3.1.2.tar.bz2) = eddcf56d34c4ee98fd2b48be6b6aa32b66f302a5
-Size (qt-x11-free-3.1.2.tar.bz2) = 13358932 bytes
-SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
+SHA1 (qt-x11-free-3.2.3.tar.bz2) = 51a2532d298b24edd27b475c9de9209134c074ae
+Size (qt-x11-free-3.2.3.tar.bz2) = 13952198 bytes
+SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512
-SHA1 (patch-ad) = f201ded67a3ae2001d5d66df43222b6ee7bd33c0
-SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a
-SHA1 (patch-ah) = 4f608169d9b2fa190844bf2ab5efaae2ed28e7b2
+SHA1 (patch-ad) = 3d638078a207d5062d9a758d53053e85b1c22426
+SHA1 (patch-ae) = 16f35100cccc0b3e325fc8a2fd049bab5aca8056
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
-SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
+SHA1 (patch-bb) = 3615a92dc2022d4cdfe21a7068ad966dfbb09e36
 SHA1 (patch-bc) = 1dcf6b9583461525400bd62b625f8cf7f5b41a5f
-SHA1 (patch-bd) = 06ac1c48f91887d8414df8f69dc79e023da0f6f1
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
-