From 5748aeeec9deebb3634f0fa3c4cc50196b02db1a Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 21 Jun 2010 16:40:52 +0000 Subject: [PATCH] minor update to 4.6.3 while there, clean up wantlibs. - fix bug with new phonon (pick up ours and not it) - fix a bug in qdbuscpp2xml (timeout) - more patches for gcc3: sse code ICES, new demo doesn't compile. spectrum not installed, seems to be macosX or something ? I can't get a thing out of it. Tested on gcc4 and gcc3... --- x11/qt4/Makefile | 31 ++++---- x11/qt4/distinfo | 10 +-- x11/qt4/patches/patch-configure | 10 +-- .../patch-demos_spectrum_app_waveform_cpp | 13 ++++ ...vascriptcore_JavaScriptCore_wtf_Platform_h | 10 +-- ...ebkit_JavaScriptCore_runtime_Collector_cpp | 8 +-- ...ch-src_3rdparty_webkit_WebCore_WebCore_pro | 8 +-- .../patch-src_corelib_global_qglobal_h | 8 +-- ...atch-src_corelib_io_qfsfileengine_unix_cpp | 8 +-- .../patch-src_corelib_kernel_qmetaobject_cpp | 10 +-- .../patch-src_gui_painting_painting_pri | 12 ++++ .../patch-src_gui_styles_qgtkstyle_cpp | 13 ---- ...-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp | 15 +++- x11/qt4/pkg/PFRAG.GCC4-shared-main | 4 +- x11/qt4/pkg/PLIST-examples | 66 ++++++++++++++++- x11/qt4/pkg/PLIST-html | 5 +- x11/qt4/pkg/PLIST-main | 72 ++++++++++++++++++- 17 files changed, 232 insertions(+), 71 deletions(-) create mode 100644 x11/qt4/patches/patch-demos_spectrum_app_waveform_cpp create mode 100644 x11/qt4/patches/patch-src_gui_painting_painting_pri delete mode 100644 x11/qt4/patches/patch-src_gui_styles_qgtkstyle_cpp diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile index dbd7ae6f4d2..73617e8e492 100644 --- a/x11/qt4/Makefile +++ b/x11/qt4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.73 2010/06/15 21:27:57 landry Exp $ +# $OpenBSD: Makefile,v 1.74 2010/06/21 16:40:52 espie Exp $ USE_GMAKE = Yes COMMENT-debug = C++ GUI toolkit, debug @@ -18,8 +18,8 @@ PKGNAME-examples = qt4-examples-${PKGVERSION} PKGNAME-sqlite2 = qt4-sqlite2-${PKGVERSION} PKGNAME-sqlite = qt4-sqlite-${PKGVERSION} PKGNAME-tds = qt4-tds-${PKGVERSION} -PKGNAME-main = qt4-${VERSION}p3 -PKGNAME-debug = qt4-debug-${PKGVERSION}p0 +PKGNAME-main = qt4-${VERSION} +PKGNAME-debug = qt4-debug-${PKGVERSION} FULLPKGNAME-html = qt4-html-${PKGVERSION} FULLPKGPATH-html = ${BASE_PKGPATH},-html @@ -46,11 +46,10 @@ SHARED_LIBS = Qt3Support 8.0 \ phonon 4.1 -VERSION = 4.6.2 -PKGVERSION = 4.6.2 +VERSION = 4.6.3 +PKGVERSION = 4.6.3 DISTNAME = qt-everywhere-opensource-src-${VERSION} - CATEGORIES = x11 MASTER_SITES = ftp://ftp.qt.nokia.com/qt/source/ \ ftp://ftp.troll.no/qt/source/ \ @@ -59,6 +58,7 @@ MASTER_SITES = ftp://ftp.qt.nokia.com/qt/source/ \ ftp://ftp.tu-chemnitz.de/pub/Qt/qt/source/ \ http://ftp.silug.org/pub/qt/source/ + HOMEPAGE = http://qt.nokia.com/ MAINTAINER = Marc Espie @@ -177,32 +177,34 @@ PROGRAMS += qtdemo pixeltool .endif -LIB_DEPENDS = glib-2.0,gthread-2.0::devel/glib2 -WANTLIB = iconv intl +LIB_DEPENDS = +WANTLIB = commonWANTLIB = ICE Xrender c GLU SM freetype pthread Xinerama \ Xext GL Xi m X11.>=10 z fontconfig \ expat commonLIB_DEPENDS = png.>=2::graphics/png -sqlWANTLIB = m z +sqlWANTLIB = m sqlLIB_DEPENDS = QtCore.>=4,QtSql::${BASE_PKGPATH} LIB_DEPENDS-main = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \ + glib-2.0,gthread-2.0::devel/glib2 \ jpeg::graphics/jpeg \ mng::graphics/libmng \ gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base WANTLIB-main = ${WANTLIB} ${commonWANTLIB} \ - lcms tiff gobject-2.0 Xrandr \ + lcms tiff gobject-2.0 \ gstbase-0.10 gstreamer-0.10 xml2 \ - gobject-2.0 gmodule-2.0 + gobject-2.0 gmodule-2.0 \ + iconv intl LIB_DEPENDS-mysql = ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \ mysqlclient_r::databases/mysql WANTLIB-mysql = ${WANTLIB} ${sqlWANTLIB} \ - crypto ssl pthread + crypto ssl pthread z LIB_DEPENDS-postgresql =${LIB_DEPENDS} ${sqlLIB_DEPENDS} \ @@ -225,8 +227,8 @@ LIB_DEPENDS-tds = ${LIB_DEPENDS} ${sqlLIB_DEPENDS} \ WANTLIB-tds = ${WANTLIB} ${sqlWANTLIB} LIB_DEPENDS-examples = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \ - QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus,QtScript,QtScriptTools,QtHelp,QtCLucene,phonon,QtMultimedia::${BASE_PKGPATH} -WANTLIB-examples = ${WANTLIB} ${commonWANTLIB} gobject-2.0 Xrandr + lib/qt4/QtDesigner,lib/qt4/QtCore.>=4,lib/qt4/QtGui,lib/qt4/QtNetwork,lib/qt4/QtOpenGL,lib/qt4/QtSql,lib/qt4/QtXml,lib/qt4/QtSvg,lib/qt4/QtTest,lib/qt4/Qt3Support,lib/qt4/QtAssistantClient,lib/qt4/QtDBus,lib/qt4/QtScript,lib/qt4/QtScriptTools,lib/qt4/QtHelp,lib/qt4/QtCLucene,lib/qt4/phonon,lib/qt4/QtMultimedia::${BASE_PKGPATH} +WANTLIB-examples = ${WANTLIB} ${commonWANTLIB} LIB_DEPENDS-html = @@ -238,6 +240,7 @@ PKG_ARCH-html = * .if ${COMPILER_VERSION:L:Mgcc4*} CONFIGURE_ARGS += -platform openbsd-g++4 PKG_ARGS += -DGCC4=1 +WANTLIB += stdc++ LIB_DEPENDS-examples += QtWebKit,QtXmlPatterns::${BASE_PKGPATH} WANTLIB-examples += sqlite3 LIB_DEPENDS-main += sqlite3::databases/sqlite3 diff --git a/x11/qt4/distinfo b/x11/qt4/distinfo index 28e86c2bdb8..90872bbf953 100644 --- a/x11/qt4/distinfo +++ b/x11/qt4/distinfo @@ -1,5 +1,5 @@ -MD5 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 62Ue5LFXwBaWqlZ3f8bg5Q== -RMD160 (qt-everywhere-opensource-src-4.6.2.tar.gz) = Xz/qEg8tuidMQVCwIWK7pAtlqHI= -SHA1 (qt-everywhere-opensource-src-4.6.2.tar.gz) = l3wQuIoiMOloaO3Hip43icD8v3A= -SHA256 (qt-everywhere-opensource-src-4.6.2.tar.gz) = F29R3bBtzmerSy78azJ9wh7Y92TF2XrMFf8fkHwq/64= -SIZE (qt-everywhere-opensource-src-4.6.2.tar.gz) = 160601949 +MD5 (qt-everywhere-opensource-src-4.6.3.tar.gz) = XGnxbUUrC7PUS8PBBVbAcg== +RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = zrPKeCY9DZzfkv75A+MMACbba/8= +SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = HBilZN+SlsfLDg3t3kC5hD4bMOg= +SHA256 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 9OCtqNTVFru4YAo+59kEbJx544zXgd+f/EbY8WrNF2g= +SIZE (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 diff --git a/x11/qt4/patches/patch-configure b/x11/qt4/patches/patch-configure index 0b089d3d6b4..3d5a0eeb036 100644 --- a/x11/qt4/patches/patch-configure +++ b/x11/qt4/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.18 2010/05/23 10:36:49 espie Exp $ ---- configure.orig Thu Feb 11 16:55:17 2010 -+++ configure Mon May 17 22:38:44 2010 -@@ -2013,7 +2013,7 @@ while [ "$#" -gt 0 ]; do +$OpenBSD: patch-configure,v 1.19 2010/06/21 16:40:52 espie Exp $ +--- configure.orig Wed Jun 2 04:03:10 2010 ++++ configure Mon Jun 21 11:32:32 2010 +@@ -2015,7 +2015,7 @@ while [ "$#" -gt 0 ]; do v|verbose) if [ "$VAL" = "yes" ]; then if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.18 2010/05/23 10:36:49 espie Exp $ else OPT_VERBOSE=yes fi -@@ -4455,7 +4455,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4445,7 +4445,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; done QMAKE_BUILD_ERROR=no diff --git a/x11/qt4/patches/patch-demos_spectrum_app_waveform_cpp b/x11/qt4/patches/patch-demos_spectrum_app_waveform_cpp new file mode 100644 index 00000000000..d15ea2fbdfb --- /dev/null +++ b/x11/qt4/patches/patch-demos_spectrum_app_waveform_cpp @@ -0,0 +1,13 @@ +$OpenBSD: patch-demos_spectrum_app_waveform_cpp,v 1.1 2010/06/21 16:40:52 espie Exp $ +--- demos/spectrum/app/waveform.cpp.orig Mon Jun 21 18:06:57 2010 ++++ demos/spectrum/app/waveform.cpp Mon Jun 21 18:07:13 2010 +@@ -100,7 +100,8 @@ void Waveform::paintEvent(QPaintEvent * /*event*/) + destRect.setLeft(destLeft); + destRect.setRight(destRight); + +- QRect sourceRect(QPoint(), m_pixmapSize); ++ QPoint p; ++ QRect sourceRect(p, m_pixmapSize); + sourceRect.setLeft(point.pixelOffset); + sourceRect.setRight(sourceRight); + diff --git a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h index 0fcebc47195..7c69536c884 100644 --- a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h +++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.2 2010/04/30 09:09:14 espie Exp $ ---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig Thu Feb 11 16:55:20 2010 -+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h Fri Apr 30 11:02:31 2010 -@@ -718,7 +718,7 @@ +$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.3 2010/06/21 16:40:52 espie Exp $ +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig Wed Jun 2 04:03:12 2010 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h Mon Jun 21 11:32:32 2010 +@@ -723,7 +723,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) +#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX) || PLATFORM(OPENBSD)) #define WTF_USE_JSVALUE64 1 - #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) + #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 diff --git a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp index 481c3c877c2..917ba13821f 100644 --- a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp +++ b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp,v 1.2 2010/04/19 09:36:30 espie Exp $ ---- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig Fri Nov 27 02:27:48 2009 -+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp Sun Dec 6 09:15:16 2009 -@@ -96,7 +96,7 @@ extern int *__libc_stack_end; +$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp,v 1.3 2010/06/21 16:40:52 espie Exp $ +--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig Wed Jun 2 04:03:10 2010 ++++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp Mon Jun 21 11:32:32 2010 +@@ -91,7 +91,7 @@ extern int *__libc_stack_end; #include #endif diff --git a/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro b/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro index 8a4e9c617ae..827ef284420 100644 --- a/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro +++ b/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_3rdparty_webkit_WebCore_WebCore_pro,v 1.1 2010/05/23 10:36:49 espie Exp $ ---- src/3rdparty/webkit/WebCore/WebCore.pro.orig Mon May 17 16:15:37 2010 -+++ src/3rdparty/webkit/WebCore/WebCore.pro Mon May 17 16:15:49 2010 -@@ -46,10 +46,10 @@ CONFIG(QTDIR_build) { +$OpenBSD: patch-src_3rdparty_webkit_WebCore_WebCore_pro,v 1.2 2010/06/21 16:40:52 espie Exp $ +--- src/3rdparty/webkit/WebCore/WebCore.pro.orig Wed Jun 2 04:03:11 2010 ++++ src/3rdparty/webkit/WebCore/WebCore.pro Mon Jun 21 11:32:32 2010 +@@ -49,10 +49,10 @@ CONFIG(QTDIR_build) { CONFIG(debug, debug|release) { isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}debug diff --git a/x11/qt4/patches/patch-src_corelib_global_qglobal_h b/x11/qt4/patches/patch-src_corelib_global_qglobal_h index 68eaffb7e94..ab1a60c569c 100644 --- a/x11/qt4/patches/patch-src_corelib_global_qglobal_h +++ b/x11/qt4/patches/patch-src_corelib_global_qglobal_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.10 2010/04/19 09:36:30 espie Exp $ ---- src/corelib/global/qglobal.h.orig Thu Feb 11 16:55:23 2010 -+++ src/corelib/global/qglobal.h Mon Mar 8 13:27:03 2010 -@@ -2219,7 +2219,7 @@ typedef uint Flags; +$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.11 2010/06/21 16:40:52 espie Exp $ +--- src/corelib/global/qglobal.h.orig Wed Jun 2 04:03:17 2010 ++++ src/corelib/global/qglobal.h Mon Jun 21 11:32:32 2010 +@@ -2216,7 +2216,7 @@ typedef uint Flags; #endif /* Q_NO_TYPESAFE_FLAGS */ diff --git a/x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp b/x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp index b0c9b2c354d..956fa6cc482 100644 --- a/x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp +++ b/x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.14 2010/04/19 09:36:30 espie Exp $ ---- src/corelib/io/qfsfileengine_unix.cpp.orig Thu Feb 11 16:55:23 2010 -+++ src/corelib/io/qfsfileengine_unix.cpp Mon Mar 8 13:27:03 2010 -@@ -323,7 +323,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi +$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.15 2010/06/21 16:40:52 espie Exp $ +--- src/corelib/io/qfsfileengine_unix.cpp.orig Wed Jun 2 04:03:17 2010 ++++ src/corelib/io/qfsfileengine_unix.cpp Mon Jun 21 11:32:32 2010 +@@ -357,7 +357,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi int readByte = 0; do { readByte = fgetc(fh); diff --git a/x11/qt4/patches/patch-src_corelib_kernel_qmetaobject_cpp b/x11/qt4/patches/patch-src_corelib_kernel_qmetaobject_cpp index 411f8020689..2f5dbdfc574 100644 --- a/x11/qt4/patches/patch-src_corelib_kernel_qmetaobject_cpp +++ b/x11/qt4/patches/patch-src_corelib_kernel_qmetaobject_cpp @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_corelib_kernel_qmetaobject_cpp,v 1.1 2010/04/19 09:36:30 espie Exp $ ---- src/corelib/kernel/qmetaobject.cpp.orig Sun Dec 6 10:12:13 2009 -+++ src/corelib/kernel/qmetaobject.cpp Sun Dec 6 10:12:52 2009 +$OpenBSD: patch-src_corelib_kernel_qmetaobject_cpp,v 1.2 2010/06/21 16:40:52 espie Exp $ +--- src/corelib/kernel/qmetaobject.cpp.orig Wed Jun 2 04:03:17 2010 ++++ src/corelib/kernel/qmetaobject.cpp Mon Jun 21 11:34:44 2010 @@ -943,7 +943,8 @@ QByteArray QMetaObject::normalizedType(const char *typ if (!type || !*type) return result; -- QVarLengthArray stackbuf(int(strlen(type)) + 1); -+ int sz = int(strlen(type)) + 1; +- QVarLengthArray stackbuf(qstrlen(type) + 1); ++ int sz = qstrlen(type) + 1; + QVarLengthArray stackbuf(sz); qRemoveWhitespace(type, stackbuf.data()); int templdepth = 0; diff --git a/x11/qt4/patches/patch-src_gui_painting_painting_pri b/x11/qt4/patches/patch-src_gui_painting_painting_pri new file mode 100644 index 00000000000..23d7e736bff --- /dev/null +++ b/x11/qt4/patches/patch-src_gui_painting_painting_pri @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_gui_painting_painting_pri,v 1.1 2010/06/21 16:40:52 espie Exp $ +--- src/gui/painting/painting.pri.orig Mon Jun 21 12:56:33 2010 ++++ src/gui/painting/painting.pri Mon Jun 21 13:01:10 2010 +@@ -221,7 +221,7 @@ contains(QMAKE_MAC_XARCH, no) { + + DEFINES += QT_HAVE_MMXEXT + } +- sse2 { ++ sse2:!openbsd-g++ { + DEFINES += QT_HAVE_SSE2 + SSE2_SOURCES += painting/qdrawhelper_sse2.cpp + } diff --git a/x11/qt4/patches/patch-src_gui_styles_qgtkstyle_cpp b/x11/qt4/patches/patch-src_gui_styles_qgtkstyle_cpp deleted file mode 100644 index 79cad8080f6..00000000000 --- a/x11/qt4/patches/patch-src_gui_styles_qgtkstyle_cpp +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_gui_styles_qgtkstyle_cpp,v 1.1 2010/05/26 11:34:13 dcoppa Exp $ ---- src/gui/styles/qgtkstyle.cpp.orig Wed May 26 12:27:49 2010 -+++ src/gui/styles/qgtkstyle.cpp Wed May 26 12:28:04 2010 -@@ -3398,6 +3398,9 @@ QRect QGtkStyle::subElementRect(SubElement element, co - Q_D(const QGtkStyle); - - QRect r = QCleanlooksStyle::subElementRect(element, option, widget); -+ if (!d->isThemeAvailable()) -+ return r; -+ - switch (element) { - case SE_ProgressBarLabel: - case SE_ProgressBarContents: diff --git a/x11/qt4/patches/patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp b/x11/qt4/patches/patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp index cf3655ab6dd..8a2aacda340 100644 --- a/x11/qt4/patches/patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp +++ b/x11/qt4/patches/patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.2 2009/04/18 17:25:43 espie Exp $ ---- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp.orig Wed Feb 25 22:09:26 2009 -+++ tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp Tue Mar 3 19:37:56 2009 +$OpenBSD: patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.3 2010/06/21 16:40:52 espie Exp $ +--- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp.orig Thu Feb 11 16:55:15 2010 ++++ tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp Fri Jun 18 18:56:27 2010 @@ -396,7 +396,7 @@ int main(int argc, char **argv) else { // run moc on this file @@ -10,3 +10,12 @@ $OpenBSD: patch-tools_qdbus_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.2 2009/04/18 17:25 if (!proc.waitForStarted()) { fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n"); +@@ -405,7 +405,7 @@ int main(int argc, char **argv) + + proc.closeWriteChannel(); + +- if (!proc.waitForFinished() || proc.exitStatus() != QProcess::NormalExit || ++ if (!proc.waitForFinished(-1) || proc.exitStatus() != QProcess::NormalExit || + proc.exitCode() != 0) { + // output the moc errors: + fprintf(stderr, "%s", proc.readAllStandardError().constData()); diff --git a/x11/qt4/pkg/PFRAG.GCC4-shared-main b/x11/qt4/pkg/PFRAG.GCC4-shared-main index c7d1a57c8c6..18f5c2366a6 100644 --- a/x11/qt4/pkg/PFRAG.GCC4-shared-main +++ b/x11/qt4/pkg/PFRAG.GCC4-shared-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.GCC4-shared-main,v 1.4 2010/05/25 08:01:59 espie Exp $ -lib/qt4/plugins/designer/libqwebview.so +@comment $OpenBSD: PFRAG.GCC4-shared-main,v 1.5 2010/06/21 16:40:52 espie Exp $ @lib lib/libQtWebKit.so.${LIBQtWebKit_VERSION} @lib lib/qt4/libQtWebKit.so.${LIBQtWebKit_VERSION} +lib/qt4/plugins/designer/libqwebview.so diff --git a/x11/qt4/pkg/PLIST-examples b/x11/qt4/pkg/PLIST-examples index 2c36dadb9f6..3d67e45542f 100644 --- a/x11/qt4/pkg/PLIST-examples +++ b/x11/qt4/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.23 2010/04/19 09:36:30 espie Exp $ +@comment $OpenBSD: PLIST-examples,v 1.24 2010/06/21 16:40:52 espie Exp $ @conflict qt4-<=4.2.2 %%SHARED%% %%GCC4%% @@ -294,6 +294,70 @@ lib/qt4/demos/shared/libdemo_shared.prl lib/qt4/demos/shared/shared.pri lib/qt4/demos/shared/shared.pro lib/qt4/demos/shared/shared.qrc +lib/qt4/demos/spectrum/ +lib/qt4/demos/spectrum/3rdparty/ +lib/qt4/demos/spectrum/3rdparty/fftreal/ +lib/qt4/demos/spectrum/3rdparty/fftreal/Array.h +lib/qt4/demos/spectrum/3rdparty/fftreal/Array.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/DynArray.h +lib/qt4/demos/spectrum/3rdparty/fftreal/DynArray.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.h +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.h +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.h +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealSelect.h +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealSelect.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h +lib/qt4/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/OscSinCos.h +lib/qt4/demos/spectrum/3rdparty/fftreal/OscSinCos.hpp +lib/qt4/demos/spectrum/3rdparty/fftreal/def.h +lib/qt4/demos/spectrum/3rdparty/fftreal/fftreal.pro +lib/qt4/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp +lib/qt4/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h +lib/qt4/demos/spectrum/3rdparty/fftreal/license.txt +lib/qt4/demos/spectrum/3rdparty/fftreal/readme.txt +lib/qt4/demos/spectrum/README.txt +lib/qt4/demos/spectrum/TODO.txt +lib/qt4/demos/spectrum/app/ +lib/qt4/demos/spectrum/app/app.pro +lib/qt4/demos/spectrum/app/engine.cpp +lib/qt4/demos/spectrum/app/engine.h +lib/qt4/demos/spectrum/app/frequencyspectrum.cpp +lib/qt4/demos/spectrum/app/frequencyspectrum.h +lib/qt4/demos/spectrum/app/images/ +lib/qt4/demos/spectrum/app/images/record.png +lib/qt4/demos/spectrum/app/images/settings.png +lib/qt4/demos/spectrum/app/levelmeter.cpp +lib/qt4/demos/spectrum/app/levelmeter.h +lib/qt4/demos/spectrum/app/main.cpp +lib/qt4/demos/spectrum/app/mainwidget.cpp +lib/qt4/demos/spectrum/app/mainwidget.h +lib/qt4/demos/spectrum/app/progressbar.cpp +lib/qt4/demos/spectrum/app/progressbar.h +lib/qt4/demos/spectrum/app/settingsdialog.cpp +lib/qt4/demos/spectrum/app/settingsdialog.h +lib/qt4/demos/spectrum/app/spectrograph.cpp +lib/qt4/demos/spectrum/app/spectrograph.h +lib/qt4/demos/spectrum/app/spectrum.h +lib/qt4/demos/spectrum/app/spectrum.qrc +lib/qt4/demos/spectrum/app/spectrumanalyser.cpp +lib/qt4/demos/spectrum/app/spectrumanalyser.h +lib/qt4/demos/spectrum/app/tonegenerator.cpp +lib/qt4/demos/spectrum/app/tonegenerator.h +lib/qt4/demos/spectrum/app/tonegeneratordialog.cpp +lib/qt4/demos/spectrum/app/tonegeneratordialog.h +lib/qt4/demos/spectrum/app/utils.cpp +lib/qt4/demos/spectrum/app/utils.h +lib/qt4/demos/spectrum/app/waveform.cpp +lib/qt4/demos/spectrum/app/waveform.h +lib/qt4/demos/spectrum/app/wavfile.cpp +lib/qt4/demos/spectrum/app/wavfile.h +lib/qt4/demos/spectrum/spectrum.pri +lib/qt4/demos/spectrum/spectrum.pro lib/qt4/demos/spreadsheet/ lib/qt4/demos/spreadsheet/images/ lib/qt4/demos/spreadsheet/images/interview.png diff --git a/x11/qt4/pkg/PLIST-html b/x11/qt4/pkg/PLIST-html index fb5729a1aa6..7170d768751 100644 --- a/x11/qt4/pkg/PLIST-html +++ b/x11/qt4/pkg/PLIST-html @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-html,v 1.22 2010/04/19 09:36:30 espie Exp $ +@comment $OpenBSD: PLIST-html,v 1.23 2010/06/21 16:40:52 espie Exp $ share/doc/qt4/html/ share/doc/qt4/html/3rdparty.html share/doc/qt4/html/abstractwidgets.html @@ -4667,6 +4667,7 @@ share/doc/qt4/html/qpolygon.html share/doc/qt4/html/qpolygonf-members.html share/doc/qt4/html/qpolygonf.html share/doc/qt4/html/qprintdialog-members.html +share/doc/qt4/html/qprintdialog-qt3.html share/doc/qt4/html/qprintdialog.html share/doc/qt4/html/qprintengine-members.html share/doc/qt4/html/qprintengine.html @@ -4752,6 +4753,8 @@ share/doc/qt4/html/qs60maindocument-members.html share/doc/qt4/html/qs60maindocument.html share/doc/qt4/html/qs60style-members.html share/doc/qt4/html/qs60style.html +share/doc/qt4/html/qscopedarraypointer-members.html +share/doc/qt4/html/qscopedarraypointer.html share/doc/qt4/html/qscopedpointer-members.html share/doc/qt4/html/qscopedpointer.html share/doc/qt4/html/qscreen-members.html diff --git a/x11/qt4/pkg/PLIST-main b/x11/qt4/pkg/PLIST-main index 615168bba20..71b66a38379 100644 --- a/x11/qt4/pkg/PLIST-main +++ b/x11/qt4/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.25 2010/05/25 08:01:59 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.26 2010/06/21 16:40:52 espie Exp $ @pkgpath x11/qt4 @pkgpath x11/qt4,-phonon %%SHARED%% @@ -2412,6 +2412,7 @@ include/X11/qt4/QtMultimedia/QAbstractAudioInput include/X11/qt4/QtMultimedia/QAbstractAudioOutput include/X11/qt4/QtMultimedia/QAbstractVideoBuffer include/X11/qt4/QtMultimedia/QAbstractVideoSurface +include/X11/qt4/QtMultimedia/QAudio include/X11/qt4/QtMultimedia/QAudioDeviceInfo include/X11/qt4/QtMultimedia/QAudioEngineFactoryInterface include/X11/qt4/QtMultimedia/QAudioEnginePlugin @@ -2997,6 +2998,7 @@ lib/qt4/mkspecs/features/static.prf lib/qt4/mkspecs/features/static_and_shared.prf lib/qt4/mkspecs/features/staticlib.prf lib/qt4/mkspecs/features/symbian/ +lib/qt4/mkspecs/features/symbian/add_mmp_rules.prf lib/qt4/mkspecs/features/symbian/application_icon.prf lib/qt4/mkspecs/features/symbian/armcc_warnings.prf lib/qt4/mkspecs/features/symbian/data_caging_paths.prf @@ -3283,6 +3285,7 @@ lib/qt4/mkspecs/solaris-g++/qmake.conf lib/qt4/mkspecs/solaris-g++/qplatformdefs.h lib/qt4/mkspecs/symbian-abld/ lib/qt4/mkspecs/symbian-abld/qmake.conf +lib/qt4/mkspecs/symbian-abld/qplatformdefs.h lib/qt4/mkspecs/symbian-sbsv2/ lib/qt4/mkspecs/symbian-sbsv2/flm/ lib/qt4/mkspecs/symbian-sbsv2/flm/qt/ @@ -3292,6 +3295,7 @@ lib/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm lib/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm lib/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml lib/qt4/mkspecs/symbian-sbsv2/qmake.conf +lib/qt4/mkspecs/symbian-sbsv2/qplatformdefs.h lib/qt4/mkspecs/tru64-cxx/ lib/qt4/mkspecs/tru64-cxx/qmake.conf lib/qt4/mkspecs/tru64-cxx/qplatformdefs.h @@ -3495,5 +3499,71 @@ lib/qt4/plugins/script/ lib/qt4/plugins/sqldrivers/ lib/qt4/q3porting.xml lib/qt4/translations/ +lib/qt4/translations/assistant_adp_de.qm +lib/qt4/translations/assistant_adp_ja.qm +lib/qt4/translations/assistant_adp_pl.qm +lib/qt4/translations/assistant_adp_ru.qm +lib/qt4/translations/assistant_adp_zh_CN.qm +lib/qt4/translations/assistant_adp_zh_TW.qm +lib/qt4/translations/assistant_cs.qm +lib/qt4/translations/assistant_da.qm +lib/qt4/translations/assistant_de.qm +lib/qt4/translations/assistant_fr.qm +lib/qt4/translations/assistant_ja.qm +lib/qt4/translations/assistant_pl.qm +lib/qt4/translations/assistant_ru.qm +lib/qt4/translations/assistant_zh_CN.qm +lib/qt4/translations/assistant_zh_TW.qm +lib/qt4/translations/designer_cs.qm +lib/qt4/translations/designer_de.qm +lib/qt4/translations/designer_fr.qm +lib/qt4/translations/designer_ja.qm +lib/qt4/translations/designer_pl.qm +lib/qt4/translations/designer_ru.qm +lib/qt4/translations/designer_sl.qm +lib/qt4/translations/designer_zh_CN.qm +lib/qt4/translations/designer_zh_TW.qm +lib/qt4/translations/linguist_cs.qm +lib/qt4/translations/linguist_de.qm +lib/qt4/translations/linguist_fr.qm +lib/qt4/translations/linguist_ja.qm +lib/qt4/translations/linguist_pl.qm +lib/qt4/translations/linguist_ru.qm +lib/qt4/translations/linguist_zh_CN.qm +lib/qt4/translations/linguist_zh_TW.qm +lib/qt4/translations/qt_ar.qm +lib/qt4/translations/qt_cs.qm +lib/qt4/translations/qt_da.qm +lib/qt4/translations/qt_de.qm +lib/qt4/translations/qt_es.qm +lib/qt4/translations/qt_fr.qm +lib/qt4/translations/qt_he.qm +lib/qt4/translations/qt_help_cs.qm +lib/qt4/translations/qt_help_da.qm +lib/qt4/translations/qt_help_de.qm +lib/qt4/translations/qt_help_fr.qm +lib/qt4/translations/qt_help_ja.qm +lib/qt4/translations/qt_help_pl.qm +lib/qt4/translations/qt_help_ru.qm +lib/qt4/translations/qt_help_zh_CN.qm +lib/qt4/translations/qt_help_zh_TW.qm +lib/qt4/translations/qt_ja_JP.qm +lib/qt4/translations/qt_pl.qm +lib/qt4/translations/qt_pt.qm +lib/qt4/translations/qt_ru.qm +lib/qt4/translations/qt_sk.qm +lib/qt4/translations/qt_sl.qm +lib/qt4/translations/qt_sv.qm +lib/qt4/translations/qt_uk.qm +lib/qt4/translations/qt_zh_CN.qm +lib/qt4/translations/qt_zh_TW.qm +lib/qt4/translations/qtconfig_pl.qm +lib/qt4/translations/qtconfig_ru.qm +lib/qt4/translations/qtconfig_zh_CN.qm +lib/qt4/translations/qtconfig_zh_TW.qm +lib/qt4/translations/qvfb_pl.qm +lib/qt4/translations/qvfb_ru.qm +lib/qt4/translations/qvfb_zh_CN.qm +lib/qt4/translations/qvfb_zh_TW.qm share/doc/qt4/ share/doc/qt4/README