diff options
-rw-r--r-- | x11/qt4-docs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-libs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-libs/distinfo | 23 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ae | 8 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ag | 4 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-al | 10 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-aq | 12 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-cc | 15 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-cd | 15 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ce | 24 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-cf | 15 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-cg | 15 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ch | 15 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ci | 24 | ||||
-rw-r--r-- | x11/qt4-mng/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-mysql/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-pgsql/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-qdbus/Makefile | 3 | ||||
-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 | 6 | ||||
-rw-r--r-- | x11/qt4/Makefile.common | 4 |
23 files changed, 171 insertions, 46 deletions
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile index e0f761eac4b..7c3fffa270d 100644 --- a/x11/qt4-docs/Makefile +++ b/x11/qt4-docs/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2011/01/13 13:40:03 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2011/03/03 05:50:04 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-docs-${QTVERSION} -PKGREVISION= 2 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 ee4cf42692a..db781540a88 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.56 2011/01/13 13:36:07 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2011/03/03 05:50:04 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 4 COMMENT= C++ X GUI toolkit # XXX this is to test what really gets installed when 'do-install' is disabled diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index ba886ec116a..b828417acd2 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,23 +1,23 @@ -$NetBSD: distinfo,v 1.50 2011/01/12 07:07:06 adam Exp $ +$NetBSD: distinfo,v 1.51 2011/03/03 05:50:04 adam Exp $ -SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341 -RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899 -Size (qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 bytes +SHA1 (qt-everywhere-opensource-src-4.7.2.tar.gz) = 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e +RMD160 (qt-everywhere-opensource-src-4.7.2.tar.gz) = de3d1c172c23c33681a0945c331db179c84cb7b5 +Size (qt-everywhere-opensource-src-4.7.2.tar.gz) = 213663032 bytes SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea -SHA1 (patch-ae) = c3956f4453a0c365b683692ef86f25be6af9f744 +SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540 SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 -SHA1 (patch-ag) = ae652f320072670ef4125b11e002c4aa2d87ce89 +SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9 -SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981 +SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 -SHA1 (patch-aq) = ec88f8b47d77297cc9a06e97a0cfce5297074c68 +SHA1 (patch-aq) = 4eaa78ad4b6f5d4db37c28a9bcc0e2cdd73490ab SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed @@ -35,3 +35,10 @@ SHA1 (patch-be) = e5555a6c08bfb98dd69543cec75771999ee37b13 SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 SHA1 (patch-cb) = 4817f5b266f75e93918517c219a1f4bf74b989b3 +SHA1 (patch-cc) = 71a7a97a89f6b87a6b4ad4201a4f47f6b5575362 +SHA1 (patch-cd) = eb70970354765bbaf6c261f4a44db6ca61c42ae5 +SHA1 (patch-ce) = 91b8f49008783e25e9e2252f92d9481bba2d318d +SHA1 (patch-cf) = 8b18fce7f564e8cd688f09fd5de6340771f428e8 +SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a +SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979 +SHA1 (patch-ci) = 2fecb3ea7796fcf5c0db421a9d10b31a35225c6d diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae index 3b063e89db3..be01364d3ab 100644 --- a/x11/qt4-libs/patches/patch-ae +++ b/x11/qt4-libs/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.9 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-ae,v 1.10 2011/03/03 05:50:04 adam Exp $ ---- qmake/generators/unix/unixmake.cpp.orig 2010-09-10 09:04:41.000000000 +0000 +--- qmake/generators/unix/unixmake.cpp.orig 2011-02-22 12:02:48.000000000 +0000 +++ qmake/generators/unix/unixmake.cpp @@ -327,27 +327,29 @@ UnixMakefileGenerator::init() if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { @@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.9 2010/11/15 13:05:45 adam Exp $ } else { libtool_flags += " --mode=compile"; } -@@ -683,7 +685,6 @@ UnixMakefileGenerator::defaultInstall(co +@@ -708,7 +710,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.9 2010/11/15 13:05:45 adam Exp $ if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; -@@ -721,10 +722,14 @@ UnixMakefileGenerator::defaultInstall(co +@@ -746,10 +747,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 a291fc0e4db..c1e0b314e3d 100644 --- a/x11/qt4-libs/patches/patch-ag +++ b/x11/qt4-libs/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.12 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-ag,v 1.13 2011/03/03 05:50:04 adam Exp $ --- qmake/project.cpp.orig 2010-09-10 09:04:41.000000000 +0000 +++ qmake/project.cpp -@@ -1534,6 +1534,9 @@ QMakeProject::isActiveConfig(const QStri +@@ -1550,6 +1550,9 @@ QMakeProject::isActiveConfig(const QStri return Option::target_mode == Option::TARG_WIN_MODE; } diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al index 0f6e21f5728..61a749fccfe 100644 --- a/x11/qt4-libs/patches/patch-al +++ b/x11/qt4-libs/patches/patch-al @@ -1,10 +1,10 @@ -$NetBSD: patch-al,v 1.7 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-al,v 1.8 2011/03/03 05:50:04 adam Exp $ ---- src/corelib/io/qsettings.cpp.orig 2010-01-15 17:01:36.000000000 +0000 +--- src/corelib/io/qsettings.cpp.orig 2011-02-22 12:04:00.000000000 +0000 +++ src/corelib/io/qsettings.cpp -@@ -136,9 +136,16 @@ QT_END_INCLUDE_NAMESPACE +@@ -142,9 +142,16 @@ QT_END_INCLUDE_NAMESPACE - static bool isLikelyToBeNfs(int handle) + Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle) { +#ifdef QT_STATVFS + struct statvfs buf; @@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.7 2010/01/29 18:19:09 adam Exp $ return qt_isEvilFsTypeName(buf.f_fstypename); } -@@ -172,7 +179,7 @@ static bool isLikelyToBeNfs(int handle) +@@ -178,7 +185,7 @@ Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyT #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_SCO) \ diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index a88f468d2b9..8e46b1f4d38 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.8 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $ ---- configure.orig 2010-11-06 01:55:00.000000000 +0000 +--- configure.orig 2011-02-22 12:02:53.000000000 +0000 +++ configure -@@ -3272,7 +3272,7 @@ fi +@@ -3297,7 +3297,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}'` @@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.8 2010/11/15 13:05:45 adam Exp $ echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo -@@ -4733,7 +4733,7 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -4755,7 +4755,7 @@ if true; then ###[ '!' -f "$outpath/bin/ done QMAKE_BUILD_ERROR=no @@ -20,7 +20,7 @@ $NetBSD: patch-aq,v 1.8 2010/11/15 13:05:45 adam Exp $ [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 -@@ -6556,7 +6556,7 @@ fi +@@ -6580,7 +6580,7 @@ fi # select Carbon on 10.4 Tiger. if [ "$PLATFORM_MAC" = "yes" ]; then VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -29,7 +29,7 @@ $NetBSD: patch-aq,v 1.8 2010/11/15 13:05:45 adam Exp $ CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi -@@ -7754,7 +7754,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -7788,7 +7788,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" diff --git a/x11/qt4-libs/patches/patch-cc b/x11/qt4-libs/patches/patch-cc new file mode 100644 index 00000000000..09a21e09b20 --- /dev/null +++ b/x11/qt4-libs/patches/patch-cc @@ -0,0 +1,15 @@ +$NetBSD: patch-cc,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/gui/kernel/qwidget_mac.mm.orig 2011-01-12 10:01:28.000000000 +0000 ++++ src/gui/kernel/qwidget_mac.mm +@@ -3206,7 +3206,7 @@ void QWidgetPrivate::setWindowIcon_sys(b + if (iconButton == nil) { + QCFString string(q->windowTitle()); + const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string); +- [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:tmpString]]; ++ [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:(NSString *)tmpString]]; + iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton]; + } + if (icon.isNull()) { diff --git a/x11/qt4-libs/patches/patch-cd b/x11/qt4-libs/patches/patch-cd new file mode 100644 index 00000000000..d358dde0326 --- /dev/null +++ b/x11/qt4-libs/patches/patch-cd @@ -0,0 +1,15 @@ +$NetBSD: patch-cd,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/gui/kernel/qcocoaview_mac.mm.orig 2011-01-12 10:05:05.000000000 +0000 ++++ src/gui/kernel/qcocoaview_mac.mm +@@ -1383,7 +1383,7 @@ static int qCocoaViewCount = 0; + if (!selectedText.isEmpty()) { + QCFString string(selectedText.mid(theRange.location, theRange.length)); + const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string); +- return [[[NSAttributedString alloc] initWithString:tmpString] autorelease]; ++ return [[[NSAttributedString alloc] initWithString:(NSString *)tmpString] autorelease]; + } else { + return nil; + } diff --git a/x11/qt4-libs/patches/patch-ce b/x11/qt4-libs/patches/patch-ce new file mode 100644 index 00000000000..d5547a1a4f5 --- /dev/null +++ b/x11/qt4-libs/patches/patch-ce @@ -0,0 +1,24 @@ +$NetBSD: patch-ce,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/gui/kernel/qcocoamenuloader_mac.mm.orig 2011-01-12 10:11:02.000000000 +0000 ++++ src/gui/kernel/qcocoamenuloader_mac.mm +@@ -70,13 +70,13 @@ QT_USE_NAMESPACE + showAllItem = [[appMenu itemWithTitle:@"Show All"] retain]; + + // Get the names in the nib to match the app name set by Qt. +- NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName())); ++ const NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName())); + [quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication" +- withString:appName]]; ++ withString:(NSString *)appName]]; + [hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication" +- withString:appName]]; ++ withString:(NSString *)appName]]; + [aboutItem setTitle:[[aboutItem title] stringByReplacingOccurrencesOfString:@"NewApplication" +- withString:appName]]; ++ withString:(NSString *)appName]]; + [appName release]; + // Disable the items that don't do anything. If someone associates a QAction with them + // They should get synced back in. diff --git a/x11/qt4-libs/patches/patch-cf b/x11/qt4-libs/patches/patch-cf new file mode 100644 index 00000000000..b2d943987d9 --- /dev/null +++ b/x11/qt4-libs/patches/patch-cf @@ -0,0 +1,15 @@ +$NetBSD: patch-cf,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig 2011-01-12 10:13:43.000000000 +0000 ++++ src/gui/kernel/qt_cocoa_helpers_mac.mm +@@ -1333,7 +1333,7 @@ QString qt_mac_get_pasteboardString(OSPa + if (PasteboardCopyName (paste, &pbname)) { + pb = [NSPasteboard generalPasteboard]; + } else { +- pb = [NSPasteboard pasteboardWithName:reinterpret_cast<const NSString *>(pbname)]; ++ pb = [NSPasteboard pasteboardWithName:(NSString *)reinterpret_cast<const NSString *>(pbname)]; + CFRelease (pbname); + } + if (pb) { diff --git a/x11/qt4-libs/patches/patch-cg b/x11/qt4-libs/patches/patch-cg new file mode 100644 index 00000000000..a9868928676 --- /dev/null +++ b/x11/qt4-libs/patches/patch-cg @@ -0,0 +1,15 @@ +$NetBSD: patch-cg,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/gui/dialogs/qfontdialog_mac.mm.orig 2011-01-12 10:16:56.000000000 +0000 ++++ src/gui/dialogs/qfontdialog_mac.mm +@@ -509,7 +509,7 @@ void QFontDialogPrivate::setFont(void *d + + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if (qstrcmp(fe->name(), "CoreText") == 0) { +- nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont); ++ nsFont = (NSFont *)reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont); + } else + #endif + { diff --git a/x11/qt4-libs/patches/patch-ch b/x11/qt4-libs/patches/patch-ch new file mode 100644 index 00000000000..ef5b99b291a --- /dev/null +++ b/x11/qt4-libs/patches/patch-ch @@ -0,0 +1,15 @@ +$NetBSD: patch-ch,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h.orig 2011-03-02 12:21:02.000000000 +0000 ++++ src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h +@@ -225,7 +225,7 @@ namespace WebCore { + { + if (!node) + return JSC::jsNull(); +- if (JSNode* wrapper = getCachedDOMNodeWrapper(exec, node->document(), node)) ++ if (JSC::JSValue wrapper = getCachedDOMNodeWrapper(exec, node->document(), node)) + return wrapper; + return createDOMNodeWrapper<WrapperClass>(exec, globalObject, node); + } diff --git a/x11/qt4-libs/patches/patch-ci b/x11/qt4-libs/patches/patch-ci new file mode 100644 index 00000000000..10dd255ff41 --- /dev/null +++ b/x11/qt4-libs/patches/patch-ci @@ -0,0 +1,24 @@ +$NetBSD: patch-ci,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Rename argument 'id'; 'id' is a key-word in Objective-C. + +--- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig 2011-03-02 13:32:05.000000000 +0000 ++++ src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -864,7 +864,7 @@ quint64 QCoreWlanEngine::bytesReceived(c + return getBytes(interfaceStr,true); + } + +-quint64 QCoreWlanEngine::startTime(const QString &id) ++quint64 QCoreWlanEngine::startTime(const QString &qid) + { + QMutexLocker locker(&mutex); + NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init]; +@@ -899,7 +899,7 @@ quint64 QCoreWlanEngine::startTime(const + for(int i = 0; i < dictSize; i++) { + if([ssidStr isEqualToString:keys[i]]) { + const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_NSStringToQString(objects[i]))); +- if(ident == id) { ++ if(ident == qid) { + ok = true; + } + } diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile index f78741343db..fd0480e3910 100644 --- a/x11/qt4-mng/Makefile +++ b/x11/qt4-mng/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2011/01/13 13:40:04 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2011/03/03 05:50:04 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-mng-${QTVERSION} -PKGREVISION= 2 COMMENT= QT MNG image format plugin CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile index 9b03576bddf..13e9da7a0a4 100644 --- a/x11/qt4-mysql/Makefile +++ b/x11/qt4-mysql/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2011/01/13 13:40:04 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2011/03/03 05:50:05 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-mysql-${QTVERSION} -PKGREVISION= 2 COMMENT= QT mysql driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile index 0cffcf4cd4e..ac6d8fce9ee 100644 --- a/x11/qt4-pgsql/Makefile +++ b/x11/qt4-pgsql/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2011/01/13 13:40:04 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2011/03/03 05:50:05 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-pgsql-${QTVERSION} -PKGREVISION= 2 COMMENT= QT postgresql driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile index e65db10d53a..c47778aa38e 100644 --- a/x11/qt4-qdbus/Makefile +++ b/x11/qt4-qdbus/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2011/01/13 13:36:53 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2011/03/03 05:50:05 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-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index adbe971fae4..115dd90dc7c 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2011/01/13 13:40:04 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2011/03/03 05:50:05 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 30fa910d903..76c7071570d 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2011/01/13 13:40:04 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2011/03/03 05:50:05 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tiff-${QTVERSION} -PKGREVISION= 2 COMMENT= QT TIFF image format plugin CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index dc7c7026092..d5ccabd3b0e 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.39 2011/01/13 13:36:55 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2011/03/03 05:50:04 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 diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index bbfa87f550a..4e16b8e823d 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2011/01/12 07:18:00 adam Exp $ +@comment $NetBSD: PLIST,v 1.25 2011/03/03 05:50:04 adam Exp $ lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc lib/pkgconfig/QtDesignerComponents.pc @@ -160,6 +160,7 @@ qt4/mkspecs/common/mac.conf qt4/mkspecs/common/posix/qplatformdefs.h qt4/mkspecs/common/qmake.conf qt4/mkspecs/common/qws.conf +qt4/mkspecs/common/symbian/appCaptionForTranslation.cpp qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h @@ -179,6 +180,7 @@ qt4/mkspecs/common/symbian/header-wrappers/ApDataHandler.h qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h +qt4/mkspecs/common/symbian/packageNameForTranslation.cpp qt4/mkspecs/common/symbian/qplatformdefs.h qt4/mkspecs/common/symbian/stl-off/new qt4/mkspecs/common/symbian/symbian-makefile.conf @@ -229,6 +231,7 @@ qt4/mkspecs/features/qtestlib.prf qt4/mkspecs/features/qtopia.prf qt4/mkspecs/features/qtopiainc.prf qt4/mkspecs/features/qtopialib.prf +qt4/mkspecs/features/qttest_p4.prf qt4/mkspecs/features/release.prf qt4/mkspecs/features/resources.prf qt4/mkspecs/features/shared.prf @@ -247,6 +250,7 @@ qt4/mkspecs/features/symbian/default_post.prf qt4/mkspecs/features/symbian/default_pre.prf qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf qt4/mkspecs/features/symbian/epocallowdlldata.prf +qt4/mkspecs/features/symbian/localize_deployment.prf qt4/mkspecs/features/symbian/moc.prf qt4/mkspecs/features/symbian/nested_exceptions.prf qt4/mkspecs/features/symbian/opengl.prf diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common index a9270eb2db3..1a97fdd6bdd 100644 --- a/x11/qt4/Makefile.common +++ b/x11/qt4/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.23 2010/11/15 13:05:44 adam Exp $ +# $NetBSD: Makefile.common,v 1.24 2011/03/03 05:50:03 adam Exp $ # used by x11/qt4-libs/Makefile.common # used by x11/qt4-tools/Makefile -QTVERSION= 4.7.1 +QTVERSION= 4.7.2 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= http://qt.nokia.com/ |