diff options
29 files changed, 94 insertions, 193 deletions
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile index 18e8a04fd1a..0d9c8e7613d 100644 --- a/x11/qt4-docs/Makefile +++ b/x11/qt4-docs/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:40 sno Exp $ +# $NetBSD: Makefile,v 1.7 2009/10/11 09:14:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-docs-${QTVERSION} -PKGREVISION= 1 COMMENT= Documentation for the QT C++ X GUI toolkit NO_CONFIGURE= yes diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 9268d211f33..5dec64b3f9e 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.34 2009/10/01 13:30:42 drochner Exp $ +# $NetBSD: Makefile,v 1.35 2009/10/11 09:14:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 3 COMMENT= C++ X GUI toolkit BUILD_TARGET= sub-src diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 212d6e77ca8..694863b61fd 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2009/07/22 09:41:07 wiz Exp $ +# $NetBSD: Makefile.common,v 1.16 2009/10/11 09:14:52 adam Exp $ # used by x11/qt4-libs/Makefile # used by x11/qt4-docs/Makefile @@ -6,7 +6,7 @@ DISTNAME= qt-x11-opensource-src-${QTVERSION} CATEGORIES= x11 MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ ftp://ftp.qtsoftware.com/qt/source/ -EXTRACT_SUFX= .tar.bz2 +#EXTRACT_SUFX= .tar.bz2 .include "../../x11/qt4/Makefile.common" diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index e3e8f4a59f8..c073298e8e8 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,30 +1,27 @@ -$NetBSD: distinfo,v 1.34 2009/10/01 13:30:42 drochner Exp $ +$NetBSD: distinfo,v 1.35 2009/10/11 09:14:52 adam Exp $ -SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b -RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7 -Size (qt-x11-opensource-src-4.5.2.tar.bz2) = 116015284 bytes -SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c -SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43 +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) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5 -SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9 +SHA1 (patch-ad) = 98cb6c33102e9e38621b0169fb9e03e72443884b +SHA1 (patch-ae) = 37e68cb981b79f0ebe4afe58de3a09083d536532 SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d -SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e +SHA1 (patch-ag) = 7f91004562f417477a10fdb54372b01812942648 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 -SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203 -SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a -SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c +SHA1 (patch-aj) = cea33ca34c5f46c3c12e4d00a991103aca70a1ed +SHA1 (patch-ak) = 8a77ab0d047c017eb70b588c78ec4230d1f90755 +SHA1 (patch-al) = 2f3cef08de80d70dba6b44ad946acb56916afcf5 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 -SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1 +SHA1 (patch-an) = 75812ead7851ba81bf56f85ab3feeea8377f64c7 SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9 -SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7 -SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34 -SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65 -SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b +SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 +SHA1 (patch-aq) = 3425c5599749eac7a8dd8142292808029a7419fe +SHA1 (patch-ar) = 1cdbbadf309f5f7b29a113d4253ea6ab419f77dd +SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061 -SHA1 (patch-ba) = 2538ab3200e47e072a9c1868d5d09f966435f43d -SHA1 (patch-bb) = 00b1c40fa1c1874cc61dcbb5f80eedcc8863dbc9 -SHA1 (patch-bc) = 6376bdd6789567725fbb183518f06c55bb57864d diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa index f95bd612831..b8b38bbd62e 100644 --- a/x11/qt4-libs/patches/patch-aa +++ b/x11/qt4-libs/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $ ---- qmake/generators/unix/unixmake2.cpp.orig 2009-02-25 22:09:16.000000000 +0100 +--- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200 +++ qmake/generators/unix/unixmake2.cpp @@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isEmpty("QMAKE_BUNDLE")) { @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2009/06/13 11:55:51 hasso Exp $ } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; -@@ -992,8 +994,12 @@ void UnixMakefileGenerator::init2() +@@ -993,8 +995,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.9 2009/06/13 11:55:51 hasso Exp $ } else { project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); if(project->isActiveConfig("compile_libtool")) -@@ -1444,7 +1450,7 @@ UnixMakefileGenerator::writePkgConfigFil +@@ -1445,7 +1451,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 c8174dfd699..bacdc3305a5 100644 --- a/x11/qt4-libs/patches/patch-ab +++ b/x11/qt4-libs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ ---- src/gui/painting/painting.pri.orig 2009-02-25 22:09:22.000000000 +0100 +--- src/gui/painting/painting.pri.orig 2009-09-29 13:01:37.000000000 +0200 +++ src/gui/painting/painting.pri -@@ -230,7 +230,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -231,7 +231,7 @@ contains(QMAKE_MAC_XARCH, no) { win32-g++|!win32:!*-icc* { mmx { @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $ mac { mmx_compiler.commands += -Xarch_i386 -mmmx -@@ -241,7 +241,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -242,7 +242,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.8 2009/06/13 11:55:51 hasso Exp $ mmx_compiler.input = MMX_SOURCES mmx_compiler.variable_out = OBJECTS mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} -@@ -249,7 +249,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -250,7 +250,7 @@ contains(QMAKE_MAC_XARCH, no) { QMAKE_EXTRA_COMPILERS += mmx_compiler } 3dnow { @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $ mac { mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx -@@ -260,14 +260,14 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -261,14 +261,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.8 2009/06/13 11:55:51 hasso Exp $ mac { sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse -@@ -278,7 +278,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -279,7 +279,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.8 2009/06/13 11:55:51 hasso Exp $ sse3dnow_compiler.input = SSE3DNOW_SOURCES sse3dnow_compiler.variable_out = OBJECTS sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} -@@ -287,7 +287,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -288,7 +288,7 @@ contains(QMAKE_MAC_XARCH, no) { } } sse { @@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $ mac { sse_compiler.commands += -Xarch_i386 -msse -@@ -298,7 +298,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -299,7 +299,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.8 2009/06/13 11:55:51 hasso Exp $ sse_compiler.input = SSE_SOURCES sse_compiler.variable_out = OBJECTS sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} -@@ -306,7 +306,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -307,7 +307,7 @@ contains(QMAKE_MAC_XARCH, no) { QMAKE_EXTRA_COMPILERS += sse_compiler } sse2 { @@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $ mac { sse2_compiler.commands += -Xarch_i386 -msse2 -@@ -317,7 +317,7 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -318,7 +318,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.8 2009/06/13 11:55:51 hasso Exp $ sse2_compiler.input = SSE2_SOURCES sse2_compiler.variable_out = OBJECTS sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} -@@ -325,11 +325,11 @@ contains(QMAKE_MAC_XARCH, no) { +@@ -326,11 +326,11 @@ contains(QMAKE_MAC_XARCH, no) { QMAKE_EXTRA_COMPILERS += sse2_compiler } iwmmxt { diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad index e90dace3735..45905cda4cc 100644 --- a/x11/qt4-libs/patches/patch-ad +++ b/x11/qt4-libs/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.8 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ ---- src/corelib/global/qglobal.h.orig 2008-09-27 10:58:46.000000000 +0200 +--- src/corelib/global/qglobal.h.orig 2009-09-29 13:01:37.000000000 +0200 +++ src/corelib/global/qglobal.h -@@ -149,6 +149,7 @@ namespace QT_NAMESPACE {} +@@ -158,6 +158,7 @@ namespace QT_NAMESPACE {} NETBSD - NetBSD OPENBSD - OpenBSD BSDI - BSD/OS @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.8 2008/10/26 14:02:33 adam Exp $ IRIX - SGI Irix OSF - HP Tru64 UNIX SCO - SCO OpenServer 5 -@@ -210,6 +211,9 @@ namespace QT_NAMESPACE {} +@@ -219,6 +220,9 @@ namespace QT_NAMESPACE {} #elif defined(__NetBSD__) # define Q_OS_NETBSD # define Q_OS_BSD4 @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.8 2008/10/26 14:02:33 adam Exp $ #elif defined(__OpenBSD__) # define Q_OS_OPENBSD # define Q_OS_BSD4 -@@ -252,8 +256,6 @@ namespace QT_NAMESPACE {} +@@ -261,8 +265,6 @@ namespace QT_NAMESPACE {} #endif #if defined(Q_OS_DARWIN) @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.8 2008/10/26 14:02:33 adam Exp $ # if defined(Q_OS_DARWIN64) # define Q_OS_MAC64 # elif defined(Q_OS_DARWIN32) -@@ -699,8 +701,6 @@ namespace QT_NAMESPACE {} +@@ -756,8 +758,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 98098dbdce1..0561dc6a209 100644 --- a/x11/qt4-libs/patches/patch-ae +++ b/x11/qt4-libs/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.6 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $ ---- qmake/generators/unix/unixmake.cpp.orig 2008-09-27 10:58:43.000000000 +0200 +--- qmake/generators/unix/unixmake.cpp.orig 2009-09-29 13:01:33.000000000 +0200 +++ qmake/generators/unix/unixmake.cpp -@@ -317,27 +317,29 @@ UnixMakefileGenerator::init() +@@ -324,27 +324,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.6 2008/10/26 14:02:33 adam Exp $ } else { libtool_flags += " --mode=compile"; } -@@ -665,7 +667,6 @@ UnixMakefileGenerator::defaultInstall(co +@@ -676,7 +678,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.6 2008/10/26 14:02:33 adam Exp $ if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; -@@ -703,10 +704,14 @@ UnixMakefileGenerator::defaultInstall(co +@@ -714,10 +715,14 @@ UnixMakefileGenerator::defaultInstall(co QString src_targ = target; if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag index d4a37b86e0c..e67f779a8ab 100644 --- a/x11/qt4-libs/patches/patch-ag +++ b/x11/qt4-libs/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.8 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-ag,v 1.9 2009/10/11 09:14:52 adam Exp $ ---- qmake/project.cpp.orig 2008-09-27 10:58:44.000000000 +0200 +--- qmake/project.cpp.orig 2009-09-29 13:01:33.000000000 +0200 +++ qmake/project.cpp -@@ -1611,6 +1611,9 @@ QMakeProject::isActiveConfig(const QStri +@@ -1609,6 +1609,9 @@ QMakeProject::isActiveConfig(const QStri else if(x == "false") return false; diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj index ad9469844c3..62bb4f9b949 100644 --- a/x11/qt4-libs/patches/patch-aj +++ b/x11/qt4-libs/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.6 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-aj,v 1.7 2009/10/11 09:14:52 adam Exp $ ---- mkspecs/netbsd-g++/qplatformdefs.h.orig 2008-09-27 10:58:43.000000000 +0200 +--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2009-09-29 13:01:33.000000000 +0200 +++ mkspecs/netbsd-g++/qplatformdefs.h -@@ -61,6 +61,7 @@ +@@ -65,6 +65,7 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/ipc.h> @@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.6 2008/10/26 14:02:33 adam Exp $ #include <sys/time.h> #include <sys/shm.h> #include <sys/socket.h> -@@ -122,10 +123,14 @@ +@@ -126,10 +127,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 c4f1ac1d225..efed7868008 100644 --- a/x11/qt4-libs/patches/patch-ak +++ b/x11/qt4-libs/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.4 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-ak,v 1.5 2009/10/11 09:14:52 adam Exp $ ---- src/gui/kernel/qcursor_x11.cpp.orig 2008-09-27 10:58:47.000000000 +0200 +--- src/gui/kernel/qcursor_x11.cpp.orig 2009-09-29 13:01:37.000000000 +0200 +++ src/gui/kernel/qcursor_x11.cpp -@@ -229,7 +229,7 @@ void QCursorData::update() +@@ -244,7 +244,7 @@ void QCursorData::update() return; } diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al index 3b3f07f17b8..2183983faeb 100644 --- a/x11/qt4-libs/patches/patch-al +++ b/x11/qt4-libs/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.5 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-al,v 1.6 2009/10/11 09:14:52 adam Exp $ ---- src/corelib/io/qsettings.cpp.orig 2008-09-27 10:58:47.000000000 +0200 +--- src/corelib/io/qsettings.cpp.orig 2009-09-29 13:01:37.000000000 +0200 +++ src/corelib/io/qsettings.cpp -@@ -124,9 +124,16 @@ QT_END_INCLUDE_NAMESPACE +@@ -132,9 +132,16 @@ QT_END_INCLUDE_NAMESPACE static bool isLikelyToBeNfs(int handle) { @@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.5 2008/10/26 14:02:33 adam Exp $ return qt_isEvilFsTypeName(buf.f_fstypename); } -@@ -156,7 +163,7 @@ static bool isLikelyToBeNfs(int handle) +@@ -168,7 +175,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) \ diff --git a/x11/qt4-libs/patches/patch-an b/x11/qt4-libs/patches/patch-an index 7668621b118..a1a8d151b77 100644 --- a/x11/qt4-libs/patches/patch-an +++ b/x11/qt4-libs/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.5 2009/02/28 11:38:02 schwarz Exp $ +$NetBSD: patch-an,v 1.6 2009/10/11 09:14:52 adam Exp $ ---- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2009-02-15 16:19:07.000000000 +0100 -+++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2009-02-15 16:21:41.000000000 +0100 -@@ -37,7 +37,7 @@ +--- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2009-09-29 13:01:37.000000000 +0200 ++++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp +@@ -41,7 +41,7 @@ #include "qtconcurrentiteratekernel.h" @@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.5 2009/02/28 11:38:02 schwarz Exp $ #include <mach/mach.h> #include <mach/mach_time.h> -@@ -64,7 +64,7 @@ +@@ -68,7 +68,7 @@ enum { MedianSize = 7 }; diff --git a/x11/qt4-libs/patches/patch-ap b/x11/qt4-libs/patches/patch-ap index bde3c0bc46f..185ca35a09b 100644 --- a/x11/qt4-libs/patches/patch-ap +++ b/x11/qt4-libs/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2007/11/22 18:51:25 drochner Exp $ +$NetBSD: patch-ap,v 1.2 2009/10/11 09:14:52 adam Exp $ ---- config.tests/unix/iconv/iconv.cpp.orig 2007-11-21 18:28:36.000000000 +0100 +--- config.tests/unix/iconv/iconv.cpp.orig 2009-09-29 13:01:31.000000000 +0200 +++ config.tests/unix/iconv/iconv.cpp -@@ -7,7 +7,11 @@ int main(int, char **) +@@ -48,7 +48,11 @@ int main(int, char **) { iconv_t x = iconv_open("", ""); diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index 4aa20d1a665..b8fd9c80aff 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.4 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ ---- configure.orig 2009-04-22 01:57:35.000000000 +0200 +--- configure.orig 2009-09-29 13:01:31.000000000 +0200 +++ configure -@@ -2745,7 +2745,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ +@@ -2798,7 +2798,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ fi #auto-detect DWARF2 on the mac @@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.4 2009/06/13 11:55:51 hasso Exp $ if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then CFG_MAC_DWARF2=no else -@@ -2754,7 +2754,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF +@@ -2807,7 +2807,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF fi # auto-detect support for -Xarch on the mac @@ -20,7 +20,7 @@ $NetBSD: patch-aq,v 1.4 2009/06/13 11:55:51 hasso Exp $ if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then CFG_MAC_XARCH=no else -@@ -5504,18 +5504,18 @@ fi +@@ -5587,18 +5587,18 @@ fi # Set the default arch. Select 32-bit/carbon if nothing else has # been specified on the configure line. @@ -43,7 +43,7 @@ $NetBSD: patch-aq,v 1.4 2009/06/13 11:55:51 hasso Exp $ fi # enable cocoa and/or carbon on Mac -@@ -6445,7 +6445,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -6538,7 +6538,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,7 +52,7 @@ $NetBSD: patch-aq,v 1.4 2009/06/13 11:55:51 hasso Exp $ if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -6762,7 +6762,7 @@ EOF +@@ -6856,7 +6856,7 @@ EOF *) ;; esac diff --git a/x11/qt4-libs/patches/patch-ar b/x11/qt4-libs/patches/patch-ar index 9d250213ead..89753807834 100644 --- a/x11/qt4-libs/patches/patch-ar +++ b/x11/qt4-libs/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.3 2008/10/26 14:02:33 adam Exp $ +$NetBSD: patch-ar,v 1.4 2009/10/11 09:14:52 adam Exp $ ---- src/corelib/global/qglobal.h.orig 2008-10-26 08:15:12.000000000 +0100 +--- src/corelib/global/qglobal.h.orig 2009-10-05 09:36:44.000000000 +0200 +++ src/corelib/global/qglobal.h -@@ -167,7 +167,7 @@ namespace QT_NAMESPACE {} +@@ -176,7 +176,7 @@ namespace QT_NAMESPACE {} */ #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) diff --git a/x11/qt4-libs/patches/patch-as b/x11/qt4-libs/patches/patch-as index e3c34e961a9..29d7af0147c 100644 --- a/x11/qt4-libs/patches/patch-as +++ b/x11/qt4-libs/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.3 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-as,v 1.4 2009/10/11 09:14:52 adam Exp $ ---- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2009-02-25 22:09:25.000000000 +0100 +--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2009-09-29 13:01:39.000000000 +0200 +++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h -@@ -87,7 +87,7 @@ configure. +@@ -94,7 +94,7 @@ configure. #define _CL_HAVE_FCNTL_H 1 #endif @@ -11,7 +11,7 @@ $NetBSD: patch-as,v 1.3 2009/06/13 11:55:51 hasso Exp $ !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \ defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64)) /* Define to 1 if the system has the type `float_t'. */ -@@ -425,7 +425,7 @@ configure. +@@ -432,7 +432,7 @@ configure. # endif #endif diff --git a/x11/qt4-libs/patches/patch-ba b/x11/qt4-libs/patches/patch-ba deleted file mode 100644 index dce0d35f9e5..00000000000 --- a/x11/qt4-libs/patches/patch-ba +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2009/10/01 13:30:42 drochner Exp $ - ---- src/network/ssl/qsslcertificate.cpp.orig 2009-06-20 06:57:57.000000000 +0200 -+++ src/network/ssl/qsslcertificate.cpp -@@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, - if (!d->x509) - return result; - -- STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); -+ STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); - - if (altNames) { - for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) { -@@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType, - } - - const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5)); -- const QString altName = QLatin1String(QByteArray(altNameStr, len)); -+ const QString altName = QString::fromLatin1(altNameStr, len); - if (genName->type == GEN_DNS) - result.insert(QSsl::DnsEntry, altName); - else if (genName->type == GEN_EMAIL) diff --git a/x11/qt4-libs/patches/patch-bb b/x11/qt4-libs/patches/patch-bb deleted file mode 100644 index 27b989d6a6e..00000000000 --- a/x11/qt4-libs/patches/patch-bb +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2009/07/24 10:56:46 drochner Exp $ - ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2009-06-20 06:57:57.000000000 +0200 -+++ src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -142,9 +142,9 @@ DEFINEFUNC2(int, PEM_write_bio_RSA_PUBKE - DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG) - DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) - DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) --DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) --DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) --DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) -+DEFINEFUNC(void, sk_free, STACK_OF(GENERAL_NAME) *a, a, return, DUMMYARG) -+DEFINEFUNC(int, sk_num, STACK_OF(GENERAL_NAME) *a, a, return -1, return) -+DEFINEFUNC2(char *, sk_value, STACK_OF(GENERAL_NAME) *a, a, int b, b, return 0, return) - DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) - DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return) - DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) diff --git a/x11/qt4-libs/patches/patch-bc b/x11/qt4-libs/patches/patch-bc deleted file mode 100644 index 6b39fec109f..00000000000 --- a/x11/qt4-libs/patches/patch-bc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2009/07/24 10:56:46 drochner Exp $ - ---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2009-06-20 06:57:57.000000000 +0200 -+++ src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -254,9 +254,9 @@ int q_PEM_write_bio_RSA_PUBKEY(BIO *a, R - void q_RAND_seed(const void *a, int b); - int q_RAND_status(); - void q_RSA_free(RSA *a); --void q_sk_free(STACK *a); --int q_sk_num(STACK *a); --char * q_sk_value(STACK *a, int b); -+void q_sk_free(STACK_OF(GENERAL_NAME) *a); -+int q_sk_num(STACK_OF(GENERAL_NAME) *a); -+char * q_sk_value(STACK_OF(GENERAL_NAME) *a, int b); - int q_SSL_accept(SSL *a); - int q_SSL_clear(SSL *a); - char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c); diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile index c12bb25e637..f884449e364 100644 --- a/x11/qt4-mysql/Makefile +++ b/x11/qt4-mysql/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2009/09/03 12:12:14 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2009/10/11 09:14:52 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 3d8b91558e4..a60421ccf55 100644 --- a/x11/qt4-pgsql/Makefile +++ b/x11/qt4-pgsql/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2009/09/03 12:12:15 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2009/10/11 09:14:52 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 06263ca4ab6..74296a006df 100644 --- a/x11/qt4-qdbus/Makefile +++ b/x11/qt4-qdbus/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2009/08/26 19:56:51 sno Exp $ +# $NetBSD: Makefile,v 1.8 2009/10/11 09:14:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-qdbus-${QTVERSION} -PKGREVISION= 1 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 c223a69fc1b..173c5042b7d 100644 --- a/x11/qt4-qdbus/PLIST +++ b/x11/qt4-qdbus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:25:05 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/10/11 09:14:52 adam Exp $ lib/pkgconfig/QtDBus.pc qt4/bin/qdbus qt4/bin/qdbuscpp2xml @@ -21,25 +21,6 @@ qt4/include/Qt/qdbuspendingcall.h qt4/include/Qt/qdbuspendingreply.h qt4/include/Qt/qdbusreply.h qt4/include/Qt/qdbusserver.h -qt4/include/QtDBus/QDBusAbstractAdaptor -qt4/include/QtDBus/QDBusAbstractInterface -qt4/include/QtDBus/QDBusArgument -qt4/include/QtDBus/QDBusConnection -qt4/include/QtDBus/QDBusConnectionInterface -qt4/include/QtDBus/QDBusContext -qt4/include/QtDBus/QDBusError -qt4/include/QtDBus/QDBusInterface -qt4/include/QtDBus/QDBusMessage -qt4/include/QtDBus/QDBusMetaType -qt4/include/QtDBus/QDBusObjectPath -qt4/include/QtDBus/QDBusPendingCall -qt4/include/QtDBus/QDBusPendingCallWatcher -qt4/include/QtDBus/QDBusPendingReply -qt4/include/QtDBus/QDBusPendingReplyData -qt4/include/QtDBus/QDBusReply -qt4/include/QtDBus/QDBusServer -qt4/include/QtDBus/QDBusSignature -qt4/include/QtDBus/QDBusVariant qt4/include/QtDBus/QtDBus qt4/include/QtDBus/qdbusabstractadaptor.h qt4/include/QtDBus/qdbusabstractinterface.h diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index 6eb30766030..b40f9d488d7 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2009/09/28 18:26:38 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2009/10/11 09:14:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-sqlite3-${QTVERSION} -PKGREVISION= 2 COMMENT= QT sqlite3 driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile index 3b9abcba016..f1957b97b36 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2009/09/03 12:12:15 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2009/10/11 09:14: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 844fcb24ffa..94fd296941e 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2009/08/26 19:56:52 sno Exp $ +# $NetBSD: Makefile,v 1.26 2009/10/11 09:14:52 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 2 - PKGNAME= qt4-tools-${QTVERSION} COMMENT= QT GUI (WYSIWYG) builder and other tools diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index 529eac3048a..bef74c2caf2 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2009/07/27 19:57:51 drochner Exp $ +@comment $NetBSD: PLIST,v 1.18 2009/10/11 09:14:52 adam Exp $ lib/pkgconfig/QtAssistantClient.pc lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc @@ -110,18 +110,6 @@ qt4/include/QtDesigner/qextensionmanager.h qt4/include/QtDesigner/sdk_global.h qt4/include/QtDesigner/taskmenu.h qt4/include/QtDesigner/uilib_global.h -qt4/include/QtHelp/QHelpContentItem -qt4/include/QtHelp/QHelpContentModel -qt4/include/QtHelp/QHelpContentWidget -qt4/include/QtHelp/QHelpEngine -qt4/include/QtHelp/QHelpEngineCore -qt4/include/QtHelp/QHelpGlobal -qt4/include/QtHelp/QHelpIndexModel -qt4/include/QtHelp/QHelpIndexWidget -qt4/include/QtHelp/QHelpSearchEngine -qt4/include/QtHelp/QHelpSearchQuery -qt4/include/QtHelp/QHelpSearchQueryWidget -qt4/include/QtHelp/QHelpSearchResultWidget qt4/include/QtHelp/QtHelp qt4/include/QtHelp/qhelp_global.h qt4/include/QtHelp/qhelpcontentwidget.h diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common index 4a9b42b99c0..257070ea01a 100644 --- a/x11/qt4/Makefile.common +++ b/x11/qt4/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.17 2009/07/07 16:36:05 drochner Exp $ +# $NetBSD: Makefile.common,v 1.18 2009/10/11 09:14:52 adam Exp $ # used by x11/qt4-libs/Makefile.common # used by x11/qt4-tools/Makefile -QTVERSION= 4.5.2 +QTVERSION= 4.5.3 MAINTAINER?= adam@NetBSD.org HOMEPAGE= http://www.trolltech.com/products/qt/ |