diff options
author | adam <adam> | 2011-09-04 15:42:51 +0000 |
---|---|---|
committer | adam <adam> | 2011-09-04 15:42:51 +0000 |
commit | eab83b7f9a42778bda5408a4d59ed6f021a1b423 (patch) | |
tree | b04ea15f83099b111c0b0f30c6decc755611577a /x11 | |
parent | 6c8b201fe05667ce3512f91b7c5e42e943758720 (diff) | |
download | pkgsrc-eab83b7f9a42778bda5408a4d59ed6f021a1b423.tar.gz |
Qt 4.7.4 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.7.0. For more details,
refer to the online documentation included in this distribution. The
documentation is also available online.
http:
Diffstat (limited to 'x11')
-rw-r--r-- | x11/qt4-libs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-libs/Makefile.common | 3 | ||||
-rw-r--r-- | x11/qt4-libs/distinfo | 10 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-da | 29 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-db | 16 | ||||
-rw-r--r-- | x11/qt4-sqlite3/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-tiff/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-tools/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-tools/PLIST | 20 | ||||
-rw-r--r-- | x11/qt4/Makefile.common | 4 |
10 files changed, 23 insertions, 71 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 5852027ac42..d941dcd5715 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.63 2011/08/30 22:18:30 drochner Exp $ +# $NetBSD: Makefile,v 1.64 2011/09/04 15:42:51 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 2 COMMENT= C++ X GUI toolkit .include "../../x11/qt4-libs/Makefile.common" diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 6210a05a9c2..ffa527c02cd 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2011/07/21 17:07:11 joerg Exp $ +# $NetBSD: Makefile.common,v 1.28 2011/09/04 15:42:51 adam Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -11,7 +11,6 @@ DISTNAME= qt-everywhere-opensource-src-${QTVERSION} CATEGORIES= x11 MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/ -#EXTRACT_SUFX= .tar.bz2 .include "../../x11/qt4/Makefile.common" diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 156b53fa585..f20368f04d1 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.60 2011/08/30 22:18:31 drochner Exp $ +$NetBSD: distinfo,v 1.61 2011/09/04 15:42:51 adam Exp $ -SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e -RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645 -Size (qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173 bytes +SHA1 (qt-everywhere-opensource-src-4.7.4.tar.gz) = ac7b4df34adaa6e9d1fb41743d1f15f5aac481db +RMD160 (qt-everywhere-opensource-src-4.7.4.tar.gz) = 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 +Size (qt-everywhere-opensource-src-4.7.4.tar.gz) = 219424772 bytes SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 @@ -46,7 +46,5 @@ SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979 SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697 SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d -SHA1 (patch-da) = 47f1d44bb593a81fb0520a4ee23f2f528533156f -SHA1 (patch-db) = cbecf57ba75ce82901d347197013208811366514 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 87c48f97ba2026f4bb553aa0b855bc1b1f653abf SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = e05f420bd532a8964d293e4bad848636dc716d0f diff --git a/x11/qt4-libs/patches/patch-da b/x11/qt4-libs/patches/patch-da deleted file mode 100644 index 811b595dd1e..00000000000 --- a/x11/qt4-libs/patches/patch-da +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-da,v 1.1 2011/08/30 22:18:31 drochner Exp $ - -CVE-2011-3194 - ---- src/gui/image/qtiffhandler.cpp.orig 2011-03-30 05:19:04.000000000 +0000 -+++ src/gui/image/qtiffhandler.cpp -@@ -196,9 +196,12 @@ bool QTiffHandler::read(QImage *image) - uint16 bitPerSample; - if (!TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample)) - bitPerSample = 1; -+ uint16 samplesPerPixel; // they may be e.g. grayscale with 2 samples per pixel -+ if (!TIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel)) -+ samplesPerPixel = 1; - - bool grayscale = photometric == PHOTOMETRIC_MINISBLACK || photometric == PHOTOMETRIC_MINISWHITE; -- if (grayscale && bitPerSample == 1) { -+ if (grayscale && bitPerSample == 1 && samplesPerPixel == 1) { - if (image->size() != QSize(width, height) || image->format() != QImage::Format_Mono) - *image = QImage(width, height, QImage::Format_Mono); - QVector<QRgb> colortable(2); -@@ -220,7 +223,7 @@ bool QTiffHandler::read(QImage *image) - } - } - } else { -- if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample == 8) { -+ if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample == 8 && samplesPerPixel == 1) { - if (image->size() != QSize(width, height) || image->format() != QImage::Format_Indexed8) - *image = QImage(width, height, QImage::Format_Indexed8); - if (!image->isNull()) { diff --git a/x11/qt4-libs/patches/patch-db b/x11/qt4-libs/patches/patch-db deleted file mode 100644 index 3eab2cbfaf6..00000000000 --- a/x11/qt4-libs/patches/patch-db +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-db,v 1.1 2011/08/30 22:18:31 drochner Exp $ - -CVE-2011-3193 - ---- src/3rdparty/harfbuzz/src/harfbuzz-gpos.c.orig 2011-03-30 05:19:01.000000000 +0000 -+++ src/3rdparty/harfbuzz/src/harfbuzz-gpos.c -@@ -3012,6 +3012,9 @@ static HB_Error Lookup_MarkMarkPos( GPO - j--; - } - -+ if ( i > buffer->in_pos ) -+ return HB_Err_Not_Covered; -+ - error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ), - &mark2_index ); - if ( error ) diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index 7a118a20c9f..2a2cd2f5c45 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2011/06/10 09:40:04 obache Exp $ +# $NetBSD: Makefile,v 1.20 2011/09/04 15:42:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-sqlite3-${QTVERSION} -PKGREVISION= 1 COMMENT= QT sqlite3 driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile index 91ea1fab841..afc41b6e9b6 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2011/08/30 22:18:31 drochner Exp $ +# $NetBSD: Makefile,v 1.19 2011/09/04 15:42:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tiff-${QTVERSION} -PKGREVISION= 1 COMMENT= QT TIFF image format plugin CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index 644a3cc4c1e..57aad7a95ed 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.45 2011/08/18 12:34:27 cheusov Exp $ +# $NetBSD: Makefile,v 1.46 2011/09/04 15:42:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tools-${QTVERSION} -PKGREVISION= 1 COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index 4e16b8e823d..1cdba5c70f7 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2011/03/03 05:50:04 adam Exp $ +@comment $NetBSD: PLIST,v 1.26 2011/09/04 15:42:52 adam Exp $ lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc lib/pkgconfig/QtDesignerComponents.pc @@ -186,6 +186,8 @@ qt4/mkspecs/common/symbian/stl-off/new qt4/mkspecs/common/symbian/symbian-makefile.conf qt4/mkspecs/common/symbian/symbian-mmp.conf qt4/mkspecs/common/symbian/symbian.conf +qt4/mkspecs/common/symbian/symbianincludes.h +qt4/mkspecs/common/symbian/template.applite qt4/mkspecs/common/unix.conf qt4/mkspecs/common/wince/qmake.conf qt4/mkspecs/common/wince/qplatformdefs.h @@ -255,6 +257,7 @@ qt4/mkspecs/features/symbian/moc.prf qt4/mkspecs/features/symbian/nested_exceptions.prf qt4/mkspecs/features/symbian/opengl.prf qt4/mkspecs/features/symbian/platform_paths.prf +qt4/mkspecs/features/symbian/prepend_includepath.prf qt4/mkspecs/features/symbian/qt.prf qt4/mkspecs/features/symbian/qt_config.prf qt4/mkspecs/features/symbian/release.prf @@ -262,6 +265,7 @@ qt4/mkspecs/features/symbian/run_on_phone.prf qt4/mkspecs/features/symbian/sis_targets.prf qt4/mkspecs/features/symbian/stl.prf qt4/mkspecs/features/symbian/stl_off.prf +qt4/mkspecs/features/symbian/symbian_appbooster.prf qt4/mkspecs/features/symbian/symbian_building.prf qt4/mkspecs/features/symbian/thread.prf qt4/mkspecs/features/testcase.prf @@ -468,6 +472,13 @@ qt4/mkspecs/solaris-g++/qmake.conf qt4/mkspecs/solaris-g++/qplatformdefs.h qt4/mkspecs/symbian-abld/qmake.conf qt4/mkspecs/symbian-abld/qplatformdefs.h +qt4/mkspecs/symbian-armcc/features/default_post.prf +qt4/mkspecs/symbian-armcc/qmake.conf +qt4/mkspecs/symbian-armcc/qplatformdefs.h +qt4/mkspecs/symbian-gcce/features/default_post.prf +qt4/mkspecs/symbian-gcce/qmake.conf +qt4/mkspecs/symbian-gcce/qplatformdefs.h +qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm @@ -475,13 +486,6 @@ qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml qt4/mkspecs/symbian-sbsv2/qmake.conf qt4/mkspecs/symbian-sbsv2/qplatformdefs.h -qt4/mkspecs/symbian/linux-armcc/features/default_post.prf -qt4/mkspecs/symbian/linux-armcc/qmake.conf -qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h -qt4/mkspecs/symbian/linux-gcce/features/default_post.prf -qt4/mkspecs/symbian/linux-gcce/qmake.conf -qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h -qt4/mkspecs/symbian/qmake.conf qt4/mkspecs/tru64-cxx/qmake.conf qt4/mkspecs/tru64-cxx/qplatformdefs.h qt4/mkspecs/tru64-g++/qmake.conf diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common index de917fd8b53..474cc4edcdf 100644 --- a/x11/qt4/Makefile.common +++ b/x11/qt4/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.25 2011/05/05 12:37:07 adam Exp $ +# $NetBSD: Makefile.common,v 1.26 2011/09/04 15:42:51 adam Exp $ # used by x11/qt4-libs/Makefile.common # used by x11/qt4-tools/Makefile -QTVERSION= 4.7.3 +QTVERSION= 4.7.4 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= http://qt.nokia.com/ |