From 088bdde597fa897632f4b03c0b896a3d1540e691 Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Tue, 11 Mar 2003 13:02:06 +0000
Subject: Update qt to 3.1.1.

Qt 3.1 introduces many significant new features and many improvements
over the 3.0.x series. Also lots of bugfixes.

The Qt version 3.1 series is binary compatible with the 3.0.x series:
applications compiled for 3.0 will continue to run with 3.1.
---
 x11/qt3-libs/Makefile.common  | 20 +++++++------
 x11/qt3-libs/PLIST            | 31 +++++++++++++--------
 x11/qt3-libs/buildlink2.mk    |  4 +--
 x11/qt3-libs/distinfo         | 12 ++++----
 x11/qt3-libs/files/qmake.conf |  8 ++++--
 x11/qt3-libs/patches/patch-ab | 23 ++++++++-------
 x11/qt3-libs/patches/patch-ac | 65 +++++++++++++++++++++++++++----------------
 x11/qt3-libs/patches/patch-ad | 48 +++++++++++++++++---------------
 8 files changed, 123 insertions(+), 88 deletions(-)

(limited to 'x11/qt3-libs')

diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 2442417066c..e84c9e465e2 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.12 2003/02/18 19:16:53 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2003/03/11 13:02:07 markd Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.trolltech.com/qt/source/ \
 			ftp://ftp.bero.org/pub/qt/source/
+EXTRACT_SUFX=		.tar.bz2
 
 .include "../qt3/Makefile.common"
 
@@ -16,11 +17,15 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_CXX=		yes
 USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	-shared -sm -thread \
+
+QTPREFIX=		${PREFIX}/qt3
+
+CONFIGURE_ARGS+=	-prefix ${QTPREFIX}
+CONFIGURE_ARGS+=	-shared -sm -thread -no-stl \
 			-system-zlib -system-libpng \
 			-system-libmng -system-libjpeg
-CONFIGURE_ARGS+=	-no-xinerama
 CONFIGURE_ARGS+=	-qt-gif	# qt3 does not write compressed GIFs
+CONFIGURE_ARGS+=	-no-g++-exceptions
 
 CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
@@ -38,15 +43,14 @@ SCRIPTS_ENV+=		HOME="${WRKDIR}"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
+CONFIGURE_SCRIPT=	${SH} ./configure
 CONFIGURE_ARGS+=	-platform solaris-g++
 SYS_LIBS=		-lresolv -lsocket -lnsl
 .endif
 
-# 
-# A cheat so that we don't have to set QTDIR at run-time to find the
-# plugins.
-# 
-CXXFLAGS+=		-DQT_INSTALL_PLUGINS=\\"${QTPREFIX}/plugins\\"
+.if !exists(${X11BASE}/lib/libXinerama.so)
+CONFIGURE_ARGS+=	-no-xinerama
+.endif
 
 #
 # Reverse the change to how templates are handled made between 3.0.4
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 3a883963f31..4d7bcaef9f5 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,10 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2003/02/04 18:09:16 skrll Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/03/11 13:02:07 markd 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
@@ -14,22 +9,30 @@ qt3/include/private/qcomponentfactory_p.h
 qt3/include/private/qcriticalsection_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/qgfxdriverinterface_p.h
 qt3/include/private/qgpluginmanager_p.h
 qt3/include/private/qimageformatinterface_p.h
 qt3/include/private/qinputcontext_p.h
 qt3/include/private/qinternal_p.h
+qt3/include/private/qkbddriverinterface_p.h
 qt3/include/private/qlayoutengine_p.h
 qt3/include/private/qlibrary_p.h
+qt3/include/private/qlock_p.h
+qt3/include/private/qmousedriverinterface_p.h
 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/qpsprinter_p.h
 qt3/include/private/qrichtext_p.h
+qt3/include/private/qsettings_p.h
 qt3/include/private/qsharedmemory_p.h
 qt3/include/private/qsqldriverinterface_p.h
+qt3/include/private/qsqlextension_p.h
 qt3/include/private/qsqlmanager_p.h
 qt3/include/private/qstyleinterface_p.h
 qt3/include/private/qsvgdevice_p.h
@@ -50,6 +53,7 @@ qt3/include/qapplication.h
 qt3/include/qarray.h
 qt3/include/qasciicache.h
 qt3/include/qasciidict.h
+qt3/include/qassistantclient.h
 qt3/include/qasyncimageio.h
 qt3/include/qasyncio.h
 qt3/include/qbig5codec.h
@@ -94,6 +98,7 @@ qt3/include/qdataview.h
 qt3/include/qdatetime.h
 qt3/include/qdatetimeedit.h
 qt3/include/qdatetm.h
+qt3/include/qdeepcopy.h
 qt3/include/qdesktopwidget.h
 qt3/include/qdial.h
 qt3/include/qdialog.h
@@ -113,6 +118,7 @@ qt3/include/qerrormessage.h
 qt3/include/qeucjpcodec.h
 qt3/include/qeuckrcodec.h
 qt3/include/qevent.h
+qt3/include/qeventloop.h
 qt3/include/qfeatures.h
 qt3/include/qfile.h
 qt3/include/qfiledef.h
@@ -194,8 +200,11 @@ qt3/include/qmime.h
 qt3/include/qmlined.h
 qt3/include/qmngio.h
 qt3/include/qmodules.h
+qt3/include/qmotif.h
+qt3/include/qmotifdialog.h
 qt3/include/qmotifplusstyle.h
 qt3/include/qmotifstyle.h
+qt3/include/qmotifwidget.h
 qt3/include/qmovie.h
 qt3/include/qmsgbox.h
 qt3/include/qmultilinedit.h
@@ -204,7 +213,6 @@ 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
@@ -312,6 +320,8 @@ qt3/include/qstyle.h
 qt3/include/qstylefactory.h
 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
@@ -328,14 +338,12 @@ qt3/include/qtextview.h
 qt3/include/qthread.h
 qt3/include/qtimer.h
 qt3/include/qtl.h
-qt3/include/qtmultilineedit.h
 qt3/include/qtoolbar.h
 qt3/include/qtoolbutton.h
 qt3/include/qtooltip.h
 qt3/include/qtranslator.h
 qt3/include/qtsciicodec.h
 qt3/include/qtstream.h
-qt3/include/qttableview.h
 qt3/include/qurl.h
 qt3/include/qurlinfo.h
 qt3/include/qurloperator.h
@@ -364,16 +372,17 @@ qt3/include/qwindefs.h
 qt3/include/qwindow.h
 qt3/include/qwindowdefs.h
 qt3/include/qwindowsstyle.h
+qt3/include/qwindowsxpstyle.h
 qt3/include/qwizard.h
 qt3/include/qwmatrix.h
 qt3/include/qworkspace.h
 qt3/include/qxml.h
-qt3/include/qxt.h
+qt3/include/qxtwidget.h
 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.0
+qt3/lib/libqt-mt.so.3.1
 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 8b665280e9a..4fed07b6a95 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/02/04 18:09:16 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/03/11 13:02:07 markd Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.7
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.1
 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 79320138c06..6c51c8c7909 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2003/02/04 18:09:16 skrll Exp $
+$NetBSD: distinfo,v 1.12 2003/03/11 13:02:08 markd Exp $
 
-SHA1 (qt-x11-free-3.0.7.tar.gz) = 9ca6f48dfc0f4a1d3ba711be595c4ac1a6bcbd9a
-Size (qt-x11-free-3.0.7.tar.gz) = 16098098 bytes
+SHA1 (qt-x11-free-3.1.1.tar.bz2) = c0175a264ee60fc65b062842bf4a6be9e1618da5
+Size (qt-x11-free-3.1.1.tar.bz2) = 12393902 bytes
 SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
-SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180
-SHA1 (patch-ac) = e68231282b24674498de446f1dc4e4f052fe1196
-SHA1 (patch-ad) = 197ba1f217635ad0b25d4709d0be9786ade079cc
+SHA1 (patch-ab) = e8c2bbb84c241df34f493fd9cf44209069f2495e
+SHA1 (patch-ac) = ea4a7e3c5cef4e366a1cea4985f0fa34efa8f34f
+SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index 192d658ce7d..f05bd6f3da5 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.7 2003/02/18 19:16:54 drochner Exp $
-# $Id: qmake.conf,v 1.7 2003/02/18 19:16:54 drochner Exp $
+# $NetBSD: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
+# $Id: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -21,6 +21,7 @@ QMAKE_CFLAGS_RELEASE	= -O2
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= 
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= @CXX@
 QMAKE_CXXFLAGS		= @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
@@ -31,6 +32,7 @@ QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		= @LOCALBASE@/include
 QMAKE_LIBDIR		= @LOCALBASE@/lib
@@ -81,7 +83,7 @@ QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
-QMAKE_AR		= true
+QMAKE_AR		= libtool --mode=link c++ -o 
 QMAKE_RANLIB		= true
 
 QMAKE_TAR		= tar -cf
diff --git a/x11/qt3-libs/patches/patch-ab b/x11/qt3-libs/patches/patch-ab
index 73b0548ff33..2d501980708 100644
--- a/x11/qt3-libs/patches/patch-ab
+++ b/x11/qt3-libs/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2002/05/04 13:30:11 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2003/03/11 13:02:08 markd Exp $
 
---- configure.orig	Mon Apr 22 22:03:46 2002
-+++ configure	Fri May  3 17:40:27 2002
-@@ -775,7 +775,7 @@
- # we may write in the build tree, let's take advantage of this
- # to test that QTDIR is correctly set to be the build tree
- touch .test.qt.
--if [ '!' -f ${QTDIR}/.test.qt. ]; then
-+if [ '!' -f .test.qt. ]; then
-     rm -f .test.qt.
-     echo
-     echo
+--- tools/designer/editor/editor.pro.orig	Wed Nov 20 11:07:43 2002
++++ tools/designer/editor/editor.pro
+@@ -1,6 +1,5 @@
+ TEMPLATE	= lib
+-CONFIG		+= qt warn_on staticlib
+-CONFIG		-= dll
++CONFIG		+= qt warn_on dll
+ HEADERS		= editor.h  \
+ 		  parenmatcher.h  \
+ 		  completion.h \
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac
index 8e9cd05fdfc..0a4598911e5 100644
--- a/x11/qt3-libs/patches/patch-ac
+++ b/x11/qt3-libs/patches/patch-ac
@@ -1,8 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2003/03/11 13:02:08 markd Exp $
 
---- src/tools/qdir_unix.cpp.orig	Thu Oct 17 15:08:58 2002
+--- src/tools/qdir_unix.cpp.orig	Mon Dec  9 22:40:32 2002
 +++ src/tools/qdir_unix.cpp
-@@ -82,10 +82,19 @@ QString QDir::canonicalPath() const
+@@ -36,6 +36,16 @@
+ **********************************************************************/
+ 
+ #include "qplatformdefs.h"
++
++#ifdef Q_TRAILING_DIR_SEP  // Some OSes doesn't support trailing /'s
++
++// POSIX Large File Support redefines truncate -> truncate64
++#if defined(truncate)
++# undef truncate
++#endif
++
++#endif
++
+ #include "qdir.h"
+ 
+ #ifndef QT_NO_DIR
+@@ -86,10 +96,19 @@
  
  bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
  {
@@ -13,19 +30,19 @@ $NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
 -	name = dirName.left( dirName.length() - 1 );
 +    int pos = name.length();
 +    if (pos > 0) {
-+	while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
-+	    --pos;
-+	};
-+	if ( pos == 0 ) {
-+	    name = QDir::rootDirPath();
-+	} else {
-+	    name.truncate( pos );
-+	}
++       while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
++	   --pos;
++       };
++       if ( pos == 0 ) {
++	   name = QDir::rootDirPath();
++       } else {
++	   name.truncate( pos );
++       }
 +    }
-     return QT_MKDIR( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
+     return ::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
  	== 0;
  #else
-@@ -96,7 +105,24 @@ bool QDir::mkdir( const QString &dirName
+@@ -100,7 +119,24 @@
  
  bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const
  {
@@ -33,19 +50,19 @@ $NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
 +    QString name = dirName;
 +    int pos = name.length();
 +    if (pos > 0) {
-+	while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
-+	    --pos;
-+	};
-+	if ( pos == 0 ) {
-+	    name = QDir::rootDirPath();
-+	} else {
-+	    name.truncate( pos );
-+	}
++       while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
++	   --pos;
++       };
++       if ( pos == 0 ) {
++	   name = QDir::rootDirPath();
++       } else {
++	   name.truncate( pos );
++       }
 +    }
-+    return QT_RMDIR( QFile::encodeName(filePath(name,acceptAbsPath)) )
-+	== 0;
++    return ::rmdir( QFile::encodeName(filePath(name,acceptAbsPath)) )
++       == 0;
 +#else
-     return QT_RMDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0;
+     return ::rmdir( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0;
 +#endif
  }
  
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
index 241ef83148f..5c53ce20b29 100644
--- a/x11/qt3-libs/patches/patch-ad
+++ b/x11/qt3-libs/patches/patch-ad
@@ -1,28 +1,32 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 18:40:47 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2003/03/11 13:02:09 markd Exp $
 
---- src/kernel/qthread_unix.cpp.orig	Fri May 24 16:43:12 2002
+--- src/kernel/qthread_unix.cpp.orig	2002-12-09 09:40:39.000000000 +0000
 +++ src/kernel/qthread_unix.cpp
-@@ -87,6 +87,7 @@
- // helpers
- #define Q_THREAD_SELF()    pthread_self()
- #define Q_THREAD_EXIT(a)   pthread_exit((a))
+@@ -378,10 +378,17 @@ void QThread::start()
+     int ret;
+     pthread_attr_t attr;
+     pthread_attr_init( &attr );
 +#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
- #define Q_THREAD_CREATE(a) pthread_attr_t attr; \
-                            pthread_attr_init(&attr); \
- 	                   pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); \
-@@ -94,6 +95,15 @@
- 	                   (a) = pthread_create(&thread_id, &attr, start_thread, \
-                                                 (void *) that); \
- 	                   pthread_attr_destroy(&attr);
+     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
-+#define Q_THREAD_CREATE(a) pthread_attr_t attr; \
-+                           pthread_attr_init(&attr); \
-+                           pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); \
-+	                   (a) = pthread_create(&thread_id, &attr, start_thread, \
-+                                                (void *) that); \
-+	                   pthread_attr_destroy(&attr);
++	ret = 1;
 +#endif
 +
- #endif // Q_OS_SOLARIS
- 
- 
+ 	if ( ret ) {
+ #ifdef QT_CHECK_STATE
+ 	    qWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ;
+@@ -392,7 +399,8 @@ void QThread::start()
+ 	    d->running = FALSE;
+ 	    d->finished = FALSE;
+ 	    return;
+-	}
++        }
++
+     }
+     d->args[0] = this;
+     d->args[1] = d;
-- 
cgit v1.2.3