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

same bug as in 4.2.0.

Browse Source
This commit is contained in:
espie 2007-06-10 21:23:10 +00:00
parent 362a03027a
commit da922b4523
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2007/06/09 23:13:09 espie Exp $
# $OpenBSD: Makefile,v 1.41 2007/06/10 21:23:10 espie Exp $
COMMENT-main= "C++ X11 GUI toolkit"
COMMENT-examples= "examples for qt4"
@ -14,7 +14,7 @@ PKGNAME-postgresql= qt4-postgresql-${VERSION}
PKGNAME-examples= qt4-examples-${VERSION}p0
PKGNAME-sqlite2= qt4-sqlite2-${VERSION}
PKGNAME-sqlite= qt4-sqlite-${VERSION}
PKGNAME-main= qt4-${VERSION}p0
PKGNAME-main= qt4-${VERSION}p1
FULLPKGNAME-html= qt4-html-${VERSION}
SHARED_LIBS= Qt3Support 8.0 \
QtCore 7.0 \
@ -221,7 +221,7 @@ post-install:
rm $$i.bak; \
done
# this helps qdbuscpp2xml
cd ${QT_BINDIR} && ln -s moc moc4
cd ${QT_BINDIR} && ln -sf moc moc4
.for l v in ${SHARED_LIBS}
ln -sf qt4/lib$l.so.$v ${PREFIX}/lib
.endfor

12
x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.6 2007/06/10 21:23:10 espie Exp $
--- src/corelib/io/qfsfileengine_unix.cpp.orig Sun Jun 10 21:00:38 2007
+++ src/corelib/io/qfsfileengine_unix.cpp Sun Jun 10 21:01:14 2007
@@ -233,7 +233,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi
int readByte = 0;
do {
readByte = fgetc(fh);
- } while (readByte == -1 && errno == EINTR);
+ } while (readByte == EOF && !feof(fh) && errno == EINTR);
if (readByte != -1) {
*data = uchar(readByte);
readBytes += 1;