cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to qt 3.3.5

Browse Source
This commit is contained in:
espie 2005-09-19 10:24:56 +00:00
parent 76f6f228a1
commit 913759e07b
9 changed files with 40 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/qt3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.53 2005/09/18 09:08:42 espie Exp $
# $OpenBSD: Makefile,v 1.54 2005/09/19 10:24:56 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= "C++ X11 GUI toolkit"
@ -8,13 +8,13 @@ COMMENT-postgresql= "PostgresSQL plugin for qt3"
COMMENT-mysql= "MySQL plugin for qt3"
PKGNAME= qt3-${VERSION}
PKGNAME-mysql= qt3-mysql-${VERSION}p0
PKGNAME-postgresql= qt3-postgresql-${VERSION}p0
PKGNAME-examples= qt3-examples-${VERSION}p0
FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}p4
FULLPKGNAME-html= qt3-html-${VERSION}p0
PKGNAME-mysql= qt3-mysql-${VERSION}
PKGNAME-postgresql= qt3-postgresql-${VERSION}
PKGNAME-examples= qt3-examples-${VERSION}
FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}
FULLPKGNAME-html= qt3-html-${VERSION}
VERSION= 3.4
VERSION= 3.5
DISTNAME= qt-x11-free-3.${VERSION}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.troll.no/qt/source/
@ -161,7 +161,7 @@ NO_REGRESS= Yes
PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig
LIBRARIES=qt-mt.so.3.34 qui.so.1.0 \
LIBRARIES=qt-mt.so.3.35 qui.so.1.0 \
editor.a designercore.a qassistantclient.a
.if !${FLAVOR:L:Mdebug}

8
x11/qt3/distinfo
View File

@ -1,4 +1,4 @@
MD5 (qt-x11-free-3.3.4.tar.gz) = 9b327962af5a1799fd31b7a576948ad5
RMD160 (qt-x11-free-3.3.4.tar.gz) = 749a2cb774e19cad30a7cb098ed586a2fcb41c69
SHA1 (qt-x11-free-3.3.4.tar.gz) = 9c638a828a0e9b41898381e574664c172c135d40
SIZE (qt-x11-free-3.3.4.tar.gz) = 17422638
MD5 (qt-x11-free-3.3.5.tar.gz) = fecaf5435c6b0a1a2c23e67991f74e7a
RMD160 (qt-x11-free-3.3.5.tar.gz) = 564046358cdf24dc3778dda02fd36bf6e420dc5b
SHA1 (qt-x11-free-3.3.5.tar.gz) = d36db11111fdb30a82249b66bfe8bd2c78fb02e2
SIZE (qt-x11-free-3.3.5.tar.gz) = 17441192

10
x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2005/02/03 20:05:56 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Fri Jan 21 18:16:26 2005
+++ qmake/generators/unix/unixmake2.cpp Fri Jan 28 10:59:46 2005
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.13 2005/09/19 10:24:57 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Fri Sep 2 14:43:19 2005
+++ qmake/generators/unix/unixmake2.cpp Sun Sep 18 15:49:44 2005
@@ -295,10 +295,14 @@ UnixMakefileGenerator::writeMakeParts(QT
} else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
t << "TARGETA = " << var("TARGETA") << endl;
@ -20,7 +20,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2005/02/03 20:05:56 e
} else {
t << "TARGETD = " << var("TARGET_x") << endl;
t << "TARGET0 = " << var("TARGET_") << endl;
@@ -1291,10 +1295,19 @@ void UnixMakefileGenerator::init2()
@@ -1293,10 +1297,19 @@ void UnixMakefileGenerator::init2()
project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
project->first("QMAKE_EXTENSION_SHLIB") +
"." + project->first("VER_MAJ"));
@ -44,7 +44,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2005/02/03 20:05:56 e
project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") +
"." +
project->variables()[
@@ -1303,7 +1316,10 @@ void UnixMakefileGenerator::init2()
@@ -1305,7 +1318,10 @@ void UnixMakefileGenerator::init2()
project->first("VER_MIN") + "." +
project->first("VER_PAT"));
}

