diff options
author | skrll <skrll> | 2002-08-27 09:13:48 +0000 |
---|---|---|
committer | skrll <skrll> | 2002-08-27 09:13:48 +0000 |
commit | 8cba1231bf507e0ad44421ee21d8be71e56a70fc (patch) | |
tree | ee56ae545c100fb462e9a9a2c9d546b4016767eb /x11 | |
parent | 535698ca41ba9c3efbd320f66fa910a54d0d6053 (diff) | |
download | pkgsrc-8cba1231bf507e0ad44421ee21d8be71e56a70fc.tar.gz |
Update to 3.0.5.
Qt 3.0.5 is a bugfix release. It maintains both forward and backward
compatibility (source and binary) with Qt 3.0.4.
To avoid problems with loading plugins which link against different Qt
libraries, the semantics of plugin loading has been changed.
While I'm here add the PTHREAD_OPTS+=require thing to the buildlink files.
TODO: check qt3-{tools,docs} wrt buildlink2.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/qt3-docs/Makefile | 4 | ||||
-rw-r--r-- | x11/qt3-docs/PLIST | 73 | ||||
-rw-r--r-- | x11/qt3-libs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt3-libs/PLIST | 10 | ||||
-rw-r--r-- | x11/qt3-libs/buildlink.mk | 5 | ||||
-rw-r--r-- | x11/qt3-libs/buildlink2.mk | 5 | ||||
-rw-r--r-- | x11/qt3-libs/distinfo | 6 | ||||
-rw-r--r-- | x11/qt3-tools/Makefile | 3 | ||||
-rw-r--r-- | x11/qt3-tools/PLIST | 5 | ||||
-rw-r--r-- | x11/qt3-tools/buildlink.mk | 4 |
10 files changed, 83 insertions, 35 deletions
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile index 53407aec85a..494ef538809 100644 --- a/x11/qt3-docs/Makefile +++ b/x11/qt3-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/06/01 10:59:22 skrll Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/27 09:13:51 skrll Exp $ # .include "../qt3-libs/Makefile.common" @@ -6,7 +6,7 @@ PKGNAME= qt3-docs-${QTVERSION} COMMENT= Documentation for the QT C++ X GUI toolkit -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes NO_PATCH= yes NO_CONFIGURE= yes diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST index b77c0dc9630..b055ddd53cc 100644 --- a/x11/qt3-docs/PLIST +++ b/x11/qt3-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/04 13:30:10 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/27 09:13:51 skrll Exp $ qt3/doc/html/README qt3/doc/html/README.QT qt3/doc/html/aboutqt.html @@ -19,6 +19,7 @@ qt3/doc/html/assistant-2.html qt3/doc/html/assistant-3.html qt3/doc/html/assistant-4.html qt3/doc/html/assistant.html +qt3/doc/html/assistant.xml qt3/doc/html/basic.html qt3/doc/html/bearings.png qt3/doc/html/biff-example.html @@ -32,8 +33,14 @@ qt3/doc/html/buttongroup-w.png qt3/doc/html/buttongroups-example.html qt3/doc/html/buyhowto.html qt3/doc/html/callbacks.png +qt3/doc/html/canvas-chart-example.html qt3/doc/html/canvas-example.html qt3/doc/html/canvas.html +qt3/doc/html/chart-forms.png +qt3/doc/html/chart-main.png +qt3/doc/html/chart-main2.png +qt3/doc/html/chart-options.png +qt3/doc/html/chart-setdata.png qt3/doc/html/checklists-example.html qt3/doc/html/classchart.html qt3/doc/html/classes.html @@ -73,6 +80,7 @@ qt3/doc/html/designer-manual-8.html qt3/doc/html/designer-manual-9.html qt3/doc/html/designer-manual.html qt3/doc/html/designer.png +qt3/doc/html/designer.xml qt3/doc/html/designer1.jpg qt3/doc/html/designer2.jpg qt3/doc/html/designer3.jpg @@ -113,6 +121,21 @@ qt3/doc/html/embedporting.html qt3/doc/html/environment.html qt3/doc/html/events.html qt3/doc/html/eventsandfilters.html +qt3/doc/html/examples-chart-canvastext-h.html +qt3/doc/html/examples-chart-canvasview-cpp.html +qt3/doc/html/examples-chart-canvasview-h.html +qt3/doc/html/examples-chart-chart-pro.html +qt3/doc/html/examples-chart-chartform-cpp.html +qt3/doc/html/examples-chart-chartform-h.html +qt3/doc/html/examples-chart-chartform_canvas-cpp.html +qt3/doc/html/examples-chart-chartform_files-cpp.html +qt3/doc/html/examples-chart-element-cpp.html +qt3/doc/html/examples-chart-element-h.html +qt3/doc/html/examples-chart-main-cpp.html +qt3/doc/html/examples-chart-optionsform-cpp.html +qt3/doc/html/examples-chart-optionsform-h.html +qt3/doc/html/examples-chart-setdataform-cpp.html +qt3/doc/html/examples-chart-setdataform-h.html qt3/doc/html/examples.html qt3/doc/html/face.jpg qt3/doc/html/filechooser.png @@ -175,6 +198,7 @@ qt3/doc/html/linguist-manual-3.html qt3/doc/html/linguist-manual-4.html qt3/doc/html/linguist-manual.html qt3/doc/html/linguist.png +qt3/doc/html/linguist.xml qt3/doc/html/listbox-example.html qt3/doc/html/listboxcombo-example.html qt3/doc/html/listviews-example.html @@ -763,6 +787,9 @@ qt3/doc/html/qgroupbox.html qt3/doc/html/qgroupboxes.png qt3/doc/html/qgrpbox-m.png qt3/doc/html/qgrpbox-w.png +qt3/doc/html/qguardedptr-h.html +qt3/doc/html/qguardedptr-members.html +qt3/doc/html/qguardedptr.html qt3/doc/html/qhbox-h.html qt3/doc/html/qhbox-m.png qt3/doc/html/qhbox-members.html @@ -925,6 +952,7 @@ qt3/doc/html/qmake-manual-5.html qt3/doc/html/qmake-manual-6.html qt3/doc/html/qmake-manual-7.html qt3/doc/html/qmake-manual.html +qt3/doc/html/qmake.xml qt3/doc/html/qmap-h.html qt3/doc/html/qmap-members.html qt3/doc/html/qmap.html @@ -1302,6 +1330,7 @@ qt3/doc/html/qt-colors.png qt3/doc/html/qt-members.html qt3/doc/html/qt-template-lib.html qt3/doc/html/qt.html +qt3/doc/html/qt.xml qt3/doc/html/qt30-class-chart.png qt3/doc/html/qtab-members.html qt3/doc/html/qtab.html @@ -1607,28 +1636,24 @@ qt3/doc/html/sql.html qt3/doc/html/sqltable-example.html qt3/doc/html/statistics-example.html qt3/doc/html/step-by-step-examples.html -qt3/doc/html/t1.html qt3/doc/html/t1.png qt3/doc/html/t10-cannon-cpp.html qt3/doc/html/t10-cannon-h.html qt3/doc/html/t10-lcdrange-cpp.html qt3/doc/html/t10-lcdrange-h.html qt3/doc/html/t10-main-cpp.html -qt3/doc/html/t10.html qt3/doc/html/t10.png qt3/doc/html/t11-cannon-cpp.html qt3/doc/html/t11-cannon-h.html qt3/doc/html/t11-lcdrange-cpp.html qt3/doc/html/t11-lcdrange-h.html qt3/doc/html/t11-main-cpp.html -qt3/doc/html/t11.html qt3/doc/html/t11.png qt3/doc/html/t12-cannon-cpp.html qt3/doc/html/t12-cannon-h.html qt3/doc/html/t12-lcdrange-cpp.html qt3/doc/html/t12-lcdrange-h.html qt3/doc/html/t12-main-cpp.html -qt3/doc/html/t12.html qt3/doc/html/t12.png qt3/doc/html/t13-cannon-cpp.html qt3/doc/html/t13-cannon-h.html @@ -1637,7 +1662,6 @@ qt3/doc/html/t13-gamebrd-h.html qt3/doc/html/t13-lcdrange-cpp.html qt3/doc/html/t13-lcdrange-h.html qt3/doc/html/t13-main-cpp.html -qt3/doc/html/t13.html qt3/doc/html/t13.png qt3/doc/html/t14-cannon-cpp.html qt3/doc/html/t14-cannon-h.html @@ -1646,36 +1670,27 @@ qt3/doc/html/t14-gamebrd-h.html qt3/doc/html/t14-lcdrange-cpp.html qt3/doc/html/t14-lcdrange-h.html qt3/doc/html/t14-main-cpp.html -qt3/doc/html/t14.html qt3/doc/html/t14.png -qt3/doc/html/t2.html qt3/doc/html/t2.png -qt3/doc/html/t3.html qt3/doc/html/t3.png -qt3/doc/html/t4.html qt3/doc/html/t4.png -qt3/doc/html/t5.html qt3/doc/html/t5.png -qt3/doc/html/t6.html qt3/doc/html/t6.png qt3/doc/html/t7-lcdrange-cpp.html qt3/doc/html/t7-lcdrange-h.html qt3/doc/html/t7-main-cpp.html -qt3/doc/html/t7.html qt3/doc/html/t7.png qt3/doc/html/t8-cannon-cpp.html qt3/doc/html/t8-cannon-h.html qt3/doc/html/t8-lcdrange-cpp.html qt3/doc/html/t8-lcdrange-h.html qt3/doc/html/t8-main-cpp.html -qt3/doc/html/t8.html qt3/doc/html/t8.png qt3/doc/html/t9-cannon-cpp.html qt3/doc/html/t9-cannon-h.html qt3/doc/html/t9-lcdrange-cpp.html qt3/doc/html/t9-lcdrange-h.html qt3/doc/html/t9-main-cpp.html -qt3/doc/html/t9.html qt3/doc/html/t9.png qt3/doc/html/t9_1.png qt3/doc/html/t9_2.png @@ -1720,6 +1735,32 @@ qt3/doc/html/tt3_11_en.png qt3/doc/html/tt3_11_pt.png qt3/doc/html/tutorial.html qt3/doc/html/tutorial.png +qt3/doc/html/tutorial1-01.html +qt3/doc/html/tutorial1-02.html +qt3/doc/html/tutorial1-03.html +qt3/doc/html/tutorial1-04.html +qt3/doc/html/tutorial1-05.html +qt3/doc/html/tutorial1-06.html +qt3/doc/html/tutorial1-07.html +qt3/doc/html/tutorial1-08.html +qt3/doc/html/tutorial1-09.html +qt3/doc/html/tutorial1-10.html +qt3/doc/html/tutorial1-11.html +qt3/doc/html/tutorial1-12.html +qt3/doc/html/tutorial1-13.html +qt3/doc/html/tutorial1-14.html +qt3/doc/html/tutorial2-01.html +qt3/doc/html/tutorial2-02.html +qt3/doc/html/tutorial2-03.html +qt3/doc/html/tutorial2-04.html +qt3/doc/html/tutorial2-05.html +qt3/doc/html/tutorial2-06.html +qt3/doc/html/tutorial2-07.html +qt3/doc/html/tutorial2-08.html +qt3/doc/html/tutorial2-09.html +qt3/doc/html/tutorial2-10.html +qt3/doc/html/tutorial2-11.html +qt3/doc/html/tutorial2.html qt3/doc/html/uic.html qt3/doc/html/unicode.html qt3/doc/html/unsmooth.png @@ -1875,6 +1916,7 @@ qt3/man/man3/QGrid.3 qt3/man/man3/QGridLayout.3 qt3/man/man3/QGridView.3 qt3/man/man3/QGroupBox.3 +qt3/man/man3/QGuardedPtr.3 qt3/man/man3/QHBox.3 qt3/man/man3/QHBoxLayout.3 qt3/man/man3/QHButtonGroup.3 @@ -2252,6 +2294,7 @@ qt3/man/man3/qgrid.3 qt3/man/man3/qgridlayout.3 qt3/man/man3/qgridview.3 qt3/man/man3/qgroupbox.3 +qt3/man/man3/qguardedptr.3 qt3/man/man3/qhbox.3 qt3/man/man3/qhboxlayout.3 qt3/man/man3/qhbuttongroup.3 diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index df0ac57fbd6..52d9bc47813 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2002/08/25 18:40:44 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/27 09:13:48 skrll Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 2 COMMENT= C++ X GUI toolkit USE_BUILDLINK2= yes diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST index d21cbf55150..023a528bfa8 100644 --- a/x11/qt3-libs/PLIST +++ b/x11/qt3-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:40:45 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/27 09:13:49 skrll Exp $ qt3/bin/moc qt3/include/jri.h qt3/include/jri_md.h @@ -27,9 +27,8 @@ qt3/include/private/qmutex_p.h qt3/include/private/qpainter_p.h qt3/include/private/qpluginmanager_p.h qt3/include/private/qpsprinter_p.h -qt3/include/private/qremoteinterface_p.h -qt3/include/private/qremotemessage_p.h qt3/include/private/qrichtext_p.h +qt3/include/private/qsharedmemory_p.h qt3/include/private/qsqldriverinterface_p.h qt3/include/private/qsqlmanager_p.h qt3/include/private/qstyleinterface_p.h @@ -134,6 +133,7 @@ qt3/include/qframe.h qt3/include/qftp.h qt3/include/qgarray.h qt3/include/qgb18030codec.h +qt3/include/qgbkcodec.h qt3/include/qgcache.h qt3/include/qgdict.h qt3/include/qgeneric.h @@ -260,8 +260,6 @@ qt3/include/qrangect.h qt3/include/qrect.h qt3/include/qregexp.h qt3/include/qregion.h -qt3/include/qremotefactory.h -qt3/include/qremoteplugin.h qt3/include/qrtlcodec.h qt3/include/qscrbar.h qt3/include/qscrollbar.h @@ -274,7 +272,6 @@ qt3/include/qsessionmanager.h qt3/include/qsettings.h qt3/include/qsgistyle.h qt3/include/qshared.h -qt3/include/qsharedmemory.h qt3/include/qsignal.h qt3/include/qsignalmapper.h qt3/include/qsignalslotimp.h @@ -386,6 +383,7 @@ qt3/plugins/imageformats/libqmng.a qt3/plugins/imageformats/libqmng.la qt3/plugins/imageformats/libqmng.so @dirrm qt3/plugins/imageformats +@dirrm qt3/plugins @dirrm qt3/lib @dirrm qt3/include/private @dirrm qt3/include diff --git a/x11/qt3-libs/buildlink.mk b/x11/qt3-libs/buildlink.mk index 2d473d60a5d..dd3ab4ed706 100644 --- a/x11/qt3-libs/buildlink.mk +++ b/x11/qt3-libs/buildlink.mk @@ -17,7 +17,7 @@ QT3_LIBS_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.4nb2 +BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.5 DEPENDS+= ${BUILDLINK_DEPENDS.qt3-libs}:../../x11/qt3-libs EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs @@ -34,11 +34,14 @@ REPLACE_BUILDLINK_SED+= -e "s|-L${BUILDLINK_QTDIR}/|-L${REAL_QTDIR}/|g" BUILDLINK_CONFIG_WRAPPER_SED+= -e "s|-I${REAL_QTDIR}/|-I${BUILDLINK_QTDIR}/|g" BUILDLINK_CONFIG_WRAPPER_SED+= -e "s|-L${REAL_QTDIR}/|-L${BUILDLINK_QTDIR}/|g" +PTHREAD_OPTS+= require + .include "../../devel/zlib/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/mng/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" CONFIGURE_ENV+= MOC="${BUILDLINK_QTDIR}/bin/moc" MAKE_ENV+= MOC="${BUILDLINK_QTDIR}/bin/moc" diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk index 1b8441de487..e9b4aacf0d2 100644 --- a/x11/qt3-libs/buildlink2.mk +++ b/x11/qt3-libs/buildlink2.mk @@ -4,7 +4,7 @@ QT3_LIBS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= qt3-libs -BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.4nb2 +BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.5 BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs @@ -15,11 +15,14 @@ BUILDLINK_FILES.qt3-libs+= qt3/lib/libqt-mt.* QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 +PTHREAD_OPTS+= require + .include "../../devel/zlib/buildlink2.mk" .include "../../graphics/Mesa/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/mng/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" CONFIGURE_ENV+= QTDIR="${QTDIR}" CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 61de67c9423..2fbbd3feaeb 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2002/08/25 18:40:46 jlam Exp $ +$NetBSD: distinfo,v 1.8 2002/08/27 09:13:49 skrll Exp $ -SHA1 (qt-x11-free-3.0.4.tar.gz) = 1bed903c622009fbbcce8386bb1b48b4202f3dbb -Size (qt-x11-free-3.0.4.tar.gz) = 15198015 bytes +SHA1 (qt-x11-free-3.0.5.tar.gz) = 8d6c3c5b17da2a32f1b4ff60a61998d0822c3e41 +Size (qt-x11-free-3.0.5.tar.gz) = 16057928 bytes SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180 SHA1 (patch-ac) = da32dd8596f36238fec30fb7b8a444d36e13ed92 diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index e7100c8636f..9a8f6deaf7e 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2002/08/25 19:23:58 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/27 09:13:50 skrll Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 2 COMMENT= QT GUI (WYSIWYG) builder and other tools CONFIGURE_ARGS+= -I${BUILDLINK_QTDIR}/include \ diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST index a55b5644e46..c2fc946cfd0 100644 --- a/x11/qt3-tools/PLIST +++ b/x11/qt3-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/23 17:11:19 skrll Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/27 09:13:50 skrll Exp $ qt3/bin/assistant qt3/bin/designer qt3/bin/linguist @@ -98,6 +98,8 @@ qt3/mkspecs/solaris-cc/qmake.conf qt3/mkspecs/solaris-cc/qplatformdefs.h qt3/mkspecs/solaris-g++/qmake.conf qt3/mkspecs/solaris-g++/qplatformdefs.h +qt3/mkspecs/solaris-g++-64/qplatformdefs.h +qt3/mkspecs/solaris-g++-64/qmake.conf qt3/mkspecs/solaris-kcc/qmake.conf qt3/mkspecs/solaris-kcc/qplatformdefs.h qt3/mkspecs/sunos-g++/qmake.conf @@ -177,6 +179,7 @@ qt3/plugins/designer/libwizards.so @dirrm qt3/mkspecs/solaris-64 @dirrm qt3/mkspecs/solaris-cc @dirrm qt3/mkspecs/solaris-g++ +@dirrm qt3/mkspecs/solaris-g++-64 @dirrm qt3/mkspecs/solaris-kcc @dirrm qt3/mkspecs/sunos-g++ @dirrm qt3/mkspecs/tru64-cxx diff --git a/x11/qt3-tools/buildlink.mk b/x11/qt3-tools/buildlink.mk index 7a8566c5ef5..60e3c5a7b4a 100644 --- a/x11/qt3-tools/buildlink.mk +++ b/x11/qt3-tools/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:23:58 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2002/08/27 09:13:50 skrll Exp $ # # This Makefile fragment is included by packages that use qt3-tools. # @@ -17,7 +17,7 @@ QT3_TOOLS_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.4 +BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.5 BUILDLINK_DEPENDS_METHOD.qt3-tools?= full .if ${BUILDLINK_DEPENDS_METHOD.qt3-tools} == build |