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.

5 files changed, 21 insertions, 25 deletions

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>
+