8
x11/qt3/patches/patch-qmake_generators_unix_unixmake_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.1 2005/05/18 14:24:32 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig Fri Jan 21 18:16:26 2005
+++ qmake/generators/unix/unixmake.cpp Wed May 18 16:21:46 2005
@@ -802,7 +802,7 @@ UnixMakefileGenerator::defaultInstall(co
$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.2 2005/09/19 10:24:57 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig Fri Sep 2 14:43:19 2005
+++ qmake/generators/unix/unixmake.cpp Sun Sep 18 15:49:44 2005
@@ -803,7 +803,7 @@ UnixMakefileGenerator::defaultInstall(co
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");
}

8
x11/qt3/patches/patch-src_network_qdns_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_network_qdns_cpp,v 1.1 2005/08/31 22:01:09 espie Exp $
--- src/network/qdns.cpp.orig Tue Aug 30 22:22:45 2005
+++ src/network/qdns.cpp Tue Aug 30 22:23:20 2005
@@ -2559,7 +2559,7 @@ void QDns::doResInit()
$OpenBSD: patch-src_network_qdns_cpp,v 1.2 2005/09/19 10:24:57 espie Exp $
--- src/network/qdns.cpp.orig Fri Sep 2 14:42:59 2005
+++ src/network/qdns.cpp Sun Sep 18 15:49:44 2005
@@ -2565,7 +2565,7 @@ void QDns::doResInit()
if ( type == "nameserver" ) {
QHostAddress *address = new QHostAddress();

15
x11/qt3/patches/patch-src_tools_qcstring_cpp
View File

@ -1,15 +0,0 @@
$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;

8
x11/qt3/patches/patch-src_widgets_qscrollview_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_widgets_qscrollview_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
--- src/widgets/qscrollview.cpp.orig 2004-04-19 03:36:18.000000000 -0600
+++ src/widgets/qscrollview.cpp 2004-06-24 00:03:23.000000000 -0600
@@ -1551,6 +1551,9 @@ bool QScrollView::eventFilter( QObject *
$OpenBSD: patch-src_widgets_qscrollview_cpp,v 1.2 2005/09/19 10:24:57 espie Exp $
--- src/widgets/qscrollview.cpp.orig Fri Sep 2 14:43:14 2005
+++ src/widgets/qscrollview.cpp Sun Sep 18 15:49:45 2005
@@ -1549,6 +1549,9 @@ bool QScrollView::eventFilter( QObject *
case QEvent::LayoutHint:
d->autoResizeHint(this);
break;

6
x11/qt3/pkg/PFRAG.shared
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.16 2005/02/03 20:05:56 espie Exp $
@lib lib/libqt-mt.so.3.34
@comment $OpenBSD: PFRAG.shared,v 1.17 2005/09/19 10:24:57 espie Exp $
@lib lib/libqt-mt.so.3.35
@lib lib/libqui-mt.so.1.0
@lib lib/libqui.so.1.0
@lib lib/qt3/libqt-mt.so.3.34
@lib lib/qt3/libqt-mt.so.3.35
@lib lib/qt3/libqui-mt.so.1.0
@lib lib/qt3/libqui.so.1.0
lib/qt3/plugins/designer/libcppeditor.so

10
x11/qt3/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2005/02/27 16:03:14 espie Exp $
@comment $OpenBSD: PLIST,v 1.24 2005/09/19 10:24:57 espie Exp $
@conflict qt3-*
@conflict qt3-base-*
%%SHARED%%
@ -1318,6 +1318,9 @@ lib/qt3/mkspecs/dgux-g++/qplatformdefs.h
lib/qt3/mkspecs/freebsd-g++/
lib/qt3/mkspecs/freebsd-g++/qmake.conf
lib/qt3/mkspecs/freebsd-g++/qplatformdefs.h
lib/qt3/mkspecs/freebsd-g++34/
lib/qt3/mkspecs/freebsd-g++34/qmake.conf
lib/qt3/mkspecs/freebsd-g++34/qplatformdefs.h
lib/qt3/mkspecs/freebsd-icc/
lib/qt3/mkspecs/freebsd-icc/qmake.conf
lib/qt3/mkspecs/freebsd-icc/qplatformdefs.h
@ -1470,6 +1473,9 @@ lib/qt3/mkspecs/win32-msvc/qplatformdefs.h
lib/qt3/mkspecs/win32-msvc/win32app.dsp
lib/qt3/mkspecs/win32-msvc/win32dll.dsp
lib/qt3/mkspecs/win32-msvc/win32lib.dsp
lib/qt3/mkspecs/win32-msvc2005/
lib/qt3/mkspecs/win32-msvc2005/qmake.conf
lib/qt3/mkspecs/win32-msvc2005/qplatformdefs.h
lib/qt3/mkspecs/win32-watcom/
lib/qt3/mkspecs/win32-watcom/qmake.conf
lib/qt3/plugins/
@ -1481,4 +1487,4 @@ share/doc/qt3/FAQ
share/doc/qt3/LICENSE.GPL
share/doc/qt3/README
share/doc/qt3/README-QT.TXT
share/doc/qt3/changes-3.3.4
share/doc/qt3/changes-3.3.5