TrollTech missed an occasion to use snprintf, and I fucked up in

the PKGNAME bumping.
This commit is contained in:
espie 2005-04-09 21:24:12 +00:00
parent 8ea071711a
commit c9af30e7c7
2 changed files with 18 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2005/02/27 16:03:14 espie Exp $
# $OpenBSD: Makefile,v 1.48 2005/04/09 21:24:12 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= "C++ X11 GUI toolkit"
@ -7,10 +7,11 @@ COMMENT-html= "off-line html documentation for qt3"
COMMENT-postgresql= "PostgresSQL plugin for qt3"
COMMENT-mysql= "MySQL plugin for qt3"
PKGNAME= qt3-${VERSION}p0
PKGNAME= qt3-${VERSION}
PKGNAME-mysql= qt3-mysql-${VERSION}
PKGNAME-postgresql= qt3-postgresql-${VERSION}
PKGNAME-examples= qt3-examples-${VERSION}
FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}p1
FULLPKGNAME-html= qt3-html-${VERSION}
VERSION= 3.4
@ -67,7 +68,6 @@ PKGDEBUG=-debug
PKGDEBUG=
.endif
FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}
CONFIGURE_ARGS+=-thread
.if !${FLAVOR:L:Mdebug} && !${FLAVOR:L:Mno_examples}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_tools_qcstring_cpp,v 1.1 2005/04/09 21:24:12 espie Exp $
--- src/tools/qcstring.cpp.orig Thu Apr 7 01:05:16 2005
+++ src/tools/qcstring.cpp Thu Apr 7 01:09:13 2005
@@ -876,7 +876,11 @@ QCString &QCString::sprintf( const char
va_start( ap, format );
if ( size() < 256 )
QByteArray::resize( 256 ); // make string big enough
+#ifdef QT_VSNPRINTF
+ QT_VSNPRINTF( data(), size(), format, ap );
+#else
vsprintf( data(), format, ap );
+#endif
resize( qstrlen(data()) + 1 ); // truncate
va_end( ap );
return *this;