diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index 86eae11e863..baa9ba05023 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2002/05/27 14:49:30 brad Exp $ +# $OpenBSD: Makefile,v 1.11 2002/07/17 21:43:36 espie Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= C++ X11 GUI toolkit @@ -7,7 +7,7 @@ COMMENT-html= off-line html documentation for qt3 COMMENT-postgresql= PostgresSQL plugin for qt3 COMMENT-mysql= MySQL plugin for qt3 -VERSION= 0.3 +VERSION= 0.5 DISTNAME= qt-x11-free-3.${VERSION} CATEGORIES= x11 NEED_VERSION= 1.508 @@ -34,7 +34,7 @@ PERMIT_DISTFILES_FTP= Yes #CXXFLAGS+= -g USE_X11= Yes -USE_GMAKE= Yes +#USE_GMAKE= Yes MAKE_ENV= QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \ SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \ LD_LIBRARY_PATH="${WRKDIST}/lib" @@ -58,6 +58,7 @@ CONFIGURE_ARGS= -qt-gif -system-libmng -system-libpng -system-libjpeg \ CONFIGURE_ARGS+= -prefix ${QT_LIBDIR} #CONFIGURE_ARGS+=-static -debug #CONFIGURE_ARGS+=-debug +#CONFIGURE_ARGS+=-static # For XFree 4 #CONFIGURE_ARGS+=-xft @@ -128,7 +129,7 @@ QT_DOC= ${PREFIX}/share/doc/qt3 # for manpages in MESSAGE SUBST_VARS= VERSION QT_LIBDIR QT_DOC -DOCS= ANNOUNCE FAQ LICENSE.GPL README README.QT \ +DOCS= FAQ LICENSE.GPL README README.QT \ changes-3* post-configure: @@ -150,10 +151,9 @@ pre-build: @echo "*** for the 'limit' or 'ulimit' command." @echo "" -LIBRARIES=qt.so.3.3 editor.so.1.0 qui.so.1.0 -PROGRAMS3=moc findtr qt20fix qtrename140 uic designer -PROGRAMS=assistant linguist lrelease lupdate qm2ts \ - qtconfig qmake +LIBRARIES=qt.so.3.5 editor.so.1.0 qui.so.1.0 +PROGRAMS3=designer findtr moc qt20fix qtrename140 uic +PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig do-install: ${INSTALL_DATA_DIR} ${QT_INCDIR} diff --git a/x11/qt3/distinfo b/x11/qt3/distinfo index 23304ab9fd0..8a4a25af443 100644 --- a/x11/qt3/distinfo +++ b/x11/qt3/distinfo @@ -1,3 +1,3 @@ -MD5 (qt-x11-free-3.0.3.tar.gz) = f53d282602900da8e26d20adfc804ce5 -RMD160 (qt-x11-free-3.0.3.tar.gz) = fbff98326b0d1beabe493293a770e228aaf675d3 -SHA1 (qt-x11-free-3.0.3.tar.gz) = b6fe7213104bda6075a7d944ab83802262470b15 +MD5 (qt-x11-free-3.0.5.tar.gz) = 98dab506c55e50741e428c4cc43ac828 +RMD160 (qt-x11-free-3.0.5.tar.gz) = 1ddb0e526a3d0a737f6b4c1d86fb1418e31979b7 +SHA1 (qt-x11-free-3.0.5.tar.gz) = 8d6c3c5b17da2a32f1b4ff60a61998d0822c3e41 diff --git a/x11/qt3/patches/patch-configure b/x11/qt3/patches/patch-configure index 6fbdf919c16..b0233ac0629 100644 --- a/x11/qt3/patches/patch-configure +++ b/x11/qt3/patches/patch-configure @@ -1,21 +1,30 @@ -$OpenBSD: patch-configure,v 1.2 2002/03/28 11:47:18 espie Exp $ ---- configure.orig Sun Mar 10 11:59:59 2002 -+++ configure Thu Mar 28 03:27:22 2002 -@@ -1097,7 +1097,7 @@ then +$OpenBSD: patch-configure,v 1.3 2002/07/17 21:43:36 espie Exp $ +--- configure.orig Thu Jul 4 08:37:30 2002 ++++ configure Tue Jul 16 17:58:07 2002 +@@ -694,7 +694,7 @@ while [ -n "$1" ]; do + UNKNOWN_OPT=yes + fi + # takes two verboses to turn on qmake debugs +- [ "$OPT_VERBOSE" = "yes" ] && QMAKE_SWITCHES="$QMAKE_SWITCHES -d" ++# [ "$OPT_VERBOSE" = "yes" ] && QMAKE_SWITCHES="$QMAKE_SWITCHES -d" + ;; + concurrent) + OPT_CONCURRENT="$VAL" +@@ -1180,7 +1180,7 @@ if echo $MODULES | grep sql >/dev/null; MYSQL_REQ="-lmysqlclient mysql.h" OCI_REQ="-lclntsh -lwtc8 oci.h" PSQL_REQ="-lpq postgres.h libpq/libpq-fs.h catalog/pg_type.h libpq-fe.h" - ODBC_REQ="-lodbc sql.h sqlext.h" + ODBC_REQ="-liodbc sql.h sqlext.h" TDS_REQ="-lsybdb sybfront.h sybdb.h" - for _SQLDR in $CFG_SQL_AVAILABLE - do -@@ -1519,7 +1519,7 @@ then + for _SQLDR in $CFG_SQL_AVAILABLE; do + case $_SQLDR in +@@ -1586,7 +1586,7 @@ if [ "$Edition" = "free" ]; then echo "Type 'no' to decline this license offer." echo echo "Do you accept the terms of $affix license?" - read acceptance + acceptance=yes - if [ "$acceptance" = "yes" ] - then + if [ "$acceptance" = "yes" ]; then break + elif [ "$acceptance" = "no" ]; then diff --git a/x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf b/x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf index aab6ebb7f20..3f72c78b1f6 100644 --- a/x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf +++ b/x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf @@ -1,6 +1,6 @@ -$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.3 2002/04/09 14:19:40 espie Exp $ ---- mkspecs/openbsd-g++/qmake.conf.orig Mon Mar 18 10:45:57 2002 -+++ mkspecs/openbsd-g++/qmake.conf Tue Apr 9 16:03:45 2002 +$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.4 2002/07/17 21:43:36 espie Exp $ +--- mkspecs/openbsd-g++/qmake.conf.orig Mon Jul 8 12:28:01 2002 ++++ mkspecs/openbsd-g++/qmake.conf Wed Jul 17 15:15:34 2002 @@ -8,6 +8,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt warn_on release diff --git a/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp b/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp index fdd73ddd68d..7315063acc1 100644 --- a/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp +++ b/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2002/03/28 11:47:18 espie Exp $ ---- qmake/generators/unix/unixmake2.cpp.orig Mon Mar 18 10:45:59 2002 -+++ qmake/generators/unix/unixmake2.cpp Thu Mar 28 03:27:23 2002 -@@ -218,10 +218,14 @@ UnixMakefileGenerator::writeMakeParts(QT +$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.5 2002/07/17 21:43:36 espie Exp $ +--- qmake/generators/unix/unixmake2.cpp.orig Mon Jul 8 12:27:37 2002 ++++ qmake/generators/unix/unixmake2.cpp Wed Jul 17 12:58:24 2002 +@@ -220,10 +220,14 @@ UnixMakefileGenerator::writeMakeParts(QT } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) { t << "TARGETA = " << var("TARGETA") << endl; if(project->variables()["QMAKE_HPUX_SHLIBS"].isEmpty()) { @@ -20,38 +20,47 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2002/03/28 11:47:18 es } else { t << "TARGETD = " << var("TARGET_x") << endl; -@@ -827,10 +831,6 @@ void UnixMakefileGenerator::init2() - project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + - project->first("QMAKE_EXTENSION_SHLIB") + - "." + project->first("VER_MAJ")); -- project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + +@@ -916,6 +920,7 @@ void UnixMakefileGenerator::init2() + project->first("VER_PAT")); + } + project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"]; ++ + } else { + project->variables()["TARGET_"].append("lib" + project->first("TARGET") + "." + + project->first("QMAKE_EXTENSION_SHLIB")); +@@ -936,10 +941,19 @@ void UnixMakefileGenerator::init2() + project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + + project->first("QMAKE_EXTENSION_SHLIB") + + "." + project->first("VER_MAJ")); +- project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + - project->first("QMAKE_EXTENSION_SHLIB") - + "." + project->first("VER_MAJ") + - "." + project->first("VER_MIN")); - project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + - "." + - project->variables()[ -@@ -838,7 +838,22 @@ void UnixMakefileGenerator::init2() - project->first("VER_MAJ") + "." + - project->first("VER_MIN") + "." + - project->first("VER_PAT")); ++ if ( !project->variables()["QMAKE_OPENBSD_SHLIBS"].isEmpty() ) { ++ QString s; ++ s.setNum(project->first("VER_MIN").toInt()*10+ project->first("VER_PAT").toInt()); ++ project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + ++ project->first("QMAKE_EXTENSION_SHLIB") ++ + "." + project->first("VER_MAJ") + ++ "." + s ); ++ } else { ++ project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + ++ project->first("QMAKE_EXTENSION_SHLIB") ++ + "." + project->first("VER_MAJ") + ++ "." + project->first("VER_MIN")); ++ } + project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + + "." + + project->variables()[ +@@ -948,7 +962,10 @@ void UnixMakefileGenerator::init2() + project->first("VER_MIN") + "." + + project->first("VER_PAT")); + } - project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"]; -+ if ( !project->variables()["QMAKE_OPENBSD_SHLIBS"].isEmpty() ) { -+ QString s; -+ s.setNum(project->first("VER_MIN").toInt()*10+ -+ project->first("VER_PAT").toInt()); -+ project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + -+ project->first("QMAKE_EXTENSION_SHLIB") -+ + "." + project->first("VER_MAJ") + -+ "." + s ); ++ if ( !project->variables()["QMAKE_OPENBSD_SHLIBS"].isEmpty() ) + project->variables()["TARGET"] = project->variables()["TARGET_x.y"]; -+ } else { -+ project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + -+ project->first("QMAKE_EXTENSION_SHLIB") -+ + "." + project->first("VER_MAJ") + -+ "." + project->first("VER_MIN")); ++ else + project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"]; -+ } } project->variables()["QMAKE_LN_SHLIB"].append("-ln -s"); project->variables()["DESTDIR_TARGET"].append("$(TARGET)"); diff --git a/x11/qt3/patches/patch-src_styles_qcommonstyle_cpp b/x11/qt3/patches/patch-src_styles_qcommonstyle_cpp deleted file mode 100644 index 2e1ecf37c09..00000000000 --- a/x11/qt3/patches/patch-src_styles_qcommonstyle_cpp +++ /dev/null @@ -1,51 +0,0 @@ -$OpenBSD: patch-src_styles_qcommonstyle_cpp,v 1.1 2002/04/09 14:19:40 espie Exp $ ---- src/styles/qcommonstyle.cpp.orig Mon Mar 18 10:46:27 2002 -+++ src/styles/qcommonstyle.cpp Tue Apr 9 16:11:12 2002 -@@ -702,9 +702,9 @@ void QCommonStyle::drawControl( ControlE - case CE_ProgressBarContents: - { - const QProgressBar *progressbar = (const QProgressBar *) widget; -- - bool reverse = QApplication::reverseLayout(); -- int w = r.width() - 4; -+ int fw = 2; -+ int w = r.width() - 2*fw; - if ( !progressbar->totalSteps() ) { - // draw busy indicator - int x = progressbar->progress() % (w * 2); -@@ -712,7 +712,7 @@ void QCommonStyle::drawControl( ControlE - x = 2 * w - x; - x = reverse ? r.right() - x : x + r.x(); - p->setPen( QPen(cg.highlight(), 4) ); -- p->drawLine(x, r.y() + 1, x, r.height() - 2); -+ p->drawLine(x, r.y() + 1, x, r.height() - fw); - } else { - const int unit_width = pixelMetric(PM_ProgressBarChunkWidth, widget); - int u; -@@ -721,7 +721,7 @@ void QCommonStyle::drawControl( ControlE - else - u = w / unit_width; - int p_v = progressbar->progress(); -- int t_s = progressbar->totalSteps(); -+ int t_s = progressbar->totalSteps() ? progressbar->totalSteps() : 1; - - if ( u > 0 && p_v >= INT_MAX / u && t_s >= u ) { - // scale down to something usable. -@@ -731,7 +731,7 @@ void QCommonStyle::drawControl( ControlE - - // nu < tnu, if last chunk is only a partial chunk - int tnu, nu; -- tnu = nu = p_v * u / (t_s - 1); -+ tnu = nu = p_v * u / t_s; - - if (nu * unit_width > w) - nu--; -@@ -742,7 +742,7 @@ void QCommonStyle::drawControl( ControlE - // display at the end. - int x = 0; - int x0 = reverse ? r.right() - ((unit_width > 1) ? -- unit_width : 2) : r.x() + 2; -+ unit_width : fw) : r.x() + fw; - for (int i=0; i +#include #include "private/qlibrary_p.h" ++#include "qplatformdefs.h" /* -@@ -134,7 +136,14 @@ void* QLibraryPrivate::resolveSymbol( co - if ( !pHnd ) - return 0; - -+#if defined(__OpenBSD__) && !defined(__ELF__) -+ char *symbol2 = (char *)malloc(strlen(symbol)+2); -+ *symbol2 = '_'; -+ strcpy(symbol2+1, symbol); -+ void *address = dlsym( pHnd, symbol2 ); -+#else - void* address = dlsym( pHnd, symbol ); -+#endif - #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) - const char* error = dlerror(); - if ( error ) + The platform dependent implementations of diff --git a/x11/qt3/patches/patch-src_tools_qsettings_unix_cpp b/x11/qt3/patches/patch-src_tools_qsettings_unix_cpp new file mode 100644 index 00000000000..92b60c76162 --- /dev/null +++ b/x11/qt3/patches/patch-src_tools_qsettings_unix_cpp @@ -0,0 +1,22 @@ +$OpenBSD: patch-src_tools_qsettings_unix_cpp,v 1.1 2002/07/17 21:43:36 espie Exp $ +--- src/tools/qsettings_unix.cpp.orig Wed Jul 17 19:55:58 2002 ++++ src/tools/qsettings_unix.cpp Wed Jul 17 23:32:50 2002 +@@ -212,6 +212,8 @@ static int openlock( const QString &name + int fd = open( QFile::encodeName( lockfile ), + O_RDWR | O_CREAT, S_IRUSR | S_IWUSR ); + ++ if (fd == -1) ++ return fd; + struct flock fl; + fl.l_type = type; + fl.l_whence = SEEK_SET; +@@ -230,6 +232,9 @@ static int openlock( const QString &name + */ + static void closelock( int fd ) + { ++ if (fd == -1) ++ return; ++ + struct flock fl; + fl.l_type = F_UNLCK; + fl.l_whence = SEEK_SET; diff --git a/x11/qt3/patches/patch-src_widgets_qtabbar_cpp b/x11/qt3/patches/patch-src_widgets_qtabbar_cpp deleted file mode 100644 index 57db1807c41..00000000000 --- a/x11/qt3/patches/patch-src_widgets_qtabbar_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_widgets_qtabbar_cpp,v 1.1 2002/04/09 14:19:40 espie Exp $ ---- src/widgets/qtabbar.cpp.orig Mon Mar 18 10:46:36 2002 -+++ src/widgets/qtabbar.cpp Tue Apr 9 16:11:12 2002 -@@ -627,6 +627,8 @@ void QTabBar::paintLabel( QPainter* p, c - - void QTabBar::paintEvent( QPaintEvent * e ) - { -+ if ( e->rect().isNull() ) -+ return; - QSharedDoubleBuffer buffer( this, e->rect() ); - - buffer.painter()->setBrushOrigin( rect().bottomLeft() ); diff --git a/x11/qt3/patches/patch-src_widgets_qtoolbar_cpp b/x11/qt3/patches/patch-src_widgets_qtoolbar_cpp new file mode 100644 index 00000000000..ff1f1f9bf45 --- /dev/null +++ b/x11/qt3/patches/patch-src_widgets_qtoolbar_cpp @@ -0,0 +1,20 @@ +$OpenBSD: patch-src_widgets_qtoolbar_cpp,v 1.1 2002/07/17 21:43:36 espie Exp $ +--- src/widgets/qtoolbar.cpp.orig Mon Jul 8 12:27:25 2002 ++++ src/widgets/qtoolbar.cpp Tue Jul 16 17:48:08 2002 +@@ -617,10 +617,14 @@ void QToolBar::resizeEvent( QResizeEvent + hide = FALSE; + QPoint p = w->parentWidget()->mapTo( this, w->geometry().bottomRight() ); + if ( orientation() == Horizontal ) { +- if ( p.x() > e->size().width()-d->extension->width()/2 ) ++ if ( p.x() > ( doHide ? ++ e->size().width()-d->extension->width()/2 : ++ e->size().width() ) ) + hide = TRUE; + } else { +- if ( p.y() > e->size().height()-d->extension->height()/2 ) ++ if ( p.y() > ( doHide ? ++ e->size().height()-d->extension->height()/2 : ++ e->size().height() ) ) + hide = TRUE; + } + if ( hide && !w->isHidden() ) { diff --git a/x11/qt3/pkg/PFRAG.shared b/x11/qt3/pkg/PFRAG.shared index 151a42158e1..148847085ad 100644 --- a/x11/qt3/pkg/PFRAG.shared +++ b/x11/qt3/pkg/PFRAG.shared @@ -1,8 +1,8 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2002/03/27 12:36:35 espie Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.3 2002/07/17 21:43:36 espie Exp $ lib/libeditor.so.1.0 -lib/libqt.so.3.3 +lib/libqt.so.3.5 lib/libqui.so.1.0 lib/qt3/libeditor.so.1.0 -lib/qt3/libqt.so.3.3 +lib/qt3/libqt.so.3.5 lib/qt3/libqui.so.1.0 DYNLIBDIR(%D/lib) diff --git a/x11/qt3/pkg/PLIST b/x11/qt3/pkg/PLIST index 668e3bf14aa..617ad96dfb5 100644 --- a/x11/qt3/pkg/PLIST +++ b/x11/qt3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2002/04/09 16:25:14 espie Exp $ +@comment $OpenBSD: PLIST,v 1.6 2002/07/17 21:43:36 espie Exp $ bin/assistant bin/designer3 bin/findtr3 @@ -39,9 +39,8 @@ include/X11/qt3/private/qmutex_p.h include/X11/qt3/private/qpainter_p.h include/X11/qt3/private/qpluginmanager_p.h include/X11/qt3/private/qpsprinter_p.h -include/X11/qt3/private/qremoteinterface_p.h -include/X11/qt3/private/qremotemessage_p.h include/X11/qt3/private/qrichtext_p.h +include/X11/qt3/private/qsharedmemory_p.h include/X11/qt3/private/qsqldriverinterface_p.h include/X11/qt3/private/qsqlmanager_p.h include/X11/qt3/private/qstyleinterface_p.h @@ -145,6 +144,7 @@ include/X11/qt3/qfontmetrics.h include/X11/qt3/qframe.h include/X11/qt3/qftp.h include/X11/qt3/qgarray.h +include/X11/qt3/qgb18030codec.h include/X11/qt3/qgbkcodec.h include/X11/qt3/qgcache.h include/X11/qt3/qgdict.h @@ -272,8 +272,6 @@ include/X11/qt3/qrangect.h include/X11/qt3/qrect.h include/X11/qt3/qregexp.h include/X11/qt3/qregion.h -include/X11/qt3/qremotefactory.h -include/X11/qt3/qremoteplugin.h include/X11/qt3/qrtlcodec.h include/X11/qt3/qscrbar.h include/X11/qt3/qscrollbar.h @@ -286,7 +284,6 @@ include/X11/qt3/qsessionmanager.h include/X11/qt3/qsettings.h include/X11/qt3/qsgistyle.h include/X11/qt3/qshared.h -include/X11/qt3/qsharedmemory.h include/X11/qt3/qsignal.h include/X11/qt3/qsignalmapper.h include/X11/qt3/qsignalslotimp.h @@ -522,6 +519,7 @@ lib/qt3/man/man3/QGLContext.3 lib/qt3/man/man3/QGLFormat.3 lib/qt3/man/man3/QGLWidget.3 lib/qt3/man/man3/QGLayoutIterator.3 +lib/qt3/man/man3/QGb18030Codec.3 lib/qt3/man/man3/QGbkCodec.3 lib/qt3/man/man3/QGrid.3 lib/qt3/man/man3/QGridLayout.3 @@ -603,6 +601,8 @@ lib/qt3/man/man3/QNetworkOperation.3 lib/qt3/man/man3/QNetworkProtocol.3 lib/qt3/man/man3/QObject.3 lib/qt3/man/man3/QObjectCleanupHandler.3 +lib/qt3/man/man3/QObjectList.3 +lib/qt3/man/man3/QObjectListIt.3 lib/qt3/man/man3/QPNGImagePacker.3 lib/qt3/man/man3/QPaintDevice.3 lib/qt3/man/man3/QPaintDeviceMetrics.3 @@ -891,6 +891,7 @@ lib/qt3/man/man3/qfontmanager.3 lib/qt3/man/man3/qfontmetrics.3 lib/qt3/man/man3/qframe.3 lib/qt3/man/man3/qftp.3 +lib/qt3/man/man3/qgb18030codec.3 lib/qt3/man/man3/qgbkcodec.3 lib/qt3/man/man3/qgl.3 lib/qt3/man/man3/qglayoutiterator.3 @@ -978,6 +979,8 @@ lib/qt3/man/man3/qnpstream.3 lib/qt3/man/man3/qnpwidget.3 lib/qt3/man/man3/qobject.3 lib/qt3/man/man3/qobjectcleanuphandler.3 +lib/qt3/man/man3/qobjectlist.3 +lib/qt3/man/man3/qobjectlistit.3 lib/qt3/man/man3/qpaintdevice.3 lib/qt3/man/man3/qpaintdevicemetrics.3 lib/qt3/man/man3/qpainter.3 @@ -1152,7 +1155,6 @@ lib/qt3/plugins/designer/librcplugin.so lib/qt3/plugins/designer/libwizards.so lib/qt3/plugins/imageformats/libqjpeg.so lib/qt3/plugins/imageformats/libqmng.so -share/doc/qt3/ANNOUNCE share/doc/qt3/FAQ share/doc/qt3/LICENSE.GPL share/doc/qt3/README diff --git a/x11/qt3/pkg/PLIST-examples b/x11/qt3/pkg/PLIST-examples index 09c1974ecf0..8eb53ed9bb3 100644 --- a/x11/qt3/pkg/PLIST-examples +++ b/x11/qt3/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.1.1.1 2002/03/04 16:13:05 espie Exp $ +@comment $OpenBSD: PLIST-examples,v 1.2 2002/07/17 21:43:36 espie Exp $ lib/qt3/examples/Makefile lib/qt3/examples/README lib/qt3/examples/aclock/.qmake.internal.cache @@ -88,6 +88,51 @@ lib/qt3/examples/canvas/main.cpp lib/qt3/examples/canvas/makeimg.cpp lib/qt3/examples/canvas/qt-trans.xpm lib/qt3/examples/canvas/qtlogo.png +lib/qt3/examples/chart/.qmake.internal.cache +lib/qt3/examples/chart/Makefile +lib/qt3/examples/chart/canvastext.h +lib/qt3/examples/chart/canvasview.cpp +lib/qt3/examples/chart/canvasview.h +lib/qt3/examples/chart/chart +lib/qt3/examples/chart/chart.doc +lib/qt3/examples/chart/chart.pro +lib/qt3/examples/chart/chartform.cpp +lib/qt3/examples/chart/chartform.h +lib/qt3/examples/chart/chartform_canvas.cpp +lib/qt3/examples/chart/chartform_files.cpp +lib/qt3/examples/chart/element.cpp +lib/qt3/examples/chart/element.h +lib/qt3/examples/chart/images/chart-forms.sk +lib/qt3/examples/chart/images/file_new.xpm +lib/qt3/examples/chart/images/file_open.xpm +lib/qt3/examples/chart/images/file_print.xpm +lib/qt3/examples/chart/images/file_save.xpm +lib/qt3/examples/chart/images/file_saveaspostscript.xpm +lib/qt3/examples/chart/images/options_horizontalbarchart.xpm +lib/qt3/examples/chart/images/options_piechart.xpm +lib/qt3/examples/chart/images/options_setdata.xpm +lib/qt3/examples/chart/images/options_setfont.xpm +lib/qt3/examples/chart/images/options_setoptions.xpm +lib/qt3/examples/chart/images/options_verticalbarchart.xpm +lib/qt3/examples/chart/images/pattern01.xpm +lib/qt3/examples/chart/images/pattern02.xpm +lib/qt3/examples/chart/images/pattern03.xpm +lib/qt3/examples/chart/images/pattern04.xpm +lib/qt3/examples/chart/images/pattern05.xpm +lib/qt3/examples/chart/images/pattern06.xpm +lib/qt3/examples/chart/images/pattern07.xpm +lib/qt3/examples/chart/images/pattern08.xpm +lib/qt3/examples/chart/images/pattern09.xpm +lib/qt3/examples/chart/images/pattern10.xpm +lib/qt3/examples/chart/images/pattern11.xpm +lib/qt3/examples/chart/images/pattern12.xpm +lib/qt3/examples/chart/images/pattern13.xpm +lib/qt3/examples/chart/images/pattern14.xpm +lib/qt3/examples/chart/main.cpp +lib/qt3/examples/chart/optionsform.cpp +lib/qt3/examples/chart/optionsform.h +lib/qt3/examples/chart/setdataform.cpp +lib/qt3/examples/chart/setdataform.h lib/qt3/examples/checklists/.qmake.internal.cache lib/qt3/examples/checklists/Makefile lib/qt3/examples/checklists/checklists @@ -362,7 +407,6 @@ lib/qt3/examples/demo/qasteroids/view.cpp lib/qt3/examples/demo/qasteroids/view.h lib/qt3/examples/demo/qthumbwheel.cpp lib/qt3/examples/demo/qthumbwheel.h -lib/qt3/examples/demo/sql/book.sql lib/qt3/examples/demo/sql/book.ui lib/qt3/examples/demo/sql/book.ui.h lib/qt3/examples/demo/sql/connect.ui @@ -1492,6 +1536,8 @@ lib/qt3/tutorial/tutorial.pro @dirrm lib/qt3/examples/customlayout @dirrm lib/qt3/examples/cursor @dirrm lib/qt3/examples/checklists +@dirrm lib/qt3/examples/chart/images +@dirrm lib/qt3/examples/chart @dirrm lib/qt3/examples/canvas @dirrm lib/qt3/examples/buttongroups @dirrm lib/qt3/examples/biff diff --git a/x11/qt3/pkg/PLIST-html b/x11/qt3/pkg/PLIST-html index 3a874f598b2..7527a2b1d5d 100644 --- a/x11/qt3/pkg/PLIST-html +++ b/x11/qt3/pkg/PLIST-html @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-html,v 1.3 2002/04/09 16:25:15 espie Exp $ +@comment $OpenBSD: PLIST-html,v 1.4 2002/07/17 21:43:37 espie Exp $ share/doc/qt3/html/aboutqt.html share/doc/qt3/html/abstract-connections.png share/doc/qt3/html/abstractwidgets.html @@ -17,6 +17,7 @@ share/doc/qt3/html/assistant-2.html share/doc/qt3/html/assistant-3.html share/doc/qt3/html/assistant-4.html share/doc/qt3/html/assistant.html +share/doc/qt3/html/assistant.xml share/doc/qt3/html/basic.html share/doc/qt3/html/bearings.png share/doc/qt3/html/biff-example.html @@ -30,8 +31,14 @@ share/doc/qt3/html/buttongroup-w.png share/doc/qt3/html/buttongroups-example.html share/doc/qt3/html/buyhowto.html share/doc/qt3/html/callbacks.png +share/doc/qt3/html/canvas-chart-example.html share/doc/qt3/html/canvas-example.html share/doc/qt3/html/canvas.html +share/doc/qt3/html/chart-forms.png +share/doc/qt3/html/chart-main.png +share/doc/qt3/html/chart-main2.png +share/doc/qt3/html/chart-options.png +share/doc/qt3/html/chart-setdata.png share/doc/qt3/html/checklists-example.html share/doc/qt3/html/classchart.html share/doc/qt3/html/classes.html @@ -71,6 +78,7 @@ share/doc/qt3/html/designer-manual-8.html share/doc/qt3/html/designer-manual-9.html share/doc/qt3/html/designer-manual.html share/doc/qt3/html/designer.png +share/doc/qt3/html/designer.xml share/doc/qt3/html/designer1.jpg share/doc/qt3/html/designer2.jpg share/doc/qt3/html/designer3.jpg @@ -111,6 +119,21 @@ share/doc/qt3/html/embedporting.html share/doc/qt3/html/environment.html share/doc/qt3/html/events.html share/doc/qt3/html/eventsandfilters.html +share/doc/qt3/html/examples-chart-canvastext-h.html +share/doc/qt3/html/examples-chart-canvasview-cpp.html +share/doc/qt3/html/examples-chart-canvasview-h.html +share/doc/qt3/html/examples-chart-chart-pro.html +share/doc/qt3/html/examples-chart-chartform-cpp.html +share/doc/qt3/html/examples-chart-chartform-h.html +share/doc/qt3/html/examples-chart-chartform_canvas-cpp.html +share/doc/qt3/html/examples-chart-chartform_files-cpp.html +share/doc/qt3/html/examples-chart-element-cpp.html +share/doc/qt3/html/examples-chart-element-h.html +share/doc/qt3/html/examples-chart-main-cpp.html +share/doc/qt3/html/examples-chart-optionsform-cpp.html +share/doc/qt3/html/examples-chart-optionsform-h.html +share/doc/qt3/html/examples-chart-setdataform-cpp.html +share/doc/qt3/html/examples-chart-setdataform-h.html share/doc/qt3/html/examples.html share/doc/qt3/html/face.jpg share/doc/qt3/html/filechooser.png @@ -145,6 +168,7 @@ share/doc/qt3/html/how-to-learn-qt.html share/doc/qt3/html/httpd-example.html share/doc/qt3/html/i18n-example.html share/doc/qt3/html/i18n.html +share/doc/qt3/html/iconset.png share/doc/qt3/html/iconview-example.html share/doc/qt3/html/iconview-simple_dd-main-cpp.html share/doc/qt3/html/iconview-simple_dd-main-h.html @@ -172,6 +196,7 @@ share/doc/qt3/html/linguist-manual-3.html share/doc/qt3/html/linguist-manual-4.html share/doc/qt3/html/linguist-manual.html share/doc/qt3/html/linguist.png +share/doc/qt3/html/linguist.xml share/doc/qt3/html/listbox-example.html share/doc/qt3/html/listboxcombo-example.html share/doc/qt3/html/listviews-example.html @@ -219,6 +244,9 @@ share/doc/qt3/html/organizers.html share/doc/qt3/html/outliner-example.html share/doc/qt3/html/overviews-list.html share/doc/qt3/html/palette.png +share/doc/qt3/html/pen-cap-styles.png +share/doc/qt3/html/pen-join-styles.png +share/doc/qt3/html/pen-styles.png share/doc/qt3/html/penstyles.png share/doc/qt3/html/phrasebookdialog.png share/doc/qt3/html/phrasebookopen.png @@ -419,13 +447,7 @@ share/doc/qt3/html/qd-chapdialog-taborder.png share/doc/qt3/html/qd-chapdialogs-addingwidgets.png share/doc/qt3/html/qd-chapdialogs-creatingmulticlipform3.png share/doc/qt3/html/qd-chapdialogs-creatingnewprojects.png -share/doc/qt3/html/qd-chapdialogs-layoutwidgets-part2-stepone-twogroups.png -share/doc/qt3/html/qd-chapdialogs-layoutwidgets-part2-steptwo-layoutform.png -share/doc/qt3/html/qd-chapdialogs-layoutwidgets-part3-stepfive-layoutform.png -share/doc/qt3/html/qd-chapdialogs-layoutwidgets-part3-steptwo-addspacer.png share/doc/qt3/html/qd-chapdialogs-layoutwidgets-stepone-after.png -share/doc/qt3/html/qd-chapdialogs-layoutwidgets-stepthree-groupedwidgets.png -share/doc/qt3/html/qd-chapdialogs-layoutwidgets-stepthree-rubberband.png share/doc/qt3/html/qd-chapdialogs-objectexplorer.png share/doc/qt3/html/qd-chapdialogs-propertyeditor.png share/doc/qt3/html/qd-chapmainwin-actioneditor1.png @@ -508,6 +530,12 @@ share/doc/qt3/html/qd-finddirectorydialog.png share/doc/qt3/html/qd-helpmenu.png share/doc/qt3/html/qd-helptoolbuttons3.png share/doc/qt3/html/qd-inputtoolbuttons3.png +share/doc/qt3/html/qd-layout2.1-twogroups.png +share/doc/qt3/html/qd-layout2.2-layoutform.png +share/doc/qt3/html/qd-layout3-groupedwidgets.png +share/doc/qt3/html/qd-layout3-rubberband.png +share/doc/qt3/html/qd-layout3.2-addspacer.png +share/doc/qt3/html/qd-layout3.5-layoutform.png share/doc/qt3/html/qd-layoutmenu1.png share/doc/qt3/html/qd-layouttoolbuttons3.png share/doc/qt3/html/qd-mainwinwzd.png @@ -661,6 +689,7 @@ share/doc/qt3/html/qembed.html share/doc/qt3/html/qerrormessage-h.html share/doc/qt3/html/qerrormessage-members.html share/doc/qt3/html/qerrormessage.html +share/doc/qt3/html/qerrormessage.png share/doc/qt3/html/qeucjpcodec-h.html share/doc/qt3/html/qeucjpcodec-members.html share/doc/qt3/html/qeucjpcodec.html @@ -718,7 +747,9 @@ share/doc/qt3/html/qframe.html share/doc/qt3/html/qftp-h.html share/doc/qt3/html/qftp-members.html share/doc/qt3/html/qftp.html -share/doc/qt3/html/qgbkcodec-h.html +share/doc/qt3/html/qgb18030codec-h.html +share/doc/qt3/html/qgb18030codec-members.html +share/doc/qt3/html/qgb18030codec.html share/doc/qt3/html/qgbkcodec-members.html share/doc/qt3/html/qgbkcodec.html share/doc/qt3/html/qgfx_qws-h.html @@ -919,6 +950,7 @@ share/doc/qt3/html/qmake-manual-5.html share/doc/qt3/html/qmake-manual-6.html share/doc/qt3/html/qmake-manual-7.html share/doc/qt3/html/qmake-manual.html +share/doc/qt3/html/qmake.xml share/doc/qt3/html/qmap-h.html share/doc/qt3/html/qmap-members.html share/doc/qt3/html/qmap.html @@ -937,8 +969,11 @@ share/doc/qt3/html/qmenubar.html share/doc/qt3/html/qmenudata-h.html share/doc/qt3/html/qmenudata-members.html share/doc/qt3/html/qmenudata.html +share/doc/qt3/html/qmessagebox-crit.png share/doc/qt3/html/qmessagebox-h.html +share/doc/qt3/html/qmessagebox-info.png share/doc/qt3/html/qmessagebox-members.html +share/doc/qt3/html/qmessagebox-warn.png share/doc/qt3/html/qmessagebox.html share/doc/qt3/html/qmetaobject-h.html share/doc/qt3/html/qmetaobject-members.html @@ -996,6 +1031,11 @@ share/doc/qt3/html/qobject.html share/doc/qt3/html/qobjectcleanuphandler-h.html share/doc/qt3/html/qobjectcleanuphandler-members.html share/doc/qt3/html/qobjectcleanuphandler.html +share/doc/qt3/html/qobjectlist-h.html +share/doc/qt3/html/qobjectlist-members.html +share/doc/qt3/html/qobjectlist.html +share/doc/qt3/html/qobjectlistit-members.html +share/doc/qt3/html/qobjectlistit.html share/doc/qt3/html/qpaintdevice-h.html share/doc/qt3/html/qpaintdevice-members.html share/doc/qt3/html/qpaintdevice.html @@ -1284,9 +1324,11 @@ share/doc/qt3/html/qstylesheet-members.html share/doc/qt3/html/qstylesheet.html share/doc/qt3/html/qstylesheetitem-members.html share/doc/qt3/html/qstylesheetitem.html +share/doc/qt3/html/qt-colors.png share/doc/qt3/html/qt-members.html share/doc/qt3/html/qt-template-lib.html share/doc/qt3/html/qt.html +share/doc/qt3/html/qt.xml share/doc/qt3/html/qt30-class-chart.png share/doc/qt3/html/qtab-members.html share/doc/qt3/html/qtab.html @@ -1592,33 +1634,25 @@ share/doc/qt3/html/sql.html share/doc/qt3/html/sqltable-example.html share/doc/qt3/html/statistics-example.html share/doc/qt3/html/step-by-step-examples.html -share/doc/qt3/html/t1.html share/doc/qt3/html/t1.png -share/doc/qt3/html/t10-Makefile.html share/doc/qt3/html/t10-cannon-cpp.html share/doc/qt3/html/t10-cannon-h.html share/doc/qt3/html/t10-lcdrange-cpp.html share/doc/qt3/html/t10-lcdrange-h.html share/doc/qt3/html/t10-main-cpp.html -share/doc/qt3/html/t10.html share/doc/qt3/html/t10.png -share/doc/qt3/html/t11-Makefile.html share/doc/qt3/html/t11-cannon-cpp.html share/doc/qt3/html/t11-cannon-h.html share/doc/qt3/html/t11-lcdrange-cpp.html share/doc/qt3/html/t11-lcdrange-h.html share/doc/qt3/html/t11-main-cpp.html -share/doc/qt3/html/t11.html share/doc/qt3/html/t11.png -share/doc/qt3/html/t12-Makefile.html share/doc/qt3/html/t12-cannon-cpp.html share/doc/qt3/html/t12-cannon-h.html share/doc/qt3/html/t12-lcdrange-cpp.html share/doc/qt3/html/t12-lcdrange-h.html share/doc/qt3/html/t12-main-cpp.html -share/doc/qt3/html/t12.html share/doc/qt3/html/t12.png -share/doc/qt3/html/t13-Makefile.html share/doc/qt3/html/t13-cannon-cpp.html share/doc/qt3/html/t13-cannon-h.html share/doc/qt3/html/t13-gamebrd-cpp.html @@ -1626,9 +1660,7 @@ share/doc/qt3/html/t13-gamebrd-h.html share/doc/qt3/html/t13-lcdrange-cpp.html share/doc/qt3/html/t13-lcdrange-h.html share/doc/qt3/html/t13-main-cpp.html -share/doc/qt3/html/t13.html share/doc/qt3/html/t13.png -share/doc/qt3/html/t14-Makefile.html share/doc/qt3/html/t14-cannon-cpp.html share/doc/qt3/html/t14-cannon-h.html share/doc/qt3/html/t14-gamebrd-cpp.html @@ -1636,39 +1668,27 @@ share/doc/qt3/html/t14-gamebrd-h.html share/doc/qt3/html/t14-lcdrange-cpp.html share/doc/qt3/html/t14-lcdrange-h.html share/doc/qt3/html/t14-main-cpp.html -share/doc/qt3/html/t14.html share/doc/qt3/html/t14.png -share/doc/qt3/html/t2.html share/doc/qt3/html/t2.png -share/doc/qt3/html/t3.html share/doc/qt3/html/t3.png -share/doc/qt3/html/t4.html share/doc/qt3/html/t4.png -share/doc/qt3/html/t5.html share/doc/qt3/html/t5.png -share/doc/qt3/html/t6.html share/doc/qt3/html/t6.png -share/doc/qt3/html/t7-Makefile.html share/doc/qt3/html/t7-lcdrange-cpp.html share/doc/qt3/html/t7-lcdrange-h.html share/doc/qt3/html/t7-main-cpp.html -share/doc/qt3/html/t7.html share/doc/qt3/html/t7.png -share/doc/qt3/html/t8-Makefile.html share/doc/qt3/html/t8-cannon-cpp.html share/doc/qt3/html/t8-cannon-h.html share/doc/qt3/html/t8-lcdrange-cpp.html share/doc/qt3/html/t8-lcdrange-h.html share/doc/qt3/html/t8-main-cpp.html -share/doc/qt3/html/t8.html share/doc/qt3/html/t8.png -share/doc/qt3/html/t9-Makefile.html share/doc/qt3/html/t9-cannon-cpp.html share/doc/qt3/html/t9-cannon-h.html share/doc/qt3/html/t9-lcdrange-cpp.html share/doc/qt3/html/t9-lcdrange-h.html share/doc/qt3/html/t9-main-cpp.html -share/doc/qt3/html/t9.html share/doc/qt3/html/t9.png share/doc/qt3/html/t9_1.png share/doc/qt3/html/t9_2.png @@ -1713,6 +1733,32 @@ share/doc/qt3/html/tt3_11_en.png share/doc/qt3/html/tt3_11_pt.png share/doc/qt3/html/tutorial.html share/doc/qt3/html/tutorial.png +share/doc/qt3/html/tutorial1-01.html +share/doc/qt3/html/tutorial1-02.html +share/doc/qt3/html/tutorial1-03.html +share/doc/qt3/html/tutorial1-04.html +share/doc/qt3/html/tutorial1-05.html +share/doc/qt3/html/tutorial1-06.html +share/doc/qt3/html/tutorial1-07.html +share/doc/qt3/html/tutorial1-08.html +share/doc/qt3/html/tutorial1-09.html +share/doc/qt3/html/tutorial1-10.html +share/doc/qt3/html/tutorial1-11.html +share/doc/qt3/html/tutorial1-12.html +share/doc/qt3/html/tutorial1-13.html +share/doc/qt3/html/tutorial1-14.html +share/doc/qt3/html/tutorial2-01.html +share/doc/qt3/html/tutorial2-02.html +share/doc/qt3/html/tutorial2-03.html +share/doc/qt3/html/tutorial2-04.html +share/doc/qt3/html/tutorial2-05.html +share/doc/qt3/html/tutorial2-06.html +share/doc/qt3/html/tutorial2-07.html +share/doc/qt3/html/tutorial2-08.html +share/doc/qt3/html/tutorial2-09.html +share/doc/qt3/html/tutorial2-10.html +share/doc/qt3/html/tutorial2-11.html +share/doc/qt3/html/tutorial2.html share/doc/qt3/html/uic.html share/doc/qt3/html/unicode.html share/doc/qt3/html/unsmooth.png diff --git a/x11/qt3/pkg/PLIST-mysql b/x11/qt3/pkg/PLIST-mysql index 7536d32d453..da5b08db424 100644 --- a/x11/qt3/pkg/PLIST-mysql +++ b/x11/qt3/pkg/PLIST-mysql @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2002/03/04 16:13:05 espie Exp $ +@comment $OpenBSD: PLIST-mysql,v 1.2 2002/07/17 21:43:37 espie Exp $ lib/qt3/plugins/sqldrivers/libqsqlmysql.so diff --git a/x11/qt3/pkg/PLIST-postgresql b/x11/qt3/pkg/PLIST-postgresql index 3bdbe356627..5d3eaa0e11d 100644 --- a/x11/qt3/pkg/PLIST-postgresql +++ b/x11/qt3/pkg/PLIST-postgresql @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-postgresql,v 1.1.1.1 2002/03/04 16:13:05 espie Exp $ +@comment $OpenBSD: PLIST-postgresql,v 1.2 2002/07/17 21:43:37 espie Exp $ lib/qt3/plugins/sqldrivers/libqsqlpsql.so