diff options
| author | adam <adam@pkgsrc.org> | 2010-01-29 18:19:09 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-01-29 18:19:09 +0000 |
| commit | bad5adb08727191178e21f892fdfc02cdf0456d9 (patch) | |
| tree | 9e0a3c48c73055868cb0c29214ed5ad215a3ba9a | |
| parent | 2a6536c2b2f600639621c6820f1f7695955f7656 (diff) | |
| download | pkgsrc-bad5adb08727191178e21f892fdfc02cdf0456d9.tar.gz | |
Changes 4.6.1:
* Optimized empty QUrl creation
* Improve performance of getting the canonical filename on Linux
and Symbian by using realpath() system call.
* Avoid stat() when opening a file.
* Do not look at the Qt patch-level version embedded in plugins'
buildkeys when trying to determine if the plugin is compatible
* Bug-fixes
* load() and loadFromData() can now support compressed GL textures
in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
system is active and the appropriate extensions are present in the
GL implementation.
* Fixed a small leak when using the new QPixmapCache::Key based API.
34 files changed, 298 insertions, 489 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 05b5889ef47..282ed991842 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,19 +1,21 @@ -# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2010/01/29 18:19:09 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 3 COMMENT= C++ X GUI toolkit +# XXX this is to test what really gets installed when 'do-install' is disabled +INSTALL_DIRS+= src + BUILD_TARGET= sub-src INSTALL_TARGET= install_flat_headers install_targ_headers install_class_headers PTHREAD_OPTS+= require UNLIMIT_RESOURCES= datasize -BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} +BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST @@ -26,10 +28,13 @@ INSTALLATION_DIRS+= ${QTPREFIX}/bin INSTALLATION_DIRS+= ${QTPREFIX}/include INSTALLATION_DIRS+= ${QTPREFIX}/lib INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible +INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs +INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems +INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods -INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q} +INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} do-install: .for prog in moc rcc uic @@ -37,12 +42,12 @@ do-install: .endfor ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ ${DESTDIR}${QTPREFIX}/bin -.for incl in corelib gui network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore +.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} ${INSTALL_TARGET} .endfor cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST -.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit +.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ ${DESTDIR}${QTPREFIX}/lib/ sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ @@ -56,7 +61,20 @@ do-install: ${WRKSRC}/plugins/accessible/lib${plug}.la \ ${DESTDIR}${QTPREFIX}/plugins/accessible/ .endfor -.for plug in qgif qjpeg qmng qsvg +.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/plugins/codecs/lib${codec}.la \ + ${DESTDIR}${QTPREFIX}/plugins/codecs/ +.endfor +.for gfxs in qglgraphicssystem qtracegraphicssystem + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \ + ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/ +.endfor + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/plugins/iconengines/libqsvgicon.la \ + ${DESTDIR}/${QTPREFIX}/plugins/iconengines/ +.for plug in qgif qico qjpeg qmng qsvg ${LIBTOOL} --mode=install ${INSTALL_LIB} \ ${WRKSRC}/plugins/imageformats/lib${plug}.la \ ${DESTDIR}${QTPREFIX}/plugins/imageformats/ diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index da858b904dd..c658b314c1e 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.17 2009/10/23 15:47:09 tnn Exp $ +# $NetBSD: Makefile.common,v 1.18 2010/01/29 18:19:09 adam Exp $ # used by x11/qt4-libs/Makefile # used by x11/qt4-docs/Makefile -DISTNAME= qt-x11-opensource-src-${QTVERSION} +DISTNAME= qt-everywhere-opensource-src-${QTVERSION} CATEGORIES= x11 MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ ftp://ftp.qtsoftware.com/qt/source/ diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST index 3bc28d0f028..2f931d30101 100644 --- a/x11/qt4-libs/PLIST +++ b/x11/qt4-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2009/07/02 18:26:45 wiz Exp $ +@comment $NetBSD: PLIST,v 1.12 2010/01/29 18:19:09 adam Exp $ lib/pkgconfig/Qt3Support.pc lib/pkgconfig/QtCore.pc lib/pkgconfig/QtGui.pc @@ -18,6 +18,7 @@ qt4/bin/uic3 qt4/lib/libQt3Support.la qt4/lib/libQtCore.la qt4/lib/libQtGui.la +qt4/lib/libQtMultimedia.la qt4/lib/libQtNetwork.la qt4/lib/libQtOpenGL.la qt4/lib/libQtScript.la @@ -29,7 +30,15 @@ qt4/lib/libQtWebKit.la qt4/lib/libQtXml.la qt4/plugins/accessible/libqtaccessiblecompatwidgets.la qt4/plugins/accessible/libqtaccessiblewidgets.la +qt4/plugins/codecs/libqcncodecs.la +qt4/plugins/codecs/libqjpcodecs.la +qt4/plugins/codecs/libqkrcodecs.la +qt4/plugins/codecs/libqtwcodecs.la +qt4/plugins/graphicssystems/libqglgraphicssystem.la +qt4/plugins/graphicssystems/libqtracegraphicssystem.la +qt4/plugins/iconengines/libqsvgicon.la qt4/plugins/imageformats/libqgif.la +qt4/plugins/imageformats/libqico.la qt4/plugins/imageformats/libqjpeg.la qt4/plugins/imageformats/libqmng.la qt4/plugins/imageformats/libqsvg.la diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk index 332a3026909..9babc23db7a 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/01/29 18:19:09 adam Exp $ BUILDLINK_TREE+= qt4-libs @@ -43,8 +43,8 @@ pkgbase := qt4-libs .endif .if !defined(BUILD_QT4) -CONFIGURE_ENV+= QTDIR=${QTDIR:Q} -MAKE_ENV+= QTDIR=${QTDIR:Q} +CONFIGURE_ENV+= QTDIR=${QTDIR} +MAKE_ENV+= QTDIR=${QTDIR} .endif CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 51e56967005..ba1e5b52d3a 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,29 +1,29 @@ -$NetBSD: distinfo,v 1.36 2010/01/08 09:56:09 drochner Exp $ +$NetBSD: distinfo,v 1.37 2010/01/29 18:19:09 adam Exp $ -SHA1 (qt-x11-opensource-src-4.5.3.tar.gz) = 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 -RMD160 (qt-x11-opensource-src-4.5.3.tar.gz) = 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 -Size (qt-x11-opensource-src-4.5.3.tar.gz) = 125384668 bytes -SHA1 (patch-aa) = 5d0c638f1985f4cfcc1fa6824822dc9ab9bc96eb -SHA1 (patch-ab) = caac46e91dd061f28093384b0ab56b5fd78cad0d -SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b -SHA1 (patch-ad) = 98cb6c33102e9e38621b0169fb9e03e72443884b -SHA1 (patch-ae) = 37e68cb981b79f0ebe4afe58de3a09083d536532 -SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d -SHA1 (patch-ag) = 7f91004562f417477a10fdb54372b01812942648 +SHA1 (qt-everywhere-opensource-src-4.6.1.tar.gz) = d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 +RMD160 (qt-everywhere-opensource-src-4.6.1.tar.gz) = 7365dfe3c688df36002d2c9aaef6b79ba8175402 +Size (qt-everywhere-opensource-src-4.6.1.tar.gz) = 160197277 bytes +SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262 +SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8 +SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84 +SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9 +SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe +SHA1 (patch-af) = 9e49533cb835538a949bd71b53cebe15ab59b9de +SHA1 (patch-ag) = 6f31f1f5161cf5ad0d9fc09b097d3763e72e6bd6 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 -SHA1 (patch-aj) = cea33ca34c5f46c3c12e4d00a991103aca70a1ed -SHA1 (patch-ak) = 8a77ab0d047c017eb70b588c78ec4230d1f90755 -SHA1 (patch-al) = 2f3cef08de80d70dba6b44ad946acb56916afcf5 +SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df +SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d +SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 -SHA1 (patch-an) = 75812ead7851ba81bf56f85ab3feeea8377f64c7 -SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9 +SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 +SHA1 (patch-ao) = 314769424b9ae5d7e794decb2f67a10820714ff5 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 -SHA1 (patch-aq) = 3425c5599749eac7a8dd8142292808029a7419fe -SHA1 (patch-ar) = 1cdbbadf309f5f7b29a113d4253ea6ab419f77dd +SHA1 (patch-aq) = 361befdb8e9110edffca5f82be1eb7a8923e5fa4 +SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed +SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf -SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061 -SHA1 (patch-ca) = ae3098989a57fef9874dfc024a4821d274ebda48 -SHA1 (patch-cb) = d520bc2a828dabada78af5a2aa110f98dc67ba73 +SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6 +SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9 diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa index b8b38bbd62e..482ad438e9d 100644 --- a/x11/qt4-libs/patches/patch-aa +++ b/x11/qt4-libs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-aa,v 1.11 2010/01/29 18:19:09 adam Exp $ ---- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200 +--- qmake/generators/unix/unixmake2.cpp.orig 2010-01-15 17:01:30.000000000 +0000 +++ qmake/generators/unix/unixmake2.cpp -@@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -233,6 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isEmpty("QMAKE_BUNDLE")) { t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl; t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $ } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; -@@ -993,8 +995,12 @@ void UnixMakefileGenerator::init2() +@@ -994,8 +996,12 @@ void UnixMakefileGenerator::init2() } else if (project->isActiveConfig("staticlib")) { project->values("TARGET").first().prepend("lib"); project->values("TARGET").first() += ".a"; @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $ } else { project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); if(project->isActiveConfig("compile_libtool")) -@@ -1445,7 +1451,7 @@ UnixMakefileGenerator::writePkgConfigFil +@@ -1439,7 +1445,7 @@ UnixMakefileGenerator::writePkgConfigFil bundle = bundle.left(suffix); pkgConfiglibName = "-framework " + bundle + " "; } else { diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab index bacdc3305a5..341c72ccbc3 100644 --- a/x11/qt4-libs/patches/patch-ab +++ b/x11/qt4-libs/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $ ---- src/gui/painting/painting.pri.orig 2009-09-29 13:01:37.000000000 +0200 +--- src/gui/painting/painting.pri.orig 2010-01-15 17:01:35.000000000 +0000 +++ src/gui/painting/painting.pri -@@ -231,7 +231,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -232,7 +232,7 @@ contains(QMAKE_MAC_XARCH, no) { win32-g++|!win32:!*-icc* { mmx { -- mmx_compiler.commands = $$QMAKE_CXX -c -Winline -+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline +- mmx_compiler.commands = $$QMAKE_CXX -c -Winline ++ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline mac { mmx_compiler.commands += -Xarch_i386 -mmmx -@@ -242,7 +242,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -243,7 +243,7 @@ contains(QMAKE_MAC_XARCH, no) { mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} mmx_compiler.dependency_type = TYPE_C @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ mmx_compiler.input = MMX_SOURCES mmx_compiler.variable_out = OBJECTS mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} -@@ -250,7 +250,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -251,7 +251,7 @@ contains(QMAKE_MAC_XARCH, no) { QMAKE_EXTRA_COMPILERS += mmx_compiler } 3dnow { @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ mac { mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx -@@ -261,14 +261,14 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -262,14 +262,14 @@ contains(QMAKE_MAC_XARCH, no) { mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} mmx3dnow_compiler.dependency_type = TYPE_C @@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ mac { sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse -@@ -279,7 +279,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -280,7 +280,7 @@ contains(QMAKE_MAC_XARCH, no) { sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} sse3dnow_compiler.dependency_type = TYPE_C @@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ sse3dnow_compiler.input = SSE3DNOW_SOURCES sse3dnow_compiler.variable_out = OBJECTS sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} -@@ -288,7 +288,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -289,7 +289,7 @@ contains(QMAKE_MAC_XARCH, no) { } } sse { @@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ mac { sse_compiler.commands += -Xarch_i386 -msse -@@ -299,7 +299,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -300,7 +300,7 @@ contains(QMAKE_MAC_XARCH, no) { sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} sse_compiler.dependency_type = TYPE_C @@ -73,7 +73,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ sse_compiler.input = SSE_SOURCES sse_compiler.variable_out = OBJECTS sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} -@@ -307,7 +307,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -308,7 +308,7 @@ contains(QMAKE_MAC_XARCH, no) { QMAKE_EXTRA_COMPILERS += sse_compiler } sse2 { @@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ mac { sse2_compiler.commands += -Xarch_i386 -msse2 -@@ -318,7 +318,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -319,7 +319,7 @@ contains(QMAKE_MAC_XARCH, no) { sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} sse2_compiler.dependency_type = TYPE_C @@ -91,7 +91,7 @@ $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ sse2_compiler.input = SSE2_SOURCES sse2_compiler.variable_out = OBJECTS sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} -@@ -326,11 +326,11 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -327,11 +327,11 @@ contains(QMAKE_MAC_XARCH, no) { QMAKE_EXTRA_COMPILERS += sse2_compiler } iwmmxt { diff --git a/x11/qt4-libs/patches/patch-ac b/x11/qt4-libs/patches/patch-ac index bfc445e7962..9c0ae5ae55a 100644 --- a/x11/qt4-libs/patches/patch-ac +++ b/x11/qt4-libs/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2008/07/24 12:55:20 markd Exp $ +$NetBSD: patch-ac,v 1.3 2010/01/29 18:19:09 adam Exp $ ---- tools/designer/src/designer/designer.pro.orig 2008-04-28 15:11:20.000000000 +0200 +--- tools/designer/src/designer/designer.pro.orig 2010-01-15 17:01:29.000000000 +0000 +++ tools/designer/src/designer/designer.pro -@@ -13,7 +13,7 @@ INCLUDEPATH += \ +@@ -14,7 +14,7 @@ INCLUDEPATH += \ ../lib/uilib \ extra diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad index 45905cda4cc..e91f0f74588 100644 --- a/x11/qt4-libs/patches/patch-ad +++ b/x11/qt4-libs/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-ad,v 1.10 2010/01/29 18:19:09 adam Exp $ ---- src/corelib/global/qglobal.h.orig 2009-09-29 13:01:37.000000000 +0200 +--- src/corelib/global/qglobal.h.orig 2010-01-15 17:01:36.000000000 +0000 +++ src/corelib/global/qglobal.h -@@ -158,6 +158,7 @@ namespace QT_NAMESPACE {} +@@ -159,6 +159,7 @@ namespace QT_NAMESPACE {} NETBSD - NetBSD OPENBSD - OpenBSD BSDI - BSD/OS @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ IRIX - SGI Irix OSF - HP Tru64 UNIX SCO - SCO OpenServer 5 -@@ -219,6 +220,9 @@ namespace QT_NAMESPACE {} +@@ -224,6 +225,9 @@ namespace QT_NAMESPACE {} #elif defined(__NetBSD__) # define Q_OS_NETBSD # define Q_OS_BSD4 @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ #elif defined(__OpenBSD__) # define Q_OS_OPENBSD # define Q_OS_BSD4 -@@ -261,8 +265,6 @@ namespace QT_NAMESPACE {} +@@ -266,8 +270,6 @@ namespace QT_NAMESPACE {} #endif #if defined(Q_OS_DARWIN) @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ # if defined(Q_OS_DARWIN64) # define Q_OS_MAC64 # elif defined(Q_OS_DARWIN32) -@@ -756,8 +758,6 @@ namespace QT_NAMESPACE {} +@@ -805,8 +807,6 @@ namespace QT_NAMESPACE {} # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" #elif defined(Q_OS_UNIX) # if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS) diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae index 0561dc6a209..b2ac11e2402 100644 --- a/x11/qt4-libs/patches/patch-ae +++ b/x11/qt4-libs/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $ ---- qmake/generators/unix/unixmake.cpp.orig 2009-09-29 13:01:33.000000000 +0200 +--- qmake/generators/unix/unixmake.cpp.orig 2010-01-15 17:01:30.000000000 +0000 +++ qmake/generators/unix/unixmake.cpp -@@ -324,27 +324,29 @@ UnixMakefileGenerator::init() +@@ -325,27 +325,29 @@ UnixMakefileGenerator::init() if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { libtool_flags += " --mode=link"; if(project->isActiveConfig("staticlib")) { @@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $ } else { libtool_flags += " --mode=compile"; } -@@ -676,7 +678,6 @@ UnixMakefileGenerator::defaultInstall(co +@@ -677,7 +679,6 @@ UnixMakefileGenerator::defaultInstall(co QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false); if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) destdir += Option::dir_sep; @@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $ if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; -@@ -714,10 +715,14 @@ UnixMakefileGenerator::defaultInstall(co +@@ -715,10 +716,14 @@ UnixMakefileGenerator::defaultInstall(co QString src_targ = target; if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af index a23dc73835a..3fd8dd978a2 100644 --- a/x11/qt4-libs/patches/patch-af +++ b/x11/qt4-libs/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.6 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-af,v 1.7 2010/01/29 18:19:09 adam Exp $ ---- qmake/Makefile.unix.orig 2009-02-25 22:09:16.000000000 +0100 +--- qmake/Makefile.unix.orig 2010-01-15 17:01:30.000000000 +0000 +++ qmake/Makefile.unix @@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ QTOBJS = @QMAKE_QTOBJS@ @@ -11,16 +11,16 @@ $NetBSD: patch-af,v 1.6 2009/06/13 11:55:51 hasso Exp $ #qmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ -@@ -88,7 +88,7 @@ DEPEND_SRC=project.cpp property.cpp meta - $(SOURCE_PATH)/src/script/qscriptstring.cpp \ +@@ -59,7 +59,7 @@ DEPEND_SRC=project.cpp property.cpp meta + $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \ $(QTSRCS) --CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ -+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ +-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ ++CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ - -I$(BUILD_PATH)/src/corelib/global \ - -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \ -@@ -97,7 +97,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators + -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ + -DQT_NO_PCRE \ +@@ -68,7 +68,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag index e67f779a8ab..ac09484615f 100644 --- a/x11/qt4-libs/patches/patch-ag +++ b/x11/qt4-libs/patches/patch-ag @@ -1,14 +1,14 @@ -$NetBSD: patch-ag,v 1.9 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-ag,v 1.10 2010/01/29 18:19:09 adam Exp $ ---- qmake/project.cpp.orig 2009-09-29 13:01:33.000000000 +0200 +--- qmake/project.cpp.orig 2010-01-15 17:01:30.000000000 +0000 +++ qmake/project.cpp -@@ -1609,6 +1609,9 @@ QMakeProject::isActiveConfig(const QStri - else if(x == "false") - return false; +@@ -1612,6 +1612,9 @@ QMakeProject::isActiveConfig(const QStri + if(isForSymbian() && (x == "symbian" || x == "unix")) + return true; + if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib")) + return true; + //mkspecs - if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || + if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj index 62bb4f9b949..ba83e52c3e3 100644 --- a/x11/qt4-libs/patches/patch-aj +++ b/x11/qt4-libs/patches/patch-aj @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.7 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $ ---- mkspecs/netbsd-g++/qplatformdefs.h.orig 2009-09-29 13:01:33.000000000 +0200 +--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-01-15 17:01:28.000000000 +0000 +++ mkspecs/netbsd-g++/qplatformdefs.h @@ -65,6 +65,7 @@ #include <sys/types.h> @@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.7 2009/10/11 09:14:52 adam Exp $ #include <sys/time.h> #include <sys/shm.h> #include <sys/socket.h> -@@ -126,10 +127,14 @@ +@@ -127,10 +128,14 @@ #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf diff --git a/x11/qt4-libs/patches/patch-ak b/x11/qt4-libs/patches/patch-ak index efed7868008..cc83ab37def 100644 --- a/x11/qt4-libs/patches/patch-ak +++ b/x11/qt4-libs/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.5 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-ak,v 1.6 2010/01/29 18:19:09 adam Exp $ ---- src/gui/kernel/qcursor_x11.cpp.orig 2009-09-29 13:01:37.000000000 +0200 +--- src/gui/kernel/qcursor_x11.cpp.orig 2010-01-15 17:01:35.000000000 +0000 +++ src/gui/kernel/qcursor_x11.cpp -@@ -244,7 +244,7 @@ void QCursorData::update() +@@ -243,7 +243,7 @@ void QCursorData::update() return; } diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al index 2183983faeb..0f6e21f5728 100644 --- a/x11/qt4-libs/patches/patch-al +++ b/x11/qt4-libs/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.6 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-al,v 1.7 2010/01/29 18:19:09 adam Exp $ ---- src/corelib/io/qsettings.cpp.orig 2009-09-29 13:01:37.000000000 +0200 +--- src/corelib/io/qsettings.cpp.orig 2010-01-15 17:01:36.000000000 +0000 +++ src/corelib/io/qsettings.cpp -@@ -132,9 +132,16 @@ QT_END_INCLUDE_NAMESPACE +@@ -136,9 +136,16 @@ QT_END_INCLUDE_NAMESPACE static bool isLikelyToBeNfs(int handle) { @@ -19,10 +19,10 @@ $NetBSD: patch-al,v 1.6 2009/10/11 09:14:52 adam Exp $ return qt_isEvilFsTypeName(buf.f_fstypename); } -@@ -168,7 +175,7 @@ static bool isLikelyToBeNfs(int handle) +@@ -172,7 +179,7 @@ static bool isLikelyToBeNfs(int handle) #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \ - || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_QNX6) || defined(Q_OS_SCO) \ + || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_SCO) \ - || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD) + || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) QT_BEGIN_INCLUDE_NAMESPACE diff --git a/x11/qt4-libs/patches/patch-an b/x11/qt4-libs/patches/patch-an index a1a8d151b77..0999f246959 100644 --- a/x11/qt4-libs/patches/patch-an +++ b/x11/qt4-libs/patches/patch-an @@ -1,6 +1,6 @@ -$NetBSD: patch-an,v 1.6 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-an,v 1.7 2010/01/29 18:19:09 adam Exp $ ---- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2009-09-29 13:01:37.000000000 +0200 +--- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2010-01-15 17:01:36.000000000 +0000 +++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp @@ -41,7 +41,7 @@ @@ -8,10 +8,10 @@ $NetBSD: patch-an,v 1.6 2009/10/11 09:14:52 adam Exp $ -#if defined(Q_OS_MAC) +#if defined(Q_OS_MAC) || defined(__APPLE__) - #include <mach/mach.h> #include <mach/mach_time.h> -@@ -68,7 +68,7 @@ enum { + #include <unistd.h> +@@ -67,7 +67,7 @@ enum { MedianSize = 7 }; diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao index d44b2cc6f1a..46bfa02b787 100644 --- a/x11/qt4-libs/patches/patch-ao +++ b/x11/qt4-libs/patches/patch-ao @@ -1,6 +1,6 @@ -$NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ ---- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100 +--- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp @@ -50,9 +50,14 @@ #include <stdio.h> @@ -13,8 +13,8 @@ $NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ + // unistd.h is needed for the _XOPEN_UNIX macro #include <unistd.h> --#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) -+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) +-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) ++#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) # include <langinfo.h> #endif @@ -37,7 +37,7 @@ $NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else -@@ -306,7 +314,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -305,7 +313,7 @@ QByteArray QIconvCodec::convertFromUnico char *outBytes; size_t inBytesLeft; @@ -46,7 +46,7 @@ $NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ const char **inBytesPtr = const_cast<const char **>(&inBytes); #else char **inBytesPtr = &inBytes; -@@ -454,11 +462,13 @@ iconv_t QIconvCodec::createIconv_t(const +@@ -451,11 +459,13 @@ iconv_t QIconvCodec::createIconv_t(const static const char empty_codeset[] = ""; const char *codeset = empty_codeset; cd = iconv_open(to ? to : codeset, from ? from : codeset); @@ -56,8 +56,8 @@ $NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ char *codeset = 0; #endif --#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) -+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) +-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) ++#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) if (cd == (iconv_t) -1) { codeset = nl_langinfo(CODESET); if (codeset) diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index b8fd9c80aff..d05b4d01f1f 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,49 +1,17 @@ -$NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $ ---- configure.orig 2009-09-29 13:01:31.000000000 +0200 +--- configure.orig 2010-01-15 17:01:30.000000000 +0000 +++ configure -@@ -2798,7 +2798,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ - fi - - #auto-detect DWARF2 on the mac --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then - if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then - CFG_MAC_DWARF2=no - else -@@ -2807,7 +2807,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF - fi - - # auto-detect support for -Xarch on the mac --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then - if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then - CFG_MAC_XARCH=no - else -@@ -5587,18 +5587,18 @@ fi - - # Set the default arch. Select 32-bit/carbon if nothing else has - # been specified on the configure line. --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" == "" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then - source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" - -- if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then -+ if [ "$QT_MAC_DEFUALT_ARCH" = "x86_64" ]; then - CFG_MAC_ARCHS=" x86" -- elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then -+ elif [ "$QT_MAC_DEFUALT_ARCH" = "ppc64" ]; then - CFG_MAC_ARCHS=" ppc" - else - CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH" - fi - -- [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." -+ [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." - fi - - # enable cocoa and/or carbon on Mac -@@ -6538,7 +6538,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -3069,7 +3069,7 @@ fi + if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then + # get the darwin version. 10.0.0 and up means snow leopard. + VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` +- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then ++ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then + echo + echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " + echo +@@ -7012,7 +7012,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" @@ -52,12 +20,3 @@ $NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -6856,7 +6856,7 @@ EOF - *) ;; - esac - --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - cat <<EOF - WARNING: DWARF2 debug symbols are not enabled. Linking webkit - in debug mode will run out of memory on systems with 2GB or less. diff --git a/x11/qt4-libs/patches/patch-ar b/x11/qt4-libs/patches/patch-ar index 89753807834..e2b25135505 100644 --- a/x11/qt4-libs/patches/patch-ar +++ b/x11/qt4-libs/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.4 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-ar,v 1.5 2010/01/29 18:19:09 adam Exp $ ---- src/corelib/global/qglobal.h.orig 2009-10-05 09:36:44.000000000 +0200 +--- src/corelib/global/qglobal.h.orig 2010-01-27 13:03:02.000000000 +0000 +++ src/corelib/global/qglobal.h -@@ -176,7 +176,7 @@ namespace QT_NAMESPACE {} +@@ -177,7 +177,7 @@ namespace QT_NAMESPACE {} */ #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) diff --git a/x11/qt4-libs/patches/patch-au b/x11/qt4-libs/patches/patch-au new file mode 100644 index 00000000000..96fa4fa9b09 --- /dev/null +++ b/x11/qt4-libs/patches/patch-au @@ -0,0 +1,22 @@ +$NetBSD: patch-au,v 1.4 2010/01/29 18:19:09 adam Exp $ + +--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2010-01-28 07:10:17.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h +@@ -468,7 +468,7 @@ namespace JSC { + u.asBits.tag = CellTag; + else + u.asBits.tag = EmptyValueTag; +- u.asBits.payload = reinterpret_cast<int32_t>(ptr); ++ u.asBits.payload = reinterpret_cast<intptr_t>(ptr); + } + + inline JSValue::JSValue(const JSCell* ptr) +@@ -477,7 +477,7 @@ namespace JSC { + u.asBits.tag = CellTag; + else + u.asBits.tag = EmptyValueTag; +- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); ++ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr)); + } + + inline JSValue::operator bool() const diff --git a/x11/qt4-libs/patches/patch-aw b/x11/qt4-libs/patches/patch-aw new file mode 100644 index 00000000000..78013eeaf3b --- /dev/null +++ b/x11/qt4-libs/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1 2010/01/29 18:19:09 adam Exp $ + +--- src/network/kernel/qhostinfo_unix.cpp.orig 2010-01-28 07:21:09.000000000 +0000 ++++ src/network/kernel/qhostinfo_unix.cpp +@@ -116,6 +116,8 @@ static void resolveLibrary() + if (!local_res_nclose) + local_res_ninit = 0; + } ++ if (local_res_ninit) ++ local_res_init = 0; + #endif + } + diff --git a/x11/qt4-libs/patches/patch-ax b/x11/qt4-libs/patches/patch-ax index 39680365744..74afe039772 100644 --- a/x11/qt4-libs/patches/patch-ax +++ b/x11/qt4-libs/patches/patch-ax @@ -1,14 +1,16 @@ -$NetBSD: patch-ax,v 1.1 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-ax,v 1.2 2010/01/29 18:19:09 adam Exp $ ---- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig 2009-04-22 02:57:38 +0300 -+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2009-05-01 19:45:48 +0300 -@@ -76,9 +76,7 @@ extern int *__libc_stack_end; - #include <thread.h> - #endif +--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-01-28 06:27:43.000000000 +0000 ++++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp +@@ -252,7 +252,11 @@ int WebSocketHandshake::readServerHandsh + p += sizeof(webSocketConnectionHeader) - 1; + } --#if PLATFORM(OPENBSD) - #include <pthread.h> --#endif - - #if HAVE(PTHREAD_NP_H) - #include <pthread_np.h> ++#if defined(__NetBSD__) ++ if (!strstr(p, "\r\n\r\n")) { ++#else + if (!strnstr(p, "\r\n\r\n", end - p)) { ++#endif + // Just hasn't been received fully yet. + return -1; + } diff --git a/x11/qt4-libs/patches/patch-ca b/x11/qt4-libs/patches/patch-ca deleted file mode 100644 index ed9e0e89c2d..00000000000 --- a/x11/qt4-libs/patches/patch-ca +++ /dev/null @@ -1,273 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2010/01/08 09:56:09 drochner Exp $ - ---- src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp.orig 2009-09-29 11:01:36.000000000 +0000 -+++ src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp -@@ -53,6 +53,13 @@ static struct tm *gmtimeQt(const time_t - #define gmtime_r(x, y) gmtime_s((y), (x)) - #endif - -+static inline FTPEntryType ParsingFailed(ListState& state)
-+{
-+ if (state.parsedOne || state.listStyle) /* junk if we fail to parse */
-+ return FTPJunkEntry; /* this time but had previously parsed sucessfully */
-+ return FTPMiscEntry; /* its part of a comment or error message */
-+}
-+
- FTPEntryType parseOneFTPLine(const char* line, ListState& state, ListResult& result) - { - result.clear(); -@@ -121,6 +128,9 @@ FTPEntryType parseOneFTPLine(const char* - } - } - } -+
-+ if (!numtoks)
-+ return ParsingFailed(state);
- - linelen_sans_wsp = &(tokens[numtoks-1][toklen[numtoks-1]]) - tokens[0]; - if (numtoks == (sizeof(tokens)/sizeof(tokens[0])) ) -@@ -352,11 +362,16 @@ FTPEntryType parseOneFTPLine(const char* - pos++; - p++; - } -- if (lstyle && pos < (toklen[0]-1) && *p == ']') -- { -+ if (lstyle && pos < (toklen[0]-1))
-+ {
-+ /* ']' was found and there is at least one character after it */
-+ ASSERT(*p == ']');
- pos++; - p++; - tokmarker = pos; /* length of leading "[DIR1.DIR2.etc]" */ -+ } else {
-+ /* not a CMU style listing */
-+ lstyle = 0;
- } - } - while (lstyle && pos < toklen[0] && *p != ';') -@@ -383,7 +398,7 @@ FTPEntryType parseOneFTPLine(const char* - pos -= tokmarker; /* => fnlength sans "[DIR1.DIR2.etc]" */ - p = &(tokens[0][tokmarker]); /* offset of basename */ - -- if (!lstyle || pos > 80) /* VMS filenames can't be longer than that */ -+ if (!lstyle || pos == 0 || pos > 80) /* VMS filenames can't be longer than that */
- { - lstyle = 0; - } -@@ -776,7 +791,7 @@ FTPEntryType parseOneFTPLine(const char* - state.parsedOne = true; - state.listStyle = lstyle; - -- p = &(line[linelen_sans_wsp]); /* line end sans wsp */ -+ p = &(line[linelen]); /* line end */
- result.caseSensitive = true; - result.filename = tokens[3]; - result.filenameLength = p - tokens[3]; -@@ -784,29 +799,46 @@ FTPEntryType parseOneFTPLine(const char* - - if (*tokens[2] != '<') /* not <DIR> or <JUNCTION> */ - { -+ // try to handle correctly spaces at the beginning of the filename
-+ // filesize (token[2]) must end at offset 38
-+ if (tokens[2] + toklen[2] - line == 38) {
-+ result.filename = &(line[39]);
-+ result.filenameLength = p - result.filename;
-+ }
- result.type = FTPFileEntry; - pos = toklen[2]; - result.fileSize = String(tokens[2], pos); - } -- else if ((tokens[2][1]) != 'D') /* not <DIR> */ -- { -- result.type = FTPJunkEntry; /* unknown until junc for sure */ -- if (result.filenameLength > 4) -- { -- p = result.filename; -- for (pos = result.filenameLength - 4; pos > 0; pos--) -- { -- if (p[0] == ' ' && p[3] == ' ' && p[2] == '>' && -- (p[1] == '=' || p[1] == '-')) -+ else {
-+ // try to handle correctly spaces at the beginning of the filename
-+ // token[2] must begin at offset 24, the length is 5 or 10
-+ // token[3] must begin at offset 39 or higher
-+ if (tokens[2] - line == 24 && (toklen[2] == 5 || toklen[2] == 10) &&
-+ tokens[3] - line >= 39) {
-+ result.filename = &(line[39]);
-+ result.filenameLength = p - result.filename;
-+ }
-+
-+ if ((tokens[2][1]) != 'D') /* not <DIR> */
-+ {
-+ result.type = FTPJunkEntry; /* unknown until junc for sure */
-+ if (result.filenameLength > 4)
-+ {
-+ p = result.filename;
-+ for (pos = result.filenameLength - 4; pos > 0; pos--)
- { -- result.type = FTPLinkEntry; -- result.filenameLength = p - result.filename; -- result.linkname = p + 4; -- result.linknameLength = &(line[linelen_sans_wsp]) -- - result.linkname; -- break; -+ if (p[0] == ' ' && p[3] == ' ' && p[2] == '>' &&
-+ (p[1] == '=' || p[1] == '-'))
-+ {
-+ result.type = FTPLinkEntry;
-+ result.filenameLength = p - result.filename;
-+ result.linkname = p + 4;
-+ result.linknameLength = &(line[linelen])
-+ - result.linkname;
-+ break;
-+ }
-+ p++;
- } -- p++; - } - } - } -@@ -817,8 +849,13 @@ FTPEntryType parseOneFTPLine(const char* - result.modifiedTime.tm_mon--; - result.modifiedTime.tm_mday = atoi(tokens[0]+3); - result.modifiedTime.tm_year = atoi(tokens[0]+6); -+ /* if year has only two digits then assume that
-+ 00-79 is 2000-2079
-+ 80-99 is 1980-1999 */
- if (result.modifiedTime.tm_year < 80) -- result.modifiedTime.tm_year += 100; -+ result.modifiedTime.tm_year += 2000;
-+ else if (result.modifiedTime.tm_year < 100)
-+ result.modifiedTime.tm_year += 1900;
- } - - result.modifiedTime.tm_hour = atoi(tokens[1]+0); -@@ -970,6 +1007,8 @@ FTPEntryType parseOneFTPLine(const char* - * "drwxr-xr-x 2 0 0 512 May 28 22:17 etc" - */ - -+ bool isOldHellsoft = false;
-+
- if (numtoks >= 6) - { - /* there are two perm formats (Hellsoft/NetWare and *IX strmode(3)). -@@ -995,6 +1034,8 @@ FTPEntryType parseOneFTPLine(const char* - { - /* rest is FMA[S] or AFM[S] */ - lstyle = 'U'; /* very likely one of the NetWare servers */ -+ if (toklen[0] == 10)
-+ isOldHellsoft = true;
- } - } - } -@@ -1059,7 +1100,7 @@ FTPEntryType parseOneFTPLine(const char* - - /* check that size is numeric */ - p = tokens[tokmarker]; -- for (pos = 0; lstyle && pos < toklen[tokmarker]; pos++) -+ for (unsigned int i = 0; lstyle && i < toklen[tokmarker]; ++i)
- { - if (!isASCIIDigit(*p++)) - lstyle = 0; -@@ -1068,11 +1109,11 @@ FTPEntryType parseOneFTPLine(const char* - { - month_num = 0; - p = tokens[tokmarker+1]; -- for (pos = 0;pos < (12*3); pos+=3) -+ for (unsigned int i = 0; i < (12*3); i+=3)
- { -- if (p[0] == month_names[pos+0] && -- p[1] == month_names[pos+1] && -- p[2] == month_names[pos+2]) -+ if (p[0] == month_names[i+0] &&
-+ p[1] == month_names[i+1] &&
-+ p[2] == month_names[i+2])
- break; - month_num++; - } -@@ -1080,8 +1121,8 @@ FTPEntryType parseOneFTPLine(const char* - lstyle = 0; - } - } /* relative position test */ -- } /* while (pos+5) < numtoks */ -- } /* if (numtoks >= 4) */ -+ } /* for (pos = (numtoks-5); !lstyle && pos > 1; pos--) */
-+ } /* if (lstyle == 'U') */
- - if (lstyle == 'U') - { -@@ -1140,24 +1181,49 @@ FTPEntryType parseOneFTPLine(const char* - - } /* time/year */ - -- result.filename = tokens[tokmarker+4]; -- result.filenameLength = (&(line[linelen_sans_wsp])) -+ // there is exacly 1 space between filename and previous token in all
-+ // outputs except old Hellsoft
-+ if (!isOldHellsoft)
-+ result.filename = tokens[tokmarker+3] + toklen[tokmarker+3] + 1;
-+ else
-+ result.filename = tokens[tokmarker+4];
-+
-+ result.filenameLength = (&(line[linelen]))
- - (result.filename); - - if (result.type == FTPLinkEntry && result.filenameLength > 4) - { -- p = result.filename + 1; -- for (pos = 1; pos < (result.filenameLength - 4); pos++) -- { -- if (*p == ' ' && p[1] == '-' && p[2] == '>' && p[3] == ' ') -- { -- result.linkname = p + 4; -- result.linknameLength = (&(line[linelen_sans_wsp])) -- - (result.linkname); -- result.filenameLength = pos; -- break; -- } -- p++; -+ /* First try to use result.fe_size to find " -> " sequence.
-+ This can give proper result for cases like "aaa -> bbb -> ccc". */
-+ unsigned int fileSize = result.fileSize.toUInt();
-+
-+ if (result.filenameLength > (fileSize + 4) &&
-+ strncmp(result.filename + result.filenameLength - fileSize - 4, " -> ", 4) == 0)
-+ {
-+ result.linkname = result.filename + (result.filenameLength - fileSize);
-+ result.linknameLength = (&(line[linelen])) - (result.linkname);
-+ result.filenameLength -= fileSize + 4;
-+ }
-+ else
-+ {
-+ /* Search for sequence " -> " from the end for case when there are
-+ more occurrences. F.e. if ftpd returns "a -> b -> c" assume
-+ "a -> b" as a name. Powerusers can remove unnecessary parts
-+ manually but there is no way to follow the link when some
-+ essential part is missing. */
-+ p = result.filename + (result.filenameLength - 5);
-+ for (pos = (result.filenameLength - 5); pos > 0; pos--)
-+ {
-+ if (strncmp(p, " -> ", 4) == 0)
-+ {
-+ result.linkname = p + 4;
-+ result.linknameLength = (&(line[linelen]))
-+ - (result.linkname);
-+ result.filenameLength = pos;
-+ break;
-+ }
-+ p--;
-+ }
- } - } - -@@ -1614,9 +1680,7 @@ FTPEntryType parseOneFTPLine(const char* - - } /* if (linelen > 0) */ - -- if (state.parsedOne || state.listStyle) /* junk if we fail to parse */ -- return FTPJunkEntry; /* this time but had previously parsed sucessfully */ -- return FTPMiscEntry; /* its part of a comment or error message */ -+ return ParsingFailed(state);
- } - - } // namespace WebCore diff --git a/x11/qt4-libs/patches/patch-cb b/x11/qt4-libs/patches/patch-cb deleted file mode 100644 index b145b019430..00000000000 --- a/x11/qt4-libs/patches/patch-cb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2010/01/08 09:56:09 drochner Exp $ - ---- src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp.orig 2009-09-29 11:01:37.000000000 +0000 -+++ src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp -@@ -735,7 +735,6 @@ void XMLHttpRequest::makeCrossSiteAccess - } - - preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", String::adopt(headerBuffer)); -- preflightRequest.addHTTPHeaderFields(m_requestHeaders); - } - - if (m_async) { diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile index 31b4215b26c..63b9ded8a97 100644 --- a/x11/qt4-mysql/Makefile +++ b/x11/qt4-mysql/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-mysql-${QTVERSION} -PKGREVISION= 1 COMMENT= QT mysql driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile index 79d37d27c53..39fbfef8993 100644 --- a/x11/qt4-pgsql/Makefile +++ b/x11/qt4-pgsql/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/01/29 18:19:09 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-pgsql-${QTVERSION} -PKGREVISION= 1 COMMENT= QT postgresql driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile index 16a8c67a67e..120b8ad23d7 100644 --- a/x11/qt4-qdbus/Makefile +++ b/x11/qt4-qdbus/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/01/29 18:19:09 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-qdbus-${QTVERSION} -PKGREVISION= 2 COMMENT= QT DBus support CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib diff --git a/x11/qt4-qdbus/PLIST b/x11/qt4-qdbus/PLIST index f9d83ba33cf..a20ecc84df2 100644 --- a/x11/qt4-qdbus/PLIST +++ b/x11/qt4-qdbus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2009/10/17 22:57:45 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2010/01/29 18:19:09 adam Exp $ lib/pkgconfig/QtDBus.pc qt4/bin/qdbus qt4/bin/qdbuscpp2xml @@ -21,8 +21,10 @@ qt4/include/Qt/qdbuspendingcall.h qt4/include/Qt/qdbuspendingreply.h qt4/include/Qt/qdbusreply.h qt4/include/Qt/qdbusserver.h +qt4/include/Qt/qdbusservicewatcher.h qt4/include/QtDBus/QDBusAbstractAdaptor qt4/include/QtDBus/QDBusAbstractInterface +qt4/include/QtDBus/QDBusAbstractInterfaceBase qt4/include/QtDBus/QDBusArgument qt4/include/QtDBus/QDBusConnection qt4/include/QtDBus/QDBusConnectionInterface @@ -38,6 +40,7 @@ qt4/include/QtDBus/QDBusPendingReply qt4/include/QtDBus/QDBusPendingReplyData qt4/include/QtDBus/QDBusReply qt4/include/QtDBus/QDBusServer +qt4/include/QtDBus/QDBusServiceWatcher qt4/include/QtDBus/QDBusSignature qt4/include/QtDBus/QDBusVariant qt4/include/QtDBus/QtDBus @@ -57,4 +60,5 @@ qt4/include/QtDBus/qdbuspendingcall.h qt4/include/QtDBus/qdbuspendingreply.h qt4/include/QtDBus/qdbusreply.h qt4/include/QtDBus/qdbusserver.h +qt4/include/QtDBus/qdbusservicewatcher.h qt4/lib/libQtDBus.la diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index 08a8de571c5..9dc06c338d1 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:44 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/01/29 18:19:09 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 430fe4a1b00..e810b4ca83a 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:44 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 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 8d9f6295c09..74d68dd6382 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:44 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2010/01/29 18:19:09 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tools-${QTVERSION} -PKGREVISION= 2 COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base @@ -13,14 +12,21 @@ DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib CONFIGURE_ARGS+= -DQT_NO_DBUS -BUILD_TARGET= sub-tools sub-tools-qdoc3 +# XXX this is to test what really gets installed when 'do-install' is disabled +INSTALL_DIRS+= tools + +BUILD_TARGET= sub-tools-bootstrap sub-tools BUILD_QT4= yes UNLIMIT_RESOURCES= datasize -INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig \ - ${QTPREFIX}/plugins/designer ${QTPREFIX}/phrasebooks \ - ${QTPREFIX}/mkspecs ${QTPREFIX}/tools/qdoc3 +INSTALLATION_DIRS= lib/pkgconfig +INSTALLATION_DIRS+= ${QTPREFIX}/bin +INSTALLATION_DIRS+= ${QTPREFIX}/lib +INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks +INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer +INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs +INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3 INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} post-configure: @@ -32,13 +38,11 @@ do-install: .for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ .endfor -.for prog in assistant designer linguist qtconfig qhelpconverter \ +.for prog in assistant designer linguist qdoc3 qtconfig qhelpconverter \ qhelpgenerator qcollectiongenerator ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ ${DESTDIR}${QTPREFIX}/bin .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/tools/qdoc3/qdoc3 \ - ${DESTDIR}${QTPREFIX}/tools/qdoc3/ cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ @@ -57,6 +61,9 @@ do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} \ ${WRKSRC}/plugins/designer/libqt3supportwidgets.la \ ${DESTDIR}${QTPREFIX}/plugins/designer/ + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/plugins/designer/libqwebview.la \ + ${DESTDIR}${QTPREFIX}/plugins/designer/ ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ ${DESTDIR}${QTPREFIX}/phrasebooks/ cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index 253dcd5ec3b..ae83f713da6 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2009/10/17 23:32:52 wiz Exp $ +@comment $NetBSD: PLIST,v 1.20 2010/01/29 18:19:10 adam Exp $ lib/pkgconfig/QtAssistantClient.pc lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc @@ -13,6 +13,7 @@ qt4/bin/lrelease qt4/bin/lupdate qt4/bin/pixeltool qt4/bin/qcollectiongenerator +qt4/bin/qdoc3 qt4/bin/qhelpconverter qt4/bin/qhelpgenerator qt4/bin/qmake @@ -156,8 +157,12 @@ qt4/mkspecs/common/mac-llvm.conf qt4/mkspecs/common/mac.conf qt4/mkspecs/common/qmake.conf qt4/mkspecs/common/qws.conf +qt4/mkspecs/common/symbian/qplatformdefs.h +qt4/mkspecs/common/symbian/stl-off/new +qt4/mkspecs/common/symbian/symbian.conf qt4/mkspecs/common/unix.conf -qt4/mkspecs/common/wince.conf +qt4/mkspecs/common/wince/qmake.conf +qt4/mkspecs/common/wince/qplatformdefs.h qt4/mkspecs/cygwin-g++/qmake.conf qt4/mkspecs/cygwin-g++/qplatformdefs.h qt4/mkspecs/darwin-g++/qmake.conf @@ -173,6 +178,7 @@ qt4/mkspecs/features/default_post.prf qt4/mkspecs/features/default_pre.prf qt4/mkspecs/features/designer.prf qt4/mkspecs/features/dll.prf +qt4/mkspecs/features/egl.prf qt4/mkspecs/features/exclusive_builds.prf qt4/mkspecs/features/help.prf qt4/mkspecs/features/include_source_dir.prf @@ -207,6 +213,17 @@ qt4/mkspecs/features/silent.prf qt4/mkspecs/features/static.prf qt4/mkspecs/features/static_and_shared.prf qt4/mkspecs/features/staticlib.prf +qt4/mkspecs/features/symbian/application_icon.prf +qt4/mkspecs/features/symbian/armcc_warnings.prf +qt4/mkspecs/features/symbian/data_caging_paths.prf +qt4/mkspecs/features/symbian/default_post.prf +qt4/mkspecs/features/symbian/default_pre.prf +qt4/mkspecs/features/symbian/epocallowdlldata.prf +qt4/mkspecs/features/symbian/moc.prf +qt4/mkspecs/features/symbian/platform_paths.prf +qt4/mkspecs/features/symbian/qt.prf +qt4/mkspecs/features/symbian/stl.prf +qt4/mkspecs/features/symbian/stl_off.prf qt4/mkspecs/features/uic.prf qt4/mkspecs/features/uitools.prf qt4/mkspecs/features/unix/bsymbolic_functions.prf @@ -214,6 +231,7 @@ qt4/mkspecs/features/unix/dylib.prf qt4/mkspecs/features/unix/hide_symbols.prf qt4/mkspecs/features/unix/largefile.prf qt4/mkspecs/features/unix/opengl.prf +qt4/mkspecs/features/unix/openvg.prf qt4/mkspecs/features/unix/separate_debug_info.prf qt4/mkspecs/features/unix/thread.prf qt4/mkspecs/features/unix/x11.prf @@ -221,6 +239,7 @@ qt4/mkspecs/features/unix/x11inc.prf qt4/mkspecs/features/unix/x11lib.prf qt4/mkspecs/features/unix/x11sm.prf qt4/mkspecs/features/use_c_linker.prf +qt4/mkspecs/features/vxworks.prf qt4/mkspecs/features/warn_off.prf qt4/mkspecs/features/warn_on.prf qt4/mkspecs/features/win32/console.prf @@ -233,6 +252,7 @@ qt4/mkspecs/features/win32/exceptions.prf qt4/mkspecs/features/win32/exceptions_off.prf qt4/mkspecs/features/win32/ltcg.prf qt4/mkspecs/features/win32/opengl.prf +qt4/mkspecs/features/win32/openvg.prf qt4/mkspecs/features/win32/qaxcontainer.prf qt4/mkspecs/features/win32/qaxserver.prf qt4/mkspecs/features/win32/qt_dll.prf @@ -288,6 +308,8 @@ qt4/mkspecs/linux-g++-32/qmake.conf qt4/mkspecs/linux-g++-32/qplatformdefs.h qt4/mkspecs/linux-g++-64/qmake.conf qt4/mkspecs/linux-g++-64/qplatformdefs.h +qt4/mkspecs/linux-g++-maemo/qmake.conf +qt4/mkspecs/linux-g++-maemo/qplatformdefs.h qt4/mkspecs/linux-g++/qmake.conf qt4/mkspecs/linux-g++/qplatformdefs.h qt4/mkspecs/linux-icc-32/qmake.conf @@ -310,6 +332,10 @@ qt4/mkspecs/macx-g++/Info.plist.app qt4/mkspecs/macx-g++/Info.plist.lib qt4/mkspecs/macx-g++/qmake.conf qt4/mkspecs/macx-g++/qplatformdefs.h +qt4/mkspecs/macx-g++40/Info.plist.app +qt4/mkspecs/macx-g++40/Info.plist.lib +qt4/mkspecs/macx-g++40/qmake.conf +qt4/mkspecs/macx-g++40/qplatformdefs.h qt4/mkspecs/macx-g++42/Info.plist.app qt4/mkspecs/macx-g++42/Info.plist.lib qt4/mkspecs/macx-g++42/qmake.conf @@ -358,8 +384,8 @@ qt4/mkspecs/qws/linux-lsb-g++/qmake.conf qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h qt4/mkspecs/qws/linux-mips-g++/qmake.conf qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h -qt4/mkspecs/qws/linux-ppc-g++/qmake.conf -qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h +qt4/mkspecs/qws/linux-powerpc-g++/qmake.conf +qt4/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h qt4/mkspecs/qws/linux-sh-g++/qmake.conf qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf @@ -381,14 +407,25 @@ qt4/mkspecs/sco-cc/qmake.conf qt4/mkspecs/sco-cc/qplatformdefs.h qt4/mkspecs/sco-g++/qmake.conf qt4/mkspecs/sco-g++/qplatformdefs.h +qt4/mkspecs/solaris-cc-64-stlport/qmake.conf +qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h qt4/mkspecs/solaris-cc-64/qmake.conf qt4/mkspecs/solaris-cc-64/qplatformdefs.h +qt4/mkspecs/solaris-cc-stlport/qmake.conf +qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h qt4/mkspecs/solaris-cc/qmake.conf qt4/mkspecs/solaris-cc/qplatformdefs.h qt4/mkspecs/solaris-g++-64/qmake.conf qt4/mkspecs/solaris-g++-64/qplatformdefs.h qt4/mkspecs/solaris-g++/qmake.conf qt4/mkspecs/solaris-g++/qplatformdefs.h +qt4/mkspecs/symbian-abld/qmake.conf +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 +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/tru64-cxx/qmake.conf qt4/mkspecs/tru64-cxx/qplatformdefs.h qt4/mkspecs/tru64-g++/qmake.conf @@ -397,6 +434,27 @@ qt4/mkspecs/unixware-cc/qmake.conf qt4/mkspecs/unixware-cc/qplatformdefs.h qt4/mkspecs/unixware-g++/qmake.conf qt4/mkspecs/unixware-g++/qplatformdefs.h +qt4/mkspecs/unsupported/linux-host-g++/qmake.conf +qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h +qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf +qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h +qt4/mkspecs/unsupported/qmake.conf +qt4/mkspecs/unsupported/qnx-g++/qmake.conf +qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h +qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf +qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h +qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf +qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h +qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf +qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h +qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf +qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h +qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf +qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h +qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h +qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf +qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h qt4/mkspecs/win32-borland/qmake.conf qt4/mkspecs/win32-borland/qplatformdefs.h qt4/mkspecs/win32-g++/qmake.conf @@ -445,6 +503,8 @@ qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h +qt4/mkspecs/wince60standard-x86-msvc2005/qmake.conf +qt4/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h @@ -469,6 +529,12 @@ qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h +qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf +qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf +qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h +qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf +qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf +qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h qt4/phrasebooks/danish.qph qt4/phrasebooks/dutch.qph qt4/phrasebooks/finnish.qph @@ -482,4 +548,4 @@ qt4/phrasebooks/russian.qph qt4/phrasebooks/spanish.qph qt4/phrasebooks/swedish.qph qt4/plugins/designer/libqt3supportwidgets.la -qt4/tools/qdoc3/qdoc3 +qt4/plugins/designer/libqwebview.la diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile index 5ac1e1b0d62..a8cefb7e76c 100644 --- a/x11/qt4/Makefile +++ b/x11/qt4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/01/29 18:19:09 adam Exp $ DISTNAME= qt4-${QTVERSION} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= # none diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common index 257070ea01a..d98c165290d 100644 --- a/x11/qt4/Makefile.common +++ b/x11/qt4/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.18 2009/10/11 09:14:52 adam Exp $ +# $NetBSD: Makefile.common,v 1.19 2010/01/29 18:19:09 adam Exp $ # used by x11/qt4-libs/Makefile.common # used by x11/qt4-tools/Makefile -QTVERSION= 4.5.3 +QTVERSION= 4.6.1 -MAINTAINER?= adam@NetBSD.org -HOMEPAGE= http://www.trolltech.com/products/qt/ +MAINTAINER?= pkgsrc-users@NetBSD.org +HOMEPAGE= http://qt.nokia.com/ |