Changes 4.1.3:

* Bug fixes and improvements

7 files changed, 22 insertions, 28 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index cd2511e9c42..379b37a7b18 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/05/31 19:18:07 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	C++ X GUI toolkit
 
 BUILD_TARGET=		sub-src
@@ -41,12 +40,6 @@ do-install:
 		${WRKSRC}/plugins/accessible/lib${plug}.la \
 		${QTPREFIX}/plugins/accessible/
 .endfor
-	${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/codecs
-.for plug in qcncodecs qjpcodecs qkrcodecs qtwcodecs
-	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/plugins/codecs/lib${plug}.la \
-		${QTPREFIX}/plugins/codecs/
-.endfor
 	${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/imageformats/
 .for plug in qgif qjpeg qmng
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 28ccbb558f9..6f948d90ee0 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/03/01 21:10:55 minskim Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/05/31 19:18:07 adam Exp $
 
 DISTNAME=	qt-x11-opensource-src-${QTVERSION}
 CATEGORIES=	x11
@@ -19,7 +19,6 @@ USE_TOOLS+=		gmake
 QTPREFIX=		${PREFIX}/qt4
 
 CONFIGURE_ARGS+=	-prefix "${QTPREFIX}" -shared -sm
-CONFIGURE_ARGS+=	-no-sql-sqlite
 CONFIGURE_ARGS+=	-release
 CONFIGURE_ARGS+=	-system-libjpeg
 CONFIGURE_ARGS+=	-system-libmng
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index 33e73b99fa0..33f7d2c1ec5 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/25 09:25:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/05/31 19:18:07 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtGui.pc
@@ -21,15 +21,10 @@ qt4/lib/libQtSvg.la
 qt4/lib/libQtXml.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
-qt4/plugins/codecs/libqcncodecs.la
-qt4/plugins/codecs/libqjpcodecs.la
-qt4/plugins/codecs/libqkrcodecs.la
-qt4/plugins/codecs/libqtwcodecs.la
 qt4/plugins/imageformats/libqgif.la
 qt4/plugins/imageformats/libqjpeg.la
 qt4/plugins/imageformats/libqmng.la
 @dirrm qt4/plugins/imageformats
-@dirrm qt4/plugins/codecs
 @dirrm qt4/plugins/accessible
 @dirrm qt4/plugins
 @dirrm qt4/lib
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index e45a6553d22..bdbb6807239 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/05/31 19:18:07 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	qt4-libs
 
 .if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
-BUILDLINK_ABI_DEPENDS.qt4-libs?=	qt4-libs>=4.1.2nb1
+BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.1.2nb1
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index a03c658c14c..91a7b9e1dcd 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2006/04/03 15:43:26 adam Exp $
+$NetBSD: distinfo,v 1.5 2006/05/31 19:18:07 adam Exp $
 
-SHA1 (qt-x11-opensource-src-4.1.2.tar.gz) = a30ff8594b816528ab08ebcf349a31e244c4278d
-RMD160 (qt-x11-opensource-src-4.1.2.tar.gz) = b4a0031a7c8d72492d8afa1a1190493999cb17ff
-Size (qt-x11-opensource-src-4.1.2.tar.gz) = 27924277 bytes
+SHA1 (qt-x11-opensource-src-4.1.3.tar.gz) = 6728b4891c5e24d4a9e1b7b66cc5915f89453b7c
+RMD160 (qt-x11-opensource-src-4.1.3.tar.gz) = ecd103f99b2d1ca4b88e749faee5553b8c1c53e2
+Size (qt-x11-opensource-src-4.1.3.tar.gz) = 32200887 bytes
 SHA1 (patch-aa) = 5587f3d9c0613f9be04de1eed76175c9342ce5e0
 SHA1 (patch-ab) = 6c42d051ce036820167bcecc0480f7dd6d2f7334
 SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = 95558402aa3a02596cacd359bf5702dc7c038770
+SHA1 (patch-ad) = 1db8ce11816ae2fe8423906c51290c82ddb169ea
 SHA1 (patch-af) = a8576bc098c14cb5a13d45d4231b7ee21441eb89
 SHA1 (patch-ag) = d5b8d3c895f4a87397b90795c61de8be56ab517f
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
diff --git a/x11/qt4-libs/options.mk b/x11/qt4-libs/options.mk
index a62cade5e79..e6f0e28a3e0 100644
--- a/x11/qt4-libs/options.mk
+++ b/x11/qt4-libs/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/02/20 12:08:11 adam Exp $
+# $NetBSD: options.mk,v 1.2 2006/05/31 19:18:07 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qt4
-PKG_SUPPORTED_OPTIONS=	cups debug
+PKG_SUPPORTED_OPTIONS=	cups debug sqlite
 
 .include "../../mk/bsd.options.mk"
 
@@ -18,3 +18,10 @@ CXX+=			-ggdb
 CONFIGURE_ARGS+=	--debug
 INSTALL_UNSTRIPPED=	yes
 .endif
+
+.if !empty(PKG_OPTIONS:Msqlite)
+.  include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+=	-qt-sql-sqlite
+.else
+CONFIGURE_ARGS+=	-no-sql-sqlite
+.endif
diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad
index 48307ca1a4f..d36dec6c3e2 100644
--- a/x11/qt4-libs/patches/patch-ad
+++ b/x11/qt4-libs/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/03/02 06:45:46 minskim Exp $
+$NetBSD: patch-ad,v 1.3 2006/05/31 19:18:07 adam Exp $
 
---- src/corelib/global/qglobal.h.orig	2006-02-16 02:51:07.000000000 -0800
+--- src/corelib/global/qglobal.h.orig	2006-05-14 12:46:59.000000000 +0200
 +++ src/corelib/global/qglobal.h
 @@ -55,6 +55,7 @@
       NETBSD   - NetBSD
@@ -32,7 +32,7 @@ $NetBSD: patch-ad,v 1.2 2006/03/02 06:45:46 minskim Exp $
  #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
  #  undef Q_OS_UNIX
  #elif !defined(Q_OS_UNIX)
-@@ -532,10 +531,7 @@
+@@ -530,10 +529,7 @@
  #  define Q_WS_PM
  #  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
  #elif defined(Q_OS_UNIX)