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

qt 3.3.3 + new plist

Browse Source
This commit is contained in:
espie 2004-09-15 19:25:12 +00:00
parent 7cc16df2ed
commit 4f732e87e3
11 changed files with 40 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/qt3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2004/07/28 03:15:37 brad Exp $
# $OpenBSD: Makefile,v 1.37 2004/09/15 19:25:12 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= "C++ X11 GUI toolkit"
@ -15,7 +15,7 @@ PKGNAME-examples= qt3-examples-${VERSION}
FULLPKGNAME-base= qt3-base-${VERSION}
FULLPKGNAME-html= qt3-html-${VERSION}
VERSION= 3.2
VERSION= 3.3
DISTNAME= qt-x11-free-3.${VERSION}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.troll.no/qt/source/
@ -27,7 +27,7 @@ MAINTAINER= Marc Espie <espie@openbsd.org>
FLAVORS=mt debug
PSEUDO_FLAVORS= no_mysql no_postgresql
FLAVOR?=
FLAVOR?=mt
# GPL/QPL
PERMIT_PACKAGE_CDROM= Yes
@ -165,7 +165,7 @@ NO_REGRESS= Yes
PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig
LIBRARIES=qt${MT_SUFX}.so.3.32 qui${MT_SUFX}.so.1.0
LIBRARIES=qt${MT_SUFX}.so.3.33 qui${MT_SUFX}.so.1.0
.if ${FLAVOR:L:Mmt}
MT_SUFX=-mt

6
x11/qt3/distinfo
View File

@ -1,3 +1,3 @@
MD5 (qt-x11-free-3.3.2.tar.gz) = 9ed9721eee18ffb50bb0f220ed24c1ec
RMD160 (qt-x11-free-3.3.2.tar.gz) = 111808654c09b2f76e6837c0fed33d4087f06e5b
SHA1 (qt-x11-free-3.3.2.tar.gz) = af44bddca5f1f421349f7e6e6fe64bafb0adff6d
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

