From c0a15974428ab52a421561e82e2a539b21813388 Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 3 Feb 2005 20:05:56 +0000 Subject: [PATCH] update to 3.3.4, lots of sec patches included. activate qt support. build dependency only, qt is smart enough to autoload that stuff... --- x11/qt3/Makefile | 12 +++--- x11/qt3/distinfo | 8 ++-- x11/qt3/patches/patch-configure | 16 ++++---- .../patch-qmake_generators_unix_unixmake2_cpp | 10 ++--- .../patches/patch-src_dialogs_qfiledialog_cpp | 12 ------ .../patches/patch-src_iconview_qiconview_cpp | 41 ++++++++----------- .../patch-src_kernel_qasyncimageio_cpp | 12 ------ x11/qt3/patches/patch-src_kernel_qimage_cpp | 13 ------ .../patches/patch-src_kernel_qthread_unix_cpp | 12 ------ x11/qt3/patches/patch-src_tools_qvaluelist_h | 8 ++-- .../patches/patch-src_widgets_qpopupmenu_cpp | 8 ++-- x11/qt3/pkg/PFRAG.shared | 6 +-- x11/qt3/pkg/PLIST | 8 ++-- x11/qt3/pkg/PLIST-examples | 6 +-- x11/qt3/pkg/PLIST-html | 7 +--- 15 files changed, 59 insertions(+), 120 deletions(-) delete mode 100644 x11/qt3/patches/patch-src_dialogs_qfiledialog_cpp delete mode 100644 x11/qt3/patches/patch-src_kernel_qasyncimageio_cpp delete mode 100644 x11/qt3/patches/patch-src_kernel_qimage_cpp delete mode 100644 x11/qt3/patches/patch-src_kernel_qthread_unix_cpp diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index 50a818e6213..ce2055e9697 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2004/12/19 13:09:45 alek Exp $ +# $OpenBSD: Makefile,v 1.46 2005/02/03 20:05:56 espie Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= "C++ X11 GUI toolkit" @@ -7,13 +7,13 @@ COMMENT-html= "off-line html documentation for qt3" COMMENT-postgresql= "PostgresSQL plugin for qt3" COMMENT-mysql= "MySQL plugin for qt3" -PKGNAME= qt3-${VERSION}p3 +PKGNAME= qt3-${VERSION} PKGNAME-mysql= qt3-mysql-${VERSION} PKGNAME-postgresql= qt3-postgresql-${VERSION} PKGNAME-examples= qt3-examples-${VERSION} FULLPKGNAME-html= qt3-html-${VERSION} -VERSION= 3.3 +VERSION= 3.4 DISTNAME= qt-x11-free-3.${VERSION} CATEGORIES= x11 MASTER_SITES= ftp://ftp.troll.no/qt/source/ @@ -51,6 +51,7 @@ CONFIGURE_ARGS= -qt-gif -system-libmng -system-libpng -system-libjpeg -system-zl -no-sql-odbc \ -tablet \ -xinerama \ + -cups \ -I${LOCALBASE}/include/libpng \ -I${X11BASE}/include/freetype2 \ -I${LOCALBASE}/include \ @@ -66,7 +67,7 @@ PKGDEBUG=-debug PKGDEBUG= .endif -FULLPKGNAME= qt3-mt-${VERSION}p4${PKGDEBUG} +FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG} CONFIGURE_ARGS+=-thread .if !${FLAVOR:L:Mdebug} && !${FLAVOR:L:Mno_examples} @@ -85,6 +86,7 @@ SUBPACKAGE?= LIB_DEPENDS= BUILD_DEPENDS=::graphics/jpeg +BUILD_DEPENDS=::print/cups e= .if ${FLAVOR:L:Mno_mysql} @@ -159,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.33 qui.so.1.0 \ +LIBRARIES=qt-mt.so.3.34 qui.so.1.0 \ editor.a designercore.a qassistantclient.a .if !${FLAVOR:L:Mdebug} diff --git a/x11/qt3/distinfo b/x11/qt3/distinfo index f90f2127a3c..4138088f9f4 100644 --- a/x11/qt3/distinfo +++ b/x11/qt3/distinfo @@ -1,4 +1,4 @@ -MD5 (qt-x11-free-3.3.3.tar.gz) = b0b98c938851d42a90632b990dca28c0 -RMD160 (qt-x11-free-3.3.3.tar.gz) = 923be25ca398d9d004297a87f1628212dd1ac81a -SHA1 (qt-x11-free-3.3.3.tar.gz) = 79851748f47d7f2ca43549b388942548b376a132 -SIZE (qt-x11-free-3.3.3.tar.gz) = 17358091 +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 diff --git a/x11/qt3/patches/patch-configure b/x11/qt3/patches/patch-configure index 83efc404df7..b54d4b6463d 100644 --- a/x11/qt3/patches/patch-configure +++ b/x11/qt3/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.10 2004/09/15 19:25:12 espie Exp $ ---- configure.orig Mon Jun 14 11:18:55 2004 -+++ configure Sun Sep 5 13:22:25 2004 -@@ -972,7 +972,7 @@ while [ "$#" -gt 0 ]; do +$OpenBSD: patch-configure,v 1.11 2005/02/03 20:05:56 espie Exp $ +--- configure.orig Mon Oct 18 19:17:00 2004 ++++ configure Fri Jan 28 10:59:46 2005 +@@ -973,7 +973,7 @@ while [ "$#" -gt 0 ]; do v|verbose) if [ "$VAL" = "yes" ]; then if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.10 2004/09/15 19:25:12 espie Exp $ else OPT_VERBOSE=yes fi -@@ -1617,7 +1617,7 @@ if echo $MODULES | grep sql >/dev/null; +@@ -1618,7 +1618,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" @@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.10 2004/09/15 19:25:12 espie Exp $ TDS_REQ="-lsybdb sybfront.h sybdb.h" DB2_REQ="-ldb2 sqlcli.h sqlcli1.h" IBASE_REQ="-lgds ibase.h" -@@ -2350,7 +2350,7 @@ if [ "$Edition" = "free" ]; then +@@ -2351,7 +2351,7 @@ if [ "$Edition" = "free" ]; then else echo "Do you accept the terms of $affix license? \c" fi @@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.10 2004/09/15 19:25:12 espie Exp $ echo if [ "$acceptance" = "yes" ]; then break -@@ -2832,8 +2832,8 @@ fi +@@ -2833,8 +2833,8 @@ fi if [ "$CFG_LIBMNG" = "system" ]; then QMAKE_CONFIG="$QMAKE_CONFIG system-mng" if [ "$CFG_MNG" = "yes" ]; then @@ -39,7 +39,7 @@ $OpenBSD: patch-configure,v 1.10 2004/09/15 19:25:12 espie Exp $ fi fi if [ "$CFG_MNG" = "no" ]; then -@@ -2859,8 +2859,8 @@ fi +@@ -2860,8 +2860,8 @@ fi if [ "$CFG_LIBPNG" = "system" ]; then QMAKE_CONFIG="$QMAKE_CONFIG system-png" if [ "$CFG_PNG" = "yes" ]; then diff --git a/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp b/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp index 11dd5bba7a6..a8af3ac9d74 100644 --- a/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp +++ b/x11/qt3/patches/patch-qmake_generators_unix_unixmake2_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.11 2004/07/22 23:03:09 brad Exp $ ---- qmake/generators/unix/unixmake2.cpp.orig 2004-04-19 03:36:24.000000000 -0600 -+++ qmake/generators/unix/unixmake2.cpp 2004-06-19 20:59:08.000000000 -0600 +$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 @@ -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.11 2004/07/22 23:03:09 b } else { t << "TARGETD = " << var("TARGET_x") << endl; t << "TARGET0 = " << var("TARGET_") << endl; -@@ -1290,10 +1294,19 @@ void UnixMakefileGenerator::init2() +@@ -1291,10 +1295,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.11 2004/07/22 23:03:09 b project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." + project->variables()[ -@@ -1302,7 +1315,10 @@ void UnixMakefileGenerator::init2() +@@ -1303,7 +1316,10 @@ void UnixMakefileGenerator::init2() project->first("VER_MIN") + "." + project->first("VER_PAT")); } diff --git a/x11/qt3/patches/patch-src_dialogs_qfiledialog_cpp b/x11/qt3/patches/patch-src_dialogs_qfiledialog_cpp deleted file mode 100644 index 7d4b6253e22..00000000000 --- a/x11/qt3/patches/patch-src_dialogs_qfiledialog_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_dialogs_qfiledialog_cpp,v 1.6 2004/01/08 01:12:59 brad Exp $ ---- src/dialogs/qfiledialog.cpp.orig 2003-10-09 21:47:08.000000000 -0400 -+++ src/dialogs/qfiledialog.cpp 2003-11-11 19:36:27.000000000 -0500 -@@ -3157,7 +3157,7 @@ void QFileDialog::setDir( const QString - user = dr.mid( 1, i-1 ).local8Bit(); - dr = dr.mid( i, dr.length() ); - struct passwd *pw; --#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_FREEBSD) -+#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !(defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)) - struct passwd mt_pw; - char buffer[2048]; - if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw ) diff --git a/x11/qt3/patches/patch-src_iconview_qiconview_cpp b/x11/qt3/patches/patch-src_iconview_qiconview_cpp index 7d3678523a2..2f58b8009c4 100644 --- a/x11/qt3/patches/patch-src_iconview_qiconview_cpp +++ b/x11/qt3/patches/patch-src_iconview_qiconview_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ ---- src/iconview/qiconview.cpp.orig 2004-06-23 23:56:48.000000000 -0600 -+++ src/iconview/qiconview.cpp 2004-06-23 23:56:34.000000000 -0600 +$OpenBSD: patch-src_iconview_qiconview_cpp,v 1.3 2005/02/03 20:05:56 espie Exp $ +--- src/iconview/qiconview.cpp.orig Fri Jan 21 18:16:07 2005 ++++ src/iconview/qiconview.cpp Fri Jan 28 10:59:46 2005 @@ -236,6 +236,7 @@ public: QPoint dragStartPos; QFontMetrics *fm; @@ -57,7 +57,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ intersects( oR ) ) view->repaintContents( oR.x() - 1, oR.y() - 1, oR.width() + 2, oR.height() + 2, FALSE ); -@@ -2727,10 +2730,12 @@ QIconView::QIconView( QWidget *parent, c +@@ -2729,10 +2732,12 @@ QIconView::QIconView( QWidget *parent, c d->lastItem = 0; d->count = 0; d->mousePressed = FALSE; @@ -70,7 +70,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ d->scrollTimer = 0; d->startDragItem = 0; d->tmpCurrentItem = 0; -@@ -3292,9 +3297,18 @@ void QIconView::doAutoScroll() +@@ -3294,9 +3299,18 @@ void QIconView::doAutoScroll() alreadyIntersected = TRUE; QIconViewItem *item = c->items.first(); for ( ; item; item = c->items.next() ) { @@ -92,7 +92,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ if ( item->isSelected() ) { item->setSelected( FALSE ); changed = TRUE; -@@ -4485,34 +4499,25 @@ void QIconView::contentsMousePressEventE +@@ -4487,34 +4501,25 @@ void QIconView::contentsMousePressEventE } } } else if ( ( d->selectionMode != Single || e->button() == RightButton ) @@ -136,7 +136,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ emit mouseButtonPressed( e->button(), item, e->globalPos() ); emit pressed( item ); emit pressed( item, e->globalPos() ); -@@ -4556,6 +4561,7 @@ void QIconView::contentsMouseReleaseEven +@@ -4558,6 +4563,7 @@ void QIconView::contentsMouseReleaseEven d->mousePressed = FALSE; d->startDragItem = 0; @@ -144,7 +144,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ if ( d->rubber ) { QPainter p; p.begin( viewport() ); -@@ -4645,7 +4651,22 @@ void QIconView::contentsMouseMoveEvent( +@@ -4647,7 +4653,22 @@ void QIconView::contentsMouseMoveEvent( if ( d->tmpCurrentItem ) repaintItem( d->tmpCurrentItem ); } @@ -168,16 +168,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ doAutoScroll(); } } -@@ -4775,7 +4796,7 @@ void QIconView::contentsDropEvent( QDrop - - QIconViewItem *i = findItem( e->pos() ); - -- if ( !i && e->source() == viewport() && d->currentItem && !d->cleared ) { -+ if ( (!i || i == d->currentItem) && e->source() == viewport() && d->currentItem && !d->cleared ) { - if ( !d->rearrangeEnabled ) - return; - QRect r = d->currentItem->rect(); -@@ -5222,11 +5243,11 @@ QIconViewItem* QIconView::findItem( Dire +@@ -5224,11 +5245,11 @@ QIconViewItem* QIconView::findItem( Dire d->findContainers( dir, relativeTo, searchRect); cList->first(); @@ -191,7 +182,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ item != currentItem() ) { int ml = (relativeTo - item->rect().center()).manhattanLength(); if ( centerMatch ) { -@@ -5448,8 +5469,8 @@ void QIconView::insertInGrid( QIconViewI +@@ -5451,8 +5472,8 @@ void QIconView::insertInGrid( QIconViewI } item->dirty = FALSE; } else { @@ -202,7 +193,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ QIconViewItem *i = d->firstItem; int y = -1; -@@ -5707,7 +5728,7 @@ QIconViewItem *QIconView::makeRowLayout( +@@ -5710,7 +5731,7 @@ QIconViewItem *QIconView::makeRowLayout( QIconViewItem *item = begin; for (;;) { x += d->spacing + item->width(); @@ -211,7 +202,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ item = item->prev; break; } -@@ -5732,7 +5753,7 @@ QIconViewItem *QIconView::makeRowLayout( +@@ -5735,7 +5756,7 @@ QIconViewItem *QIconView::makeRowLayout( int x; if ( item == begin ) { if ( reverse ) @@ -220,7 +211,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ else x = d->spacing; } else { -@@ -5768,7 +5789,7 @@ QIconViewItem *QIconView::makeRowLayout( +@@ -5771,7 +5792,7 @@ QIconViewItem *QIconView::makeRowLayout( i += r; x = i * d->rastX + sp * d->spacing; } @@ -229,7 +220,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ item = item->prev; break; } -@@ -5831,7 +5852,7 @@ QIconViewItem *QIconView::makeRowLayout( +@@ -5834,7 +5855,7 @@ QIconViewItem *QIconView::makeRowLayout( QIconViewItem *item = begin; for (;;) { y += d->spacing + item->height(); @@ -238,7 +229,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ item = item->prev; break; } -@@ -6145,7 +6166,9 @@ void QIconView::rebuildContainers() +@@ -6148,7 +6169,9 @@ void QIconView::rebuildContainers() item->d->container2 = 0; c->items.append( item ); item = item->next; @@ -249,7 +240,7 @@ $OpenBSD: patch-src_iconview_qiconview_cpp,v 1.2 2004/07/22 23:03:09 brad Exp $ item->d->container1 = c; c->items.append( item ); c = c->n; -@@ -6378,4 +6401,24 @@ bool QIconView::isRenaming() const +@@ -6381,4 +6404,24 @@ bool QIconView::isRenaming() const #endif } diff --git a/x11/qt3/patches/patch-src_kernel_qasyncimageio_cpp b/x11/qt3/patches/patch-src_kernel_qasyncimageio_cpp deleted file mode 100644 index d252a5c7290..00000000000 --- a/x11/qt3/patches/patch-src_kernel_qasyncimageio_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_kernel_qasyncimageio_cpp,v 1.3 2004/09/20 20:05:51 brad Exp $ ---- src/kernel/qasyncimageio.cpp.orig Sun Sep 19 21:01:58 2004 -+++ src/kernel/qasyncimageio.cpp Sun Sep 19 21:03:34 2004 -@@ -1107,7 +1107,7 @@ int QGIFFormat::decode(QImage& img, QIma - oldcode=incode; - while (sp>stack) { - --sp; -- if (!out_of_bounds && *sp!=trans_index) -+ if (!out_of_bounds && line && *sp!=trans_index) - line[y][x] = color(*sp); - x++; - if (x>=swidth) out_of_bounds = TRUE; diff --git a/x11/qt3/patches/patch-src_kernel_qimage_cpp b/x11/qt3/patches/patch-src_kernel_qimage_cpp deleted file mode 100644 index 45104b6aa87..00000000000 --- a/x11/qt3/patches/patch-src_kernel_qimage_cpp +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_kernel_qimage_cpp,v 1.3 2004/09/20 20:05:51 brad Exp $ ---- src/kernel/qimage.cpp.orig Sun Sep 19 20:58:07 2004 -+++ src/kernel/qimage.cpp Sun Sep 19 21:01:10 2004 -@@ -5723,6 +5723,9 @@ static void read_xpm_image_or_array( QIm - image.create( w, h, 8, ncols ); - } - -+ if (image.isNull()) -+ return; -+ - QMap colorMap; - int currentColor; - diff --git a/x11/qt3/patches/patch-src_kernel_qthread_unix_cpp b/x11/qt3/patches/patch-src_kernel_qthread_unix_cpp deleted file mode 100644 index aab75b3988d..00000000000 --- a/x11/qt3/patches/patch-src_kernel_qthread_unix_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_kernel_qthread_unix_cpp,v 1.2 2004/09/15 19:25:12 espie Exp $ ---- src/kernel/qthread_unix.cpp.orig Thu Aug 5 16:42:03 2004 -+++ src/kernel/qthread_unix.cpp Sun Sep 5 13:22:26 2004 -@@ -311,7 +311,7 @@ void QThread::start(Priority priority) - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - --#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) && !defined(Q_OS_OPENBSD) - switch (priority) { - case InheritPriority: - { diff --git a/x11/qt3/patches/patch-src_tools_qvaluelist_h b/x11/qt3/patches/patch-src_tools_qvaluelist_h index abaf4082ca3..0999af681cc 100644 --- a/x11/qt3/patches/patch-src_tools_qvaluelist_h +++ b/x11/qt3/patches/patch-src_tools_qvaluelist_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_tools_qvaluelist_h,v 1.1 2004/07/22 23:03:09 brad Exp $ ---- src/tools/qvaluelist.h.orig 2004-04-19 03:35:56.000000000 -0600 -+++ src/tools/qvaluelist.h 2004-06-23 23:59:27.000000000 -0600 -@@ -636,13 +636,11 @@ Q_INLINE_TEMPLATES QDataStream& operator +$OpenBSD: patch-src_tools_qvaluelist_h,v 1.2 2005/02/03 20:05:56 espie Exp $ +--- src/tools/qvaluelist.h.orig Fri Jan 21 18:16:04 2005 ++++ src/tools/qvaluelist.h Fri Jan 28 10:59:46 2005 +@@ -638,13 +638,11 @@ Q_INLINE_TEMPLATES QDataStream& operator l.clear(); Q_UINT32 c; s >> c; diff --git a/x11/qt3/patches/patch-src_widgets_qpopupmenu_cpp b/x11/qt3/patches/patch-src_widgets_qpopupmenu_cpp index 81d09333747..7ffab1185e2 100644 --- a/x11/qt3/patches/patch-src_widgets_qpopupmenu_cpp +++ b/x11/qt3/patches/patch-src_widgets_qpopupmenu_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_widgets_qpopupmenu_cpp,v 1.2 2004/09/15 19:25:12 espie Exp $ ---- src/widgets/qpopupmenu.cpp.orig Thu Aug 5 16:42:21 2004 -+++ src/widgets/qpopupmenu.cpp Sun Sep 5 13:22:26 2004 -@@ -2529,7 +2529,7 @@ QSize QPopupMenu::sizeHint() const +$OpenBSD: patch-src_widgets_qpopupmenu_cpp,v 1.3 2005/02/03 20:05:56 espie Exp $ +--- src/widgets/qpopupmenu.cpp.orig Fri Jan 21 18:16:22 2005 ++++ src/widgets/qpopupmenu.cpp Fri Jan 28 10:59:46 2005 +@@ -2530,7 +2530,7 @@ QSize QPopupMenu::sizeHint() const constPolish(); QPopupMenu* that = (QPopupMenu*) this; //We do not need a resize here, just the sizeHint.. diff --git a/x11/qt3/pkg/PFRAG.shared b/x11/qt3/pkg/PFRAG.shared index 864ec4d69cb..0f10f0311ca 100644 --- a/x11/qt3/pkg/PFRAG.shared +++ b/x11/qt3/pkg/PFRAG.shared @@ -1,8 +1,8 @@ -@comment $OpenBSD: PFRAG.shared,v 1.15 2004/10/30 09:12:35 espie Exp $ -@lib lib/libqt-mt.so.3.33 +@comment $OpenBSD: PFRAG.shared,v 1.16 2005/02/03 20:05:56 espie Exp $ +@lib lib/libqt-mt.so.3.34 @lib lib/libqui-mt.so.1.0 @lib lib/libqui.so.1.0 -@lib lib/qt3/libqt-mt.so.3.33 +@lib lib/qt3/libqt-mt.so.3.34 @lib lib/qt3/libqui-mt.so.1.0 @lib lib/qt3/libqui.so.1.0 lib/qt3/plugins/designer/libcppeditor.so diff --git a/x11/qt3/pkg/PLIST b/x11/qt3/pkg/PLIST index a622c547c41..ae04e691f32 100644 --- a/x11/qt3/pkg/PLIST +++ b/x11/qt3/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.21 2004/12/27 17:13:56 espie Exp $ +@comment $OpenBSD: PLIST,v 1.22 2005/02/03 20:05:56 espie Exp $ @conflict qt3-* @conflict qt3-base-* +%%SHARED%% bin/assistant bin/assistant-mt bin/designer3 @@ -711,7 +712,6 @@ lib/qt3/man/man3/ @man lib/qt3/man/man3/QPixmap.3 @man lib/qt3/man/man3/QPixmapCache.3 @man lib/qt3/man/man3/QPlatinumStyle.3 -@man lib/qt3/man/man3/QPocketPCStyle.3 @man lib/qt3/man/man3/QPoint.3 @man lib/qt3/man/man3/QPointArray.3 @man lib/qt3/man/man3/QPopupMenu.3 @@ -1128,7 +1128,6 @@ lib/qt3/man/man3/ @man lib/qt3/man/man3/qpixmapcache.3 @man lib/qt3/man/man3/qplatinumstyle.3 @man lib/qt3/man/man3/qpngimagepacker.3 -@man lib/qt3/man/man3/qpocketpcstyle.3 @man lib/qt3/man/man3/qpoint.3 @man lib/qt3/man/man3/qpointarray.3 @man lib/qt3/man/man3/qpopupmenu.3 @@ -1481,5 +1480,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.3 -%%SHARED%% +share/doc/qt3/changes-3.3.4 diff --git a/x11/qt3/pkg/PLIST-examples b/x11/qt3/pkg/PLIST-examples index da74f263cdf..73231875345 100644 --- a/x11/qt3/pkg/PLIST-examples +++ b/x11/qt3/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.7 2004/08/10 13:33:13 espie Exp $ +@comment $OpenBSD: PLIST-examples,v 1.8 2005/02/03 20:05:56 espie Exp $ lib/qt3/examples/ lib/qt3/examples/Makefile lib/qt3/examples/README @@ -467,8 +467,8 @@ lib/qt3/examples/demo/translations/demo_de.qm lib/qt3/examples/demo/translations/demo_de.ts lib/qt3/examples/demo/translations/demo_fr.qm lib/qt3/examples/demo/translations/demo_fr.ts -lib/qt3/examples/demo/translations/demo_iw.qm -lib/qt3/examples/demo/translations/demo_iw.ts +lib/qt3/examples/demo/translations/demo_he.qm +lib/qt3/examples/demo/translations/demo_he.ts lib/qt3/examples/demo/widgets/ lib/qt3/examples/demo/widgets/widgetsbase.ui lib/qt3/examples/demo/widgets/widgetsbase.ui.h diff --git a/x11/qt3/pkg/PLIST-html b/x11/qt3/pkg/PLIST-html index 2d4a9f89ec0..1f74380b94e 100644 --- a/x11/qt3/pkg/PLIST-html +++ b/x11/qt3/pkg/PLIST-html @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-html,v 1.11 2004/08/10 13:33:13 espie Exp $ +@comment $OpenBSD: PLIST-html,v 1.12 2005/02/03 20:05:56 espie Exp $ share/doc/qt3/ share/doc/qt3/html/ share/doc/qt3/html/3rdparty.html @@ -173,7 +173,6 @@ share/doc/qt3/html/finddialog.png share/doc/qt3/html/focus.html share/doc/qt3/html/forever-example.html share/doc/qt3/html/frames.png -share/doc/qt3/html/freeeditions.html share/doc/qt3/html/ftpclient-example.html share/doc/qt3/html/functions.html share/doc/qt3/html/general.png @@ -313,6 +312,7 @@ share/doc/qt3/html/opengl-sharedbox-example.html share/doc/qt3/html/opengl-texture-example.html share/doc/qt3/html/opengl-x11-overlays.html share/doc/qt3/html/opengl.html +share/doc/qt3/html/opensourceedition.html share/doc/qt3/html/organizers.html share/doc/qt3/html/outliner-example.html share/doc/qt3/html/overviews-list.html @@ -1136,9 +1136,6 @@ share/doc/qt3/html/qplatinumstyle.html share/doc/qt3/html/qpngimagepacker-members.html share/doc/qt3/html/qpngimagepacker.html share/doc/qt3/html/qpngio-h.html -share/doc/qt3/html/qpocketpcstyle-members.html -share/doc/qt3/html/qpocketpcstyle.html -share/doc/qt3/html/qpocketpcstyle_wce-h.html share/doc/qt3/html/qpoint-h.html share/doc/qt3/html/qpoint-members.html share/doc/qt3/html/qpoint.html