Update qt to 3.0.7 - the final maintenance release of qt 3.0.

Lots of bugfixes including one for the ListView expansion problem.

Fix kwin in kdebase after a QT global was renamed.

17 files changed, 69 insertions, 48 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 2168aed5862..c64e8449339 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.1317 2003/02/04 11:26:40 chris Exp $
+$NetBSD: CHANGES,v 1.1318 2003/02/04 18:06:48 skrll Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -549,3 +549,9 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated spim to 6.5 [dmcmahill 2003-02-03]
 	Updated etcupdate to 20030204 [martti 2003-02-04]
 	Updated sylpheed to 0.8.10 [chris 2003-02-04]
+	Updated qt3-libs to 3.0.7 [skrll 2003-02-04]
+	Updated qt3-tools to 3.0.7 [skrll 2003-02-04]
+	Updated qt3-docs to 3.0.7 [skrll 2003-02-04]
+	Updated qt3-psql to 3.0.7 [skrll 2003-02-04]
+	Updated qt3-mysql to 3.0.7 [skrll 2003-02-04]
+	Updated qt3 to 3.0.7 [skrll 2003-02-04]
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 071f180b4d2..7ea85504faf 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:35 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/02/04 18:06:50 skrll Exp $
 
 DISTNAME=	kdebase-3.0.5a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index fe1e0307cf2..469601d4cb2 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2003/01/31 11:43:32 skrll Exp $
+$NetBSD: distinfo,v 1.19 2003/02/04 18:06:50 skrll Exp $
 
 SHA1 (kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1
 Size (kdebase-3.0.5a.tar.bz2) = 13117676 bytes
@@ -106,3 +106,4 @@ SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1
 SHA1 (patch-ep) = 77d65151a6e74adcfc1143ced2cb393d08029b2c
 SHA1 (patch-eq) = e83191cdc198b4e36cc50cbd14adbe4c3c7e9e8a
 SHA1 (patch-er) = 5f385cb7708287d711ddea17518b4a2284e0b2fc
+SHA1 (patch-es) = 4d0b2012db5db034cbcbca394dfa66250f5556aa
diff --git a/x11/kdebase3/patches/patch-es b/x11/kdebase3/patches/patch-es
new file mode 100644
index 00000000000..a11d20fb288
--- /dev/null
+++ b/x11/kdebase3/patches/patch-es
@@ -0,0 +1,22 @@
+$NetBSD: patch-es,v 1.4 2003/02/04 18:06:50 skrll Exp $
+
+--- kwin/client.cpp.orig	Mon Jun 24 12:57:29 2002
++++ kwin/client.cpp
+@@ -104,7 +104,7 @@ public:
+ 
+ extern Atom qt_wm_state;
+ extern Time qt_x_time;
+-extern Atom qt_window_role;
++extern Atom qt_wm_window_role;
+ extern Atom qt_sm_client_id;
+ 
+ static int nullErrorHandler(Display *, XErrorEvent *)
+@@ -2775,7 +2775,7 @@ static QCString getStringProperty(WId w,
+  */
+ QCString Client::staticWindowRole(WId w)
+ {
+-    return getStringProperty(w, qt_window_role);
++    return getStringProperty(w, qt_wm_window_role);
+ }
+ 
+ /*!
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 8b49489783c..829eed60942 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/20 10:04:18 skrll Exp $
+# $NetBSD: Makefile,v 1.21 2003/02/04 18:06:50 skrll Exp $
 
 DISTNAME=	kdelibs-3.0.5a
 CATEGORIES=	x11
@@ -8,7 +8,7 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 CONFLICTS+=	koffice3<=1.1.1
 
-BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.0.3
+BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.0.7
 
 USE_BUILDLINK2=		YES
 USE_CXX=		YES
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index 40a27eec1b4..e981225497c 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/01/02 09:12:38 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/02/04 18:06:50 skrll Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
@@ -18,7 +18,7 @@ BUILDLINK_FILES_CMD.kdelibs3= \
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs3}
 
 BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.0.3
+BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.0.7
 USE_OPENSSL_VERSION=		${OPENSSL_VERSION_096}
 
 .include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index 2d2d953d834..392a65a9d64 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/12/24 06:10:34 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/02/04 18:09:15 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-docs-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 USE_BUILDLINK2=	yes
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 81723ba1d9b..5d7459787db 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/12/24 06:10:34 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/02/04 18:09:16 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-libs-${QTVERSION}
-PKGREVISION=		1
 COMMENT=		C++ X GUI toolkit
 
 USE_BUILDLINK2=		yes
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 4fc2258fd2e..3a883963f31 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/10/28 08:46:44 skrll Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/02/04 18:09:16 skrll Exp $
 qt3/bin/moc
 qt3/include/jri.h
 qt3/include/jri_md.h
@@ -312,7 +312,6 @@ qt3/include/qstyle.h
 qt3/include/qstylefactory.h
 qt3/include/qstyleplugin.h
 qt3/include/qstylesheet.h
-qt3/include/qt.h
 qt3/include/qt_x11.h
 qt3/include/qtabbar.h
 qt3/include/qtabdialog.h
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index c4268858e13..8b665280e9a 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/12/24 06:10:35 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/02/04 18:09:16 skrll Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.6nb1
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.7
 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 d5ea7090232..79320138c06 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2002/10/28 10:46:06 drochner Exp $
+$NetBSD: distinfo,v 1.11 2003/02/04 18:09:16 skrll Exp $
 
-SHA1 (qt-x11-free-3.0.6.tar.gz) = 7fb6a9d17091d9a60dd18fb3235098a17f142542
-Size (qt-x11-free-3.0.6.tar.gz) = 16062069 bytes
+SHA1 (qt-x11-free-3.0.7.tar.gz) = 9ca6f48dfc0f4a1d3ba711be595c4ac1a6bcbd9a
+Size (qt-x11-free-3.0.7.tar.gz) = 16098098 bytes
 SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
 SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180
 SHA1 (patch-ac) = e68231282b24674498de446f1dc4e4f052fe1196
 SHA1 (patch-ad) = 197ba1f217635ad0b25d4709d0be9786ade079cc
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
-SHA1 (patch-bb) = 72fe96dcdc5782e60c0458b4faa3291857171de8
+SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
diff --git a/x11/qt3-libs/patches/patch-bb b/x11/qt3-libs/patches/patch-bb
index 3fd0c2564d2..e41fcc06c68 100644
--- a/x11/qt3-libs/patches/patch-bb
+++ b/x11/qt3-libs/patches/patch-bb
@@ -1,24 +1,22 @@
-$NetBSD: patch-bb,v 1.1 2002/10/28 10:46:07 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2003/02/04 18:09:16 skrll Exp $
 
---- src/sql/drivers/psql/qsql_psql.cpp.orig	Sun Oct 27 22:25:40 2002
-+++ src/sql/drivers/psql/qsql_psql.cpp	Sun Oct 27 22:26:34 2002
-@@ -41,8 +41,8 @@
- #include <qdatetime.h>
- #include <qpointarray.h>
- #undef DEBUG // the PostgreSQL headers redefines this
+--- src/sql/drivers/psql/qsql_psql.cpp.orig	Wed Jan  8 14:24:52 2003
++++ src/sql/drivers/psql/qsql_psql.cpp
+@@ -44,14 +44,14 @@
+ #if defined(DEBUG)
+ # undef DEBUG
+ #endif
 -#include <postgres.h>
 -#include <libpq/libpq-fs.h>
 +#include <pgsql/server/postgres.h>
 +#include <pgsql/libpq/libpq-fs.h>
- #if defined(Q_CC_MSVC)
- #pragma warning(disable: 4273) // '_errno' : inconsistent dll linkage.  dllexport assumed
- #endif
-@@ -51,7 +51,7 @@
+ // PostgreSQL header <catalog/pg_type.h> redefines errno erroneously.
  #if defined(errno)
- #undef errno
+ # undef errno
  #endif
+ #define errno qt_psql_errno
 -#include <catalog/pg_type.h>
 +#include <pgsql/server/catalog/pg_type.h>
- #if defined(Q_CC_MSVC)
- #pragma warning(default: 4273)
- #endif
+ #undef errno
+ #include <math.h>
+ 
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index bbd6cd47079..1223e4eade9 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/04 18:09:17 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-mysql-${QTVERSION}
-PKGREVISION=		1
 COMMENT=		QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index a062ee4594c..bfac347aad4 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/01/05 20:14:35 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/04 18:09:17 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		2
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index bc7c869f00f..96c5689be4c 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/01/07 23:56:56 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/02/04 18:09:17 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
-PKGREVISION=		2
 COMMENT=		QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 14617edce41..e9b5164efce 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/01/08 10:45:55 tron Exp $
+# $NetBSD: Makefile,v 1.14 2003/02/04 18:06:49 skrll Exp $
 
-DISTNAME=	qt3-${QTVERSION}nb2
+DISTNAME=	qt3-${QTVERSION}
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,9 +9,9 @@ COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
 .include "./Makefile.common"
 
-DEPENDS+=	qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs
-DEPENDS+=	qt3-tools-${QTVERSION}nb2:../../x11/qt3-tools
-DEPENDS+=	qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs
+DEPENDS+=	qt3-libs-${QTVERSION}:../../x11/qt3-libs
+DEPENDS+=	qt3-tools-${QTVERSION}:../../x11/qt3-tools
+DEPENDS+=	qt3-docs-${QTVERSION}:../../x11/qt3-docs
 
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index 8c40289b6cd..4207d5e1c6f 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2002/10/28 08:46:45 skrll Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/02/04 18:06:49 skrll Exp $
 #
 
-QTVERSION=	3.0.6
+QTVERSION=	3.0.7
 
 MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html