16
x11/qt3/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2004/07/22 23:03:09 brad Exp $
--- configure.orig 2004-03-31 09:40:12.000000000 -0700
+++ configure 2004-06-19 19:37:34.000000000 -0600
@@ -950,7 +950,7 @@ while [ "$#" -gt 0 ]; do
$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
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.9 2004/07/22 23:03:09 brad Exp $
else
OPT_VERBOSE=yes
fi
@@ -1589,7 +1589,7 @@ if echo $MODULES | grep sql >/dev/null;
@@ -1617,7 +1617,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.9 2004/07/22 23:03:09 brad Exp $
TDS_REQ="-lsybdb sybfront.h sybdb.h"
DB2_REQ="-ldb2 sqlcli.h sqlcli1.h"
IBASE_REQ="-lgds ibase.h"
@@ -2305,7 +2305,7 @@ if [ "$Edition" = "free" ]; then
@@ -2350,7 +2350,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.9 2004/07/22 23:03:09 brad Exp $
echo
if [ "$acceptance" = "yes" ]; then
break
@@ -2784,8 +2784,8 @@ fi
@@ -2832,8 +2832,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.9 2004/07/22 23:03:09 brad Exp $
fi
fi
if [ "$CFG_MNG" = "no" ]; then
@@ -2811,8 +2811,8 @@ fi
@@ -2859,8 +2859,8 @@ fi
if [ "$CFG_LIBPNG" = "system" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG system-png"
if [ "$CFG_PNG" = "yes" ]; then

20
x11/qt3/patches/patch-src_kernel_qasyncimageio_cpp
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_kernel_qasyncimageio_cpp,v 1.1 2004/08/24 15:46:55 espie Exp $
--- src/kernel/qasyncimageio.cpp.orig Mon Apr 19 11:36:02 2004
+++ src/kernel/qasyncimageio.cpp Tue Aug 24 10:58:24 2004
@@ -992,6 +992,7 @@ int QGIFFormat::decode(QImage& img, QIma
accum = 0;
bitcount = 0;
sp = stack;
+ firstcode = oldcode = 0;
needfirst = FALSE;
out_of_bounds = FALSE;
}
@@ -1106,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;

43
x11/qt3/patches/patch-src_kernel_qimage_cpp
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-src_kernel_qimage_cpp,v 1.1 2004/08/24 15:46:55 espie Exp $
--- src/kernel/qimage.cpp.orig Mon Apr 19 11:36:05 2004
+++ src/kernel/qimage.cpp Tue Aug 24 10:58:24 2004
@@ -4818,6 +4818,7 @@ bool read_dib( QDataStream& s, int offse
if ( comp == BMP_RLE8 ) { // run length compression
int x=0, y=0, b;
register uchar *p = line[h-1];
+ const uchar *endp = line[h-1]+w;
while ( y < h ) {
if ( (b=d->getch()) == EOF )
break;
@@ -4835,9 +4836,20 @@ bool read_dib( QDataStream& s, int offse
case 2: // delta (jump)
x += d->getch();
y += d->getch();
+
+ // Protection
+ if ( (uint)x >= (uint)w )
+ x = w-1;
+ if ( (uint)y >= (uint)h )
+ y = h-1;
+
p = line[h-y-1] + x;
break;
default: // absolute mode
+ // Protection
+ if ( p + b > endp )
+ b = endp-p;
+
if ( d->readBlock( (char *)p, b ) != b )
return FALSE;
if ( (b & 1) == 1 )
@@ -4846,6 +4858,10 @@ bool read_dib( QDataStream& s, int offse
p += b;
}
} else { // encoded mode
+ // Protection
+ if ( p + b > endp )
+ b = endp-p;
+
memset( p, d->getch(), b ); // repeat pixel
x += b;
p += b;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_kernel_qthread_unix_cpp,v 1.1 2004/01/08 01:23:57 brad Exp $
--- src/kernel/qthread_unix.cpp.orig 2003-11-11 20:24:45.000000000 -0500
+++ src/kernel/qthread_unix.cpp 2003-11-11 20:26:47.000000000 -0500
@@ -306,7 +306,7 @@ void QThread::start(Priority priority)
$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);

18
x11/qt3/patches/patch-src_widgets_qpopupmenu_cpp
View File

@ -1,16 +1,8 @@
$OpenBSD: patch-src_widgets_qpopupmenu_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
--- src/widgets/qpopupmenu.cpp.orig 2004-04-19 03:36:18.000000000 -0600
+++ src/widgets/qpopupmenu.cpp 2004-06-24 00:04:24.000000000 -0600
@@ -1200,6 +1200,7 @@ QSize QPopupMenu::updateSize(bool force_
if( do_resize && size() != d->calcSize ) {
setMaximumSize( d->calcSize );
+ d->calcSize = maximumSize();
resize( d->calcSize );
}
return d->calcSize;
@@ -2531,7 +2532,7 @@ QSize QPopupMenu::sizeHint() const
$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
constPolish();
QPopupMenu* that = (QPopupMenu*) this;
//We do not need a resize here, just the sizeHint..
- return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() );

13
x11/qt3/patches/patch-src_widgets_qprogressbar_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_widgets_qprogressbar_cpp,v 1.1 2004/07/22 23:03:09 brad Exp $
--- src/widgets/qprogressbar.cpp.orig 2004-04-19 03:36:18.000000000 -0600
+++ src/widgets/qprogressbar.cpp 2004-06-24 00:00:06.000000000 -0600
$OpenBSD: patch-src_widgets_qprogressbar_cpp,v 1.2 2004/09/15 19:25:12 espie Exp $
--- src/widgets/qprogressbar.cpp.orig Mon Apr 19 11:36:18 2004
+++ src/widgets/qprogressbar.cpp Tue Aug 24 10:56:30 2004
@@ -47,6 +47,14 @@
#endif
#include <limits.h>
@ -25,7 +25,7 @@ $OpenBSD: patch-src_widgets_qprogressbar_cpp,v 1.1 2004/07/22 23:03:09 brad Exp
{
setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
initFrame();
@@ -130,12 +138,20 @@ QProgressBar::QProgressBar( int totalSte
@@ -130,13 +138,21 @@ QProgressBar::QProgressBar( int totalSte
center_indicator( TRUE ),
auto_indicator( TRUE ),
percentage_visible( TRUE ),
@ -39,14 +39,15 @@ $OpenBSD: patch-src_widgets_qprogressbar_cpp,v 1.1 2004/07/22 23:03:09 brad Exp
+/*!
+ Destroys the object and frees any allocated ressources.
+*/
+
+QProgressBar::~QProgressBar()
+{
+ delete d;
+}
+
/*!
Reset the progress bar. The progress bar "rewinds" and shows no
progress.
@@ -188,11 +204,16 @@ void QProgressBar::setProgress( int prog
progress < 0 || ( ( progress > total_steps ) && total_steps ) )
return;

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

@ -1,7 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.13 2004/08/10 13:33:13 espie Exp $
@lib lib/libqt${MT_SUFX}.so.3.32
@comment $OpenBSD: PFRAG.shared,v 1.14 2004/09/15 19:25:12 espie Exp $
@lib lib/libqt${MT_SUFX}.so.${VERSION}3
@lib lib/libqui${MT_SUFX}.so.1.0
@lib lib/qt3/libqt${MT_SUFX}.so.3.32
@lib lib/qt3/libqt${MT_SUFX}.so.${VERSION}3
@lib lib/qt3/libqui${MT_SUFX}.so.1.0
lib/qt3/plugins${MT_SUFX}/designer/libcppeditor.so
lib/qt3/plugins${MT_SUFX}/designer/libdlgplugin.so

5
x11/qt3/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2004/08/10 13:33:13 espie Exp $
@comment $OpenBSD: PLIST,v 1.16 2004/09/15 19:25:12 espie Exp $
bin/assistant${MT_SUFX}
bin/designer3${MT_SUFX}
bin/findtr3${MT_SUFX}
@ -26,6 +26,9 @@ lib/qt3/bin${MT_SUFX}/qt20fix
lib/qt3/bin${MT_SUFX}/qtconfig
lib/qt3/bin${MT_SUFX}/qtrename140
lib/qt3/bin${MT_SUFX}/uic
lib/qt3/mkspecs/macx-xlc/
lib/qt3/mkspecs/macx-xlc/qmake.conf
lib/qt3/mkspecs/macx-xlc/qplatformdefs.h
lib/qt3/plugins${MT_SUFX}/
lib/qt3/plugins${MT_SUFX}/designer/
lib/qt3/plugins${MT_SUFX}/sqldrivers/

5
x11/qt3/pkg/PLIST-base
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-base,v 1.8 2004/08/10 13:33:13 espie Exp $
@comment $OpenBSD: PLIST-base,v 1.9 2004/09/15 19:25:12 espie Exp $
@pkgcfl qt3-0.*
@pkgcfl qt3-1.0
@pkgcfl qt3-1.1
@ -1422,9 +1422,8 @@ lib/qt3/mkspecs/win32-msvc/win32dll.dsp
lib/qt3/mkspecs/win32-msvc/win32lib.dsp
lib/qt3/mkspecs/win32-watcom/
lib/qt3/mkspecs/win32-watcom/qmake.conf
share/doc/qt3/
share/doc/qt3/FAQ
share/doc/qt3/LICENSE.GPL
share/doc/qt3/README
share/doc/qt3/README-QT.TXT
share/doc/qt3/changes-3.${VERSION}
share/doc/qt3/changes-3.3.3