69914 2011-10-12 01:42:02 -0700 [Qt] QtWebKit build error for Mac 32bit 2011-10-13 12:46:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 1 eike.ziller zeno hausmann menard webkit.review.bot zeno oldest_to_newest 482300 0 eike.ziller 2011-10-12 01:42:02 -0700 QtWebKit as it is in Qt 4.8, 18943d3203a794f3f3173be6ec51c15db83db9e1, configured with -nokia-developer -no-pch -arch x86 fails with distcc[73474] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.mm on localhost failed make[3]: *** [.obj/debug-shared/WebCoreSystemInterface.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /System/Library/Frameworks/Foundation.framework/Headers/NSKeyedArchiver.h:8, from /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:34, from /System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h:12, from ../../../../../include/QtGui/../../../4.8/src/gui/kernel/qmacdefines_mac.h:113, from ../../../../../include/QtGui/qmacdefines_mac.h:1, from ../../../../../include/QtGui/../../../4.8/src/gui/kernel/qwindowdefs.h:99, from ../../../../../include/QtGui/qwindowdefs.h:1, from ../../../../../include/QtGui/../../../4.8/src/gui/painting/qregion.h:47, from ../../../../../include/QtGui/qregion.h:1, from ../../../../../include/QtGui/../../../4.8/src/gui/painting/qmatrix.h:46, from ../../../../../include/QtGui/qmatrix.h:1, from ../../../../../lib/QtGui.framework/Versions/4/Headers/qtransform.h:44, from ../../../../../lib/QtGui.framework/Versions/4/Headers/QTransform:1, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h:44, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/GraphicsLayer.h:38, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h:45, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayerPrivate.h:31, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h:31, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:30: /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:58: error: conflicting declaration ‘typedef struct _NSSize NSSize’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/FloatSize.h:40: error: ‘NSSize’ has a previous declaration as ‘typedef struct CGSize NSSize’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:66: error: conflicting declaration ‘typedef struct _NSRect NSRect’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/IntRect.h:38: error: ‘NSRect’ has a previous declaration as ‘typedef struct CGRect NSRect’ distcc[73468] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm on localhost failed make[3]: *** [.obj/debug-shared/PluginViewMac.o] Error 1 In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:49: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h:32: error: conflicting declaration ‘typedef struct CGPoint NSPoint’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:50: error: ‘NSPoint’ has a previous declaration as ‘typedef struct _NSPoint NSPoint’ In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm:32: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h:32: error: conflicting declaration ‘typedef struct CGPoint NSPoint’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:50: error: ‘NSPoint’ has a previous declaration as ‘typedef struct _NSPoint NSPoint’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h:33: error: conflicting declaration ‘typedef struct CGRect NSRect’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:66: error: ‘NSRect’ has a previous declaration as ‘typedef struct _NSRect NSRect’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm: In static member function ‘static void WebCore::MediaPlayerPrivateQTKit::getSitesInMediaCache(WTF::Vector<WTF::String, 0ul>&)’: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:1514: warning: Mac OS X version 10.5 or later is needed for use of foreach-collection-statement distcc[73560] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm on localhost failed make[3]: *** [.obj/release-shared/MediaPlayerPrivateQTKit.o] Error 1 make[2]: *** [release-all] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/dom/ViewportArguments.h:30, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/dom/Document.h:42, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/dom/Element.h:28, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/dom/StyledElement.h:28, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/HTMLElement.h:26, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/HTMLMediaElement.h:31, from /Users/ziller/git/4.8/src/3rdparty/webkit/include/WebCore/HTMLMediaElement.h:1, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm:33: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/IntSize.h:35: error: conflicting declaration ‘typedef struct CGSize NSSize’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:58: error: ‘NSSize’ has a previous declaration as ‘typedef struct _NSSize NSSize’ In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h:36, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/HTMLMediaElement.h:34, from /Users/ziller/git/4.8/src/3rdparty/webkit/include/WebCore/HTMLMediaElement.h:1, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm:33: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/IntRect.h:38: error: conflicting declaration ‘typedef struct CGRect NSRect’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:66: error: ‘NSRect’ has a previous declaration as ‘typedef struct _NSRect NSRect’ In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/FloatPoint.h:30, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/GraphicsLayer.h:33, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h:45, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/HTMLMediaElement.h:34, from /Users/ziller/git/4.8/src/3rdparty/webkit/include/WebCore/HTMLMediaElement.h:1, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm:33: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/FloatSize.h:40: error: conflicting declaration ‘typedef struct CGSize NSSize’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:58: error: ‘NSSize’ has a previous declaration as ‘typedef struct _NSSize NSSize’ distcc[73601] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm on localhost failed make[3]: *** [.obj/debug-shared/WebVideoFullscreenHUDWindowController.o] Error 1 In file included from /System/Library/Frameworks/Foundation.framework/Headers/NSKeyedArchiver.h:8, from /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:34, from /System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h:12, from ../../../../../include/QtGui/../../../4.8/src/gui/kernel/qmacdefines_mac.h:113, from ../../../../../include/QtGui/qmacdefines_mac.h:1, from ../../../../../include/QtGui/../../../4.8/src/gui/kernel/qwindowdefs.h:99, from ../../../../../include/QtGui/qwindowdefs.h:1, from ../../../../../include/QtGui/../../../4.8/src/gui/painting/qregion.h:47, from ../../../../../include/QtGui/qregion.h:1, from ../../../../../include/QtGui/../../../4.8/src/gui/painting/qmatrix.h:46, from ../../../../../include/QtGui/qmatrix.h:1, from ../../../../../lib/QtGui.framework/Versions/4/Headers/qtransform.h:44, from ../../../../../lib/QtGui.framework/Versions/4/Headers/QTransform:1, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h:44, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/GraphicsLayer.h:38, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayer.h:45, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/MediaPlayerPrivate.h:31, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h:31, from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:30: /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:58: error: conflicting declaration ‘typedef struct _NSSize NSSize’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/FloatSize.h:40: error: ‘NSSize’ has a previous declaration as ‘typedef struct CGSize NSSize’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:66: error: conflicting declaration ‘typedef struct _NSRect NSRect’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/IntRect.h:38: error: ‘NSRect’ has a previous declaration as ‘typedef struct CGRect NSRect’ In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:49: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h:32: error: conflicting declaration ‘typedef struct CGPoint NSPoint’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:50: error: ‘NSPoint’ has a previous declaration as ‘typedef struct _NSPoint NSPoint’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm: In static member function ‘static void WebCore::MediaPlayerPrivateQTKit::getSitesInMediaCache(WTF::Vector<WTF::String, 0ul>&)’: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:1514: warning: Mac OS X version 10.5 or later is needed for use of foreach-collection-statement distcc[73517] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm on localhost failed make[3]: *** [.obj/debug-shared/MediaPlayerPrivateQTKit.o] Error 1 distcc[73613] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm on lasse-mac.local. failed distcc[73613] (dcc_build_somewhere) Warning: remote compilation of '/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm' failed, retrying locally distcc[73613] Warning: failed to distribute /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm to lasse-mac.local., running locally instead In file included from /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm:31: /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h:62: error: conflicting declaration ‘typedef struct CGPoint NSPoint’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:50: error: ‘NSPoint’ has a previous declaration as ‘typedef struct _NSPoint NSPoint’ /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h:63: error: conflicting declaration ‘typedef struct CGRect NSRect’ /System/Library/Frameworks/Foundation.framework/Headers/NSGeometry.h:66: error: ‘NSRect’ has a previous declaration as ‘typedef struct _NSRect NSRect’ distcc[73613] ERROR: compile /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm on localhost failed make[3]: *** [.obj/debug-shared/WebWindowAnimation.o] Error 1 482301 1 hausmann 2011-10-12 01:43:19 -0700 Alexis, does this ring a bell? :) 482324 2 hausmann 2011-10-12 03:07:55 -0700 This bug originates from https://bugreports.qt.nokia.com/browse/QTBUG-21984 (it's a Qt 4.8 release blocking bug at the moment) 483099 3 menard 2011-10-13 03:54:53 -0700 (In reply to comment #1) > Alexis, does this ring a bell? :) I already had similar errors BUT : /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:1514: warning: Mac OS X version 10.5 or later is needed for use of foreach-collection-statement is really weird to me. Which version of Mac OS the thing is running? We don't support less than 10.5. 483110 4 zeno 2011-10-13 04:17:24 -0700 According to Eike this is a Mac OS 10.6.x. But he is building 32bit version. And 32bit is still supported in Snow Leopard. I will try to reproduce this issue. 483111 5 eike.ziller 2011-10-13 04:19:04 -0700 I'm running Mac OS X 10.6.8 64bit, Xcode 4.0.2 483123 6 eike.ziller 2011-10-13 04:45:50 -0700 The build command: gcc -c -pipe -g -arch i386 -arch i386 -Xarch_i386 -mmacosx-version-min=10.4 -DNDEBUG -DBUILDING_QT__=1 -DQT_ASCII_CAST_WARNINGS -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_DATABASE=1 -DENABLE_EVENTSOURCE=1 -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DOM_STORAGE=1 -DENABLE_ICONDATABASE=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_QUOTA=0 -DENABLE_SQLITE=1 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_FILTERS=1 -DENABLE_XPATH=1 -DENABLE_WCSS=0 -DENABLE_SHARED_WORKERS=1 -DENABLE_WORKERS=1 -DENABLE_XHTMLMP=0 -DENABLE_DETAILS=1 -DENABLE_METER_TAG=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_BLOB=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_INPUT_SPEECH=0 -DENABLE_INSPECTOR=1 -DENABLE_3D_RENDERING=1 -DENABLE_WEB_AUDIO=0 -DENABLE_WEBGL=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_ANIMATION_API=0 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_ANIMATION=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_USE=1 -DENABLE_DATALIST=1 -DENABLE_TILED_BACKING_STORE=1 -DENABLE_NETSCAPE_PLUGIN_API=1 -DENABLE_WEB_SOCKETS=1 -DWTF_USE_QT_BEARER=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_VIDEO=1 -DWTF_USE_QTKIT=1 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_JavaScriptCore -DBUILDING_WTF -DBUILDING_WEBKIT -DQT_MAKEDLL -DNSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_SHARED -I/Users/ziller/git/4.8/mkspecs/macx-g++ -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore -I../../../../../lib/QtCore.framework/Versions/4/Headers -I../../../../../include/QtCore -I../../../../../lib/QtNetwork.framework/Versions/4/Headers -I../../../../../include/QtNetwork -I../../../../../lib/QtGui.framework/Versions/4/Headers -I../../../../../include/QtGui -I../../../../../include -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/ThirdParty -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/assembler -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/bytecode -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/heap -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/dfg -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/debugger -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/interpreter -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/jit -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/parser -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/profiler -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/runtime -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/wtf -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/yarr -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/API -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/ForwardingHeaders -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/JavaScriptCore/generated -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bridge/qt -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/page/qt -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/qt -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/network/qt -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/qt -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebKit/qt/Api -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/accessibility -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bindings -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bindings/generic -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bridge -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/css -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/dom -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/dom/default -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/editing -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/fileapi -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/history -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/canvas -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/parser -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/html/shadow -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/inspector -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/loader -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/loader/appcache -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/loader/archive -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/loader/cache -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/loader/icon -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/mathml -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/notifications -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/page -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/page/animation -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/animation -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/audio -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/filters -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/texmap -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/image-decoders -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/leveldb -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mock -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/network -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/sql -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/text -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/text/transcoder -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/plugins -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/rendering -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/rendering/mathml -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/rendering/style -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/rendering/svg -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/storage -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/svg -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/svg/animation -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/svg/graphics -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/svg/graphics/filters -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/svg/properties -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/testing -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/webaudio -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/websockets -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/wml -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/workers -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/xml -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bridge/jsc -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bindings/js -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bindings/js/specialization -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/bridge/c -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/testing/js -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/generated -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source -I/Users/ziller/git/4.8/src/3rdparty/webkit/include -I../include/QtWebKit -I../include -I/Users/ziller/git/4.8/src/3rdparty/sqlite -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/mac -I/Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac -I/Users/ziller/git/4.8/src/3rdparty/webkit/WebKitLibraries -I.moc/debug-static -I. -F/Users/ziller/git/qt-4.8-32/lib /Users/ziller/git/4.8/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginViewMac.mm -o .obj/debug-shared/PluginViewMac.o 483158 7 110837 zeno 2011-10-13 06:42:09 -0700 Created attachment 110837 patch for feedback. this looks to me like it solves the problem. I wonder if this creates any binary compatibility issues we have to avoid? For example due to: /System/Library/Frameworks/Foundation.framework/Headers/NSObjCRuntime.h:285 #if __LP64__ || (TARGET_OS_EMBEDDED && !TARGET_OS_IPHONE) || TARGET_OS_WIN32 || NS_BUILD_32_LIKE_64 typedef long NSInteger; typedef unsigned long NSUInteger; #else ... Any comments? 483165 8 110838 zeno 2011-10-13 07:03:25 -0700 Created attachment 110838 patch for feedback. 483169 9 110837 menard 2011-10-13 07:08:45 -0700 Comment on attachment 110837 patch for feedback. View in context: https://bugs.webkit.org/attachment.cgi?id=110837&action=review > Source/WebCore/WebCore.pro:3115 > + DEFINES+=NS_BUILD_32_LIKE_64 I had the same patch but I wrapped the definition in a contains(CONFIG, "x86"). I was about to upload when I saw yours. 483171 10 menard 2011-10-13 07:09:30 -0700 (In reply to comment #7) > Created an attachment (id=110837) [details] > patch for feedback. > > this looks to me like it solves the problem. > I wonder if this creates any binary compatibility issues we have to avoid? > For example due to: > > /System/Library/Frameworks/Foundation.framework/Headers/NSObjCRuntime.h:285 > #if __LP64__ || (TARGET_OS_EMBEDDED && !TARGET_OS_IPHONE) || TARGET_OS_WIN32 || NS_BUILD_32_LIKE_64 > typedef long NSInteger; > typedef unsigned long NSUInteger; > #else > ... > > Any comments? We don't have any public API which rely on that so I don't think it is a problem. 483187 11 zeno 2011-10-13 07:52:11 -0700 hm... that probably makes sense... i'll wrap it and then upload it again. 483198 12 110847 zeno 2011-10-13 08:23:44 -0700 Created attachment 110847 patch for review. 483199 13 110848 zeno 2011-10-13 08:24:51 -0700 Created attachment 110848 patch for review. 483234 14 110848 hausmann 2011-10-13 09:18:45 -0700 Comment on attachment 110848 patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=110848&action=review > Source/WebCore/WebCore.pro:3115 > + contains(CONFIG, "x86") { Shouldn't this be QT_ARCH instead of CONFIG? Or does that not work when you do one of those multiple-archs-in-one-shot builds on Mac OS X? 483251 15 zeno 2011-10-13 09:55:27 -0700 i just tested that. But QT_ARCH in that case only gives you "macosx". So this seems not to be very helpful. (In reply to comment #14) > (From update of attachment 110848 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=110848&action=review > > > Source/WebCore/WebCore.pro:3115 > > + contains(CONFIG, "x86") { > > Shouldn't this be QT_ARCH instead of CONFIG? Or does that not work when you do one of those multiple-archs-in-one-shot builds on Mac OS X? 483289 16 menard 2011-10-13 10:37:18 -0700 (In reply to comment #15) > i just tested that. But QT_ARCH in that case only gives you "macosx". > So this seems not to be very helpful. > > (In reply to comment #14) > > (From update of attachment 110848 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=110848&action=review > > > > > Source/WebCore/WebCore.pro:3115 > > > + contains(CONFIG, "x86") { > > > > Shouldn't this be QT_ARCH instead of CONFIG? Or does that not work when you do one of those multiple-archs-in-one-shot builds on Mac OS X? And ARCH is empty. I couldn't come up with better than CONFIG. 483294 17 hausmann 2011-10-13 10:44:36 -0700 (In reply to comment #16) > (In reply to comment #15) > > i just tested that. But QT_ARCH in that case only gives you "macosx". > > So this seems not to be very helpful. Ahh, right, that's how it was done. > > (In reply to comment #14) > > > (From update of attachment 110848 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=110848&action=review > > > > > > > Source/WebCore/WebCore.pro:3115 > > > > + contains(CONFIG, "x86") { > > > > > > Shouldn't this be QT_ARCH instead of CONFIG? Or does that not work when you do one of those multiple-archs-in-one-shot builds on Mac OS X? > > And ARCH is empty. > > I couldn't come up with better than CONFIG. Ok, CONFIG it is then :) 483299 18 110848 menard 2011-10-13 10:48:36 -0700 Comment on attachment 110848 patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=110848&action=review > Source/WebCore/ChangeLog:3 > + QtWebKit build error for Mac 32bit I would add the usual [Qt] 483334 19 110882 zeno 2011-10-13 11:20:02 -0700 Created attachment 110882 patch for landing. 483405 20 110882 webkit.review.bot 2011-10-13 12:46:33 -0700 Comment on attachment 110882 patch for landing. Clearing flags on attachment: 110882 Committed r97387: <http://trac.webkit.org/changeset/97387> 483406 21 webkit.review.bot 2011-10-13 12:46:40 -0700 All reviewed patches have been landed. Closing bug. 110837 2011-10-13 06:42:09 -0700 2011-10-13 07:08:45 -0700 patch for feedback. 69914_20111013-152509.patch text/plain 1508 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2I4OTY4Li4zNGQ1MzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMTMgIFplbm8gQWxiaXNzZXIgIDx6ZW5vLmFsYmlzc2VyQG5va2lhLmNvbT4K KworICAgICAgICBRdFdlYktpdCBidWlsZCBlcnJvciBmb3IgTWFjIDMyYml0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTkxNAorCisgICAgICAgIElu IFdlYkNvcmUucHJvIHdlIGRlZmluZSBOU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRS WV9UWVBFUworICAgICAgICB3aGVuIGNvbXBpbGluZyB3aXRoIEVOQUJMRV9WSURFTyBhbmQgd2l0 aCBXVEZfVVNFX1FUS0lULgorICAgICAgICBCdXQgdGhpcyBpcyBtZWFudCB0byBiZSBkZWZpbmVk IGluIE5TR2VvbWV0cnkuaCB1bmRlciBjZXJ0YWluIHByZWNvbmRpdGlvbnMuCisgICAgICAgIFdp dGhvdXQgc2V0dGluZyBOU19CVUlMRF8zMl9MSUtFXzY0IG5vbmUgb2YgdGhlc2UgcHJlY29uZGl0 aW9ucyBpcworICAgICAgICBtZXQgYW5kIHRoZXJlZm9yZSBOU0dlb21ldHJ5Lmggd2lsbCBjcmVh dGUgc2V2ZXJhbCBjb25mbGljdGluZyB0eXBlIGRlZmluaXRpb25zLgorCisgICAgICAgIFdpdGgg dGhpcyBwYXRjaCB3ZSBjcmVhdGUgY29uc2lzdGVudCBkZWZpbml0aW9ucyBhZ2Fpbi4KKyAgICAg ICAgRHVlIHRvIHRoZSBvcmRlciBvZiBpbmNsdWRlIGZpbGVzIHdlIGNhbm5vdCByZW1vdmUKKyAg ICAgICAgTlNHRU9NRVRSWV9UWVBFU19TQU1FX0FTX0NHR0VPTUVUUllfVFlQRVMgZnJvbSBXZWJD b3JlLnByby4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFdlYkNvcmUucHJvOgorCiAyMDExLTEwLTExICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUucHJvIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8KaW5kZXggZmNkMGEz YS4uZGIyNDY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8KKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8KQEAgLTMxMTIsNiArMzExMiw3IEBAIGNvbnRhaW5z KERFRklORVMsIEVOQUJMRV9WSURFTz0xKSB7CiAgICAgICAgICAgICBwbGF0Zm9ybS9tYWMvV2Vi V2luZG93QW5pbWF0aW9uLm1tCiAKICAgICAgICAgREVGSU5FUys9TlNHRU9NRVRSWV9UWVBFU19T QU1FX0FTX0NHR0VPTUVUUllfVFlQRVMKKyAgICAgICAgREVGSU5FUys9TlNfQlVJTERfMzJfTElL RV82NAogCiAgICAgfSBlbHNlOiBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0dTVFJFQU1FUj0x KSB7CiAgICAgICAgIEhFQURFUlMgKz0gXAo= 110838 2011-10-13 07:03:25 -0700 2011-10-13 08:23:44 -0700 patch for feedback. 69914_20111013-155446.patch text/plain 2052 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2I4OTY4Li45NjA0Yzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMTMgIFplbm8gQWxiaXNzZXIgIDx6ZW5vLmFsYmlzc2VyQG5va2lhLmNvbT4K KworICAgICAgICBRdFdlYktpdCBidWlsZCBlcnJvciBmb3IgTWFjIDMyYml0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTkxNAorCisgICAgICAgIElu IFdlYkNvcmUucHJvIGFuZCBRdFdlYktpdC5wcm8gd2UgZGVmaW5lIE5TR0VPTUVUUllfVFlQRVNf U0FNRV9BU19DR0dFT01FVFJZX1RZUEVTCisgICAgICAgIHdoZW4gY29tcGlsaW5nIHdpdGggRU5B QkxFX1ZJREVPIGFuZCB3aXRoIFdURl9VU0VfUVRLSVQuCisgICAgICAgIEJ1dCB0aGlzIGlzIG1l YW50IHRvIGJlIGRlZmluZWQgaW4gTlNHZW9tZXRyeS5oIHVuZGVyIGNlcnRhaW4gcHJlY29uZGl0 aW9ucy4KKyAgICAgICAgV2l0aG91dCBzZXR0aW5nIE5TX0JVSUxEXzMyX0xJS0VfNjQgbm9uZSBv ZiB0aGVzZSBwcmVjb25kaXRpb25zIGlzCisgICAgICAgIG1ldCBhbmQgdGhlcmVmb3JlIE5TR2Vv bWV0cnkuaCB3aWxsIGNyZWF0ZSBzZXZlcmFsIGNvbmZsaWN0aW5nIHR5cGUgZGVmaW5pdGlvbnMu CisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlIGNyZWF0ZSBjb25zaXN0ZW50IGRlZmluaXRp b25zIGFnYWluLgorICAgICAgICBEdWUgdG8gdGhlIG9yZGVyIG9mIGluY2x1ZGUgZmlsZXMgd2Ug Y2Fubm90IHJlbW92ZQorICAgICAgICBOU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRS WV9UWVBFUyBmcm9tIFdlYkNvcmUucHJvLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIwMTEtMTAtMTEgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnBybwppbmRleCBmY2QwYTNhLi5kYjI0NjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnBybworKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBybwpAQCAtMzExMiw2ICsz MTEyLDcgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1ZJREVPPTEpIHsKICAgICAgICAgICAg IHBsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0KIAogICAgICAgICBERUZJTkVTKz1O U0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRSWV9UWVBFUworICAgICAgICBERUZJTkVT Kz1OU19CVUlMRF8zMl9MSUtFXzY0CiAKICAgICB9IGVsc2U6IGNvbnRhaW5zKERFRklORVMsIFdU Rl9VU0VfR1NUUkVBTUVSPTEpIHsKICAgICAgICAgSEVBREVSUyArPSBcCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQu cHJvCmluZGV4IDNjNmU3NzQuLjVhMTg3MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQv UXRXZWJLaXQucHJvCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCkBAIC0yMzcs NiArMjM3LDcgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1ZJREVPPTEpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgJCRTT1VSQ0VfRElSLy4uL1dlYktpdExpYnJhcmllcy8KIAogICAgICAg ICBERUZJTkVTKz1OU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRSWV9UWVBFUworICAg ICAgICBERUZJTkVTKz1OU19CVUlMRF8zMl9MSUtFXzY0CiAKICAgICAgICAgSEVBREVSUyArPSAk JFBXRC9XZWJDb3JlU3VwcG9ydC9XZWJTeXN0ZW1JbnRlcmZhY2UuaCBcCiAgICAgICAgICAgICAg ICAgICAgJCRQV0QvV2ViQ29yZVN1cHBvcnQvUVRLaXRGdWxsU2NyZWVuVmlkZW9IYW5kbGVyLmgK 110847 2011-10-13 08:23:44 -0700 2011-10-13 08:24:51 -0700 patch for review. 69914_20111013-155446.patch text/plain 2052 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2I4OTY4Li45NjA0Yzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMTMgIFplbm8gQWxiaXNzZXIgIDx6ZW5vLmFsYmlzc2VyQG5va2lhLmNvbT4K KworICAgICAgICBRdFdlYktpdCBidWlsZCBlcnJvciBmb3IgTWFjIDMyYml0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTkxNAorCisgICAgICAgIElu IFdlYkNvcmUucHJvIGFuZCBRdFdlYktpdC5wcm8gd2UgZGVmaW5lIE5TR0VPTUVUUllfVFlQRVNf U0FNRV9BU19DR0dFT01FVFJZX1RZUEVTCisgICAgICAgIHdoZW4gY29tcGlsaW5nIHdpdGggRU5B QkxFX1ZJREVPIGFuZCB3aXRoIFdURl9VU0VfUVRLSVQuCisgICAgICAgIEJ1dCB0aGlzIGlzIG1l YW50IHRvIGJlIGRlZmluZWQgaW4gTlNHZW9tZXRyeS5oIHVuZGVyIGNlcnRhaW4gcHJlY29uZGl0 aW9ucy4KKyAgICAgICAgV2l0aG91dCBzZXR0aW5nIE5TX0JVSUxEXzMyX0xJS0VfNjQgbm9uZSBv ZiB0aGVzZSBwcmVjb25kaXRpb25zIGlzCisgICAgICAgIG1ldCBhbmQgdGhlcmVmb3JlIE5TR2Vv bWV0cnkuaCB3aWxsIGNyZWF0ZSBzZXZlcmFsIGNvbmZsaWN0aW5nIHR5cGUgZGVmaW5pdGlvbnMu CisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlIGNyZWF0ZSBjb25zaXN0ZW50IGRlZmluaXRp b25zIGFnYWluLgorICAgICAgICBEdWUgdG8gdGhlIG9yZGVyIG9mIGluY2x1ZGUgZmlsZXMgd2Ug Y2Fubm90IHJlbW92ZQorICAgICAgICBOU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRS WV9UWVBFUyBmcm9tIFdlYkNvcmUucHJvLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIwMTEtMTAtMTEgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnBybwppbmRleCBmY2QwYTNhLi5kYjI0NjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnBybworKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBybwpAQCAtMzExMiw2ICsz MTEyLDcgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1ZJREVPPTEpIHsKICAgICAgICAgICAg IHBsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0KIAogICAgICAgICBERUZJTkVTKz1O U0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRSWV9UWVBFUworICAgICAgICBERUZJTkVT Kz1OU19CVUlMRF8zMl9MSUtFXzY0CiAKICAgICB9IGVsc2U6IGNvbnRhaW5zKERFRklORVMsIFdU Rl9VU0VfR1NUUkVBTUVSPTEpIHsKICAgICAgICAgSEVBREVSUyArPSBcCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQu cHJvCmluZGV4IDNjNmU3NzQuLjVhMTg3MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQv UXRXZWJLaXQucHJvCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvUXRXZWJLaXQucHJvCkBAIC0yMzcs NiArMjM3LDcgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1ZJREVPPTEpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgJCRTT1VSQ0VfRElSLy4uL1dlYktpdExpYnJhcmllcy8KIAogICAgICAg ICBERUZJTkVTKz1OU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRSWV9UWVBFUworICAg ICAgICBERUZJTkVTKz1OU19CVUlMRF8zMl9MSUtFXzY0CiAKICAgICAgICAgSEVBREVSUyArPSAk JFBXRC9XZWJDb3JlU3VwcG9ydC9XZWJTeXN0ZW1JbnRlcmZhY2UuaCBcCiAgICAgICAgICAgICAg ICAgICAgJCRQV0QvV2ViQ29yZVN1cHBvcnQvUVRLaXRGdWxsU2NyZWVuVmlkZW9IYW5kbGVyLmgK 110848 2011-10-13 08:24:51 -0700 2011-10-13 11:21:31 -0700 patch for review. 69914_20111013-172107.patch text/plain 2152 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2I4OTY4Li45NjA0Yzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMTMgIFplbm8gQWxiaXNzZXIgIDx6ZW5vLmFsYmlzc2VyQG5va2lhLmNvbT4K KworICAgICAgICBRdFdlYktpdCBidWlsZCBlcnJvciBmb3IgTWFjIDMyYml0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTkxNAorCisgICAgICAgIElu IFdlYkNvcmUucHJvIGFuZCBRdFdlYktpdC5wcm8gd2UgZGVmaW5lIE5TR0VPTUVUUllfVFlQRVNf U0FNRV9BU19DR0dFT01FVFJZX1RZUEVTCisgICAgICAgIHdoZW4gY29tcGlsaW5nIHdpdGggRU5B QkxFX1ZJREVPIGFuZCB3aXRoIFdURl9VU0VfUVRLSVQuCisgICAgICAgIEJ1dCB0aGlzIGlzIG1l YW50IHRvIGJlIGRlZmluZWQgaW4gTlNHZW9tZXRyeS5oIHVuZGVyIGNlcnRhaW4gcHJlY29uZGl0 aW9ucy4KKyAgICAgICAgV2l0aG91dCBzZXR0aW5nIE5TX0JVSUxEXzMyX0xJS0VfNjQgbm9uZSBv ZiB0aGVzZSBwcmVjb25kaXRpb25zIGlzCisgICAgICAgIG1ldCBhbmQgdGhlcmVmb3JlIE5TR2Vv bWV0cnkuaCB3aWxsIGNyZWF0ZSBzZXZlcmFsIGNvbmZsaWN0aW5nIHR5cGUgZGVmaW5pdGlvbnMu CisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlIGNyZWF0ZSBjb25zaXN0ZW50IGRlZmluaXRp b25zIGFnYWluLgorICAgICAgICBEdWUgdG8gdGhlIG9yZGVyIG9mIGluY2x1ZGUgZmlsZXMgd2Ug Y2Fubm90IHJlbW92ZQorICAgICAgICBOU0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRS WV9UWVBFUyBmcm9tIFdlYkNvcmUucHJvLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5wcm86CisKIDIwMTEtMTAtMTEgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnBybwppbmRleCBmY2QwYTNhLi43ZmMyOGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnBybworKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBybwpAQCAtMzExMiw2ICsz MTEyLDkgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1ZJREVPPTEpIHsKICAgICAgICAgICAg IHBsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0KIAogICAgICAgICBERUZJTkVTKz1O U0dFT01FVFJZX1RZUEVTX1NBTUVfQVNfQ0dHRU9NRVRSWV9UWVBFUworICAgICAgICBjb250YWlu cyhDT05GSUcsICJ4ODYiKSB7CisgICAgICAgICAgICBERUZJTkVTKz1OU19CVUlMRF8zMl9MSUtF XzY0CisgICAgICAgIH0KIAogICAgIH0gZWxzZTogY29udGFpbnMoREVGSU5FUywgV1RGX1VTRV9H U1RSRUFNRVI9MSkgewogICAgICAgICBIRUFERVJTICs9IFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvcXQvUXRXZWJLaXQucHJvIGIvU291cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8KaW5k ZXggM2M2ZTc3NC4uODUwOTcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9RdFdlYktp dC5wcm8KKysrIGIvU291cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8KQEAgLTIzNyw2ICsyMzcs OSBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfVklERU89MSkgewogICAgICAgICAgICAgICAg ICAgICAgICAkJFNPVVJDRV9ESVIvLi4vV2ViS2l0TGlicmFyaWVzLwogCiAgICAgICAgIERFRklO RVMrPU5TR0VPTUVUUllfVFlQRVNfU0FNRV9BU19DR0dFT01FVFJZX1RZUEVTCisgICAgICAgIGNv bnRhaW5zKENPTkZJRywgIng4NiIpIHsKKyAgICAgICAgICAgIERFRklORVMrPU5TX0JVSUxEXzMy X0xJS0VfNjQKKyAgICAgICAgfQogCiAgICAgICAgIEhFQURFUlMgKz0gJCRQV0QvV2ViQ29yZVN1 cHBvcnQvV2ViU3lzdGVtSW50ZXJmYWNlLmggXAogICAgICAgICAgICAgICAgICAgICQkUFdEL1dl YkNvcmVTdXBwb3J0L1FUS2l0RnVsbFNjcmVlblZpZGVvSGFuZGxlci5oCg== 110882 2011-10-13 11:20:02 -0700 2011-10-13 12:46:33 -0700 patch for landing. 69914_20111013-201905.patch text/plain 2157 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2I4OTY4Li4zOGZhNGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMTMgIFplbm8gQWxiaXNzZXIgIDx6ZW5vLmFsYmlzc2VyQG5va2lhLmNvbT4K KworICAgICAgICBbUXRdIFF0V2ViS2l0IGJ1aWxkIGVycm9yIGZvciBNYWMgMzJiaXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTE0CisKKyAgICAg ICAgSW4gV2ViQ29yZS5wcm8gYW5kIFF0V2ViS2l0LnBybyB3ZSBkZWZpbmUgTlNHRU9NRVRSWV9U WVBFU19TQU1FX0FTX0NHR0VPTUVUUllfVFlQRVMKKyAgICAgICAgd2hlbiBjb21waWxpbmcgd2l0 aCBFTkFCTEVfVklERU8gYW5kIHdpdGggV1RGX1VTRV9RVEtJVC4KKyAgICAgICAgQnV0IHRoaXMg aXMgbWVhbnQgdG8gYmUgZGVmaW5lZCBpbiBOU0dlb21ldHJ5LmggdW5kZXIgY2VydGFpbiBwcmVj b25kaXRpb25zLgorICAgICAgICBXaXRob3V0IHNldHRpbmcgTlNfQlVJTERfMzJfTElLRV82NCBu b25lIG9mIHRoZXNlIHByZWNvbmRpdGlvbnMgaXMKKyAgICAgICAgbWV0IGFuZCB0aGVyZWZvcmUg TlNHZW9tZXRyeS5oIHdpbGwgY3JlYXRlIHNldmVyYWwgY29uZmxpY3RpbmcgdHlwZSBkZWZpbml0 aW9ucy4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2ggd2UgY3JlYXRlIGNvbnNpc3RlbnQgZGVm aW5pdGlvbnMgYWdhaW4uCisgICAgICAgIER1ZSB0byB0aGUgb3JkZXIgb2YgaW5jbHVkZSBmaWxl cyB3ZSBjYW5ub3QgcmVtb3ZlCisgICAgICAgIE5TR0VPTUVUUllfVFlQRVNfU0FNRV9BU19DR0dF T01FVFJZX1RZUEVTIGZyb20gV2ViQ29yZS5wcm8uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoKKwogMjAxMS0xMC0xMSAgQWxl eGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBybyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUucHJvCmluZGV4IGZjZDBhM2EuLjdmYzI4ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUucHJvCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJvCkBAIC0zMTEy LDYgKzMxMTIsOSBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfVklERU89MSkgewogICAgICAg ICAgICAgcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQogCiAgICAgICAgIERFRklO RVMrPU5TR0VPTUVUUllfVFlQRVNfU0FNRV9BU19DR0dFT01FVFJZX1RZUEVTCisgICAgICAgIGNv bnRhaW5zKENPTkZJRywgIng4NiIpIHsKKyAgICAgICAgICAgIERFRklORVMrPU5TX0JVSUxEXzMy X0xJS0VfNjQKKyAgICAgICAgfQogCiAgICAgfSBlbHNlOiBjb250YWlucyhERUZJTkVTLCBXVEZf VVNFX0dTVFJFQU1FUj0xKSB7CiAgICAgICAgIEhFQURFUlMgKz0gXApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8gYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBy bwppbmRleCAzYzZlNzc0Li44NTA5NzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1F0 V2ViS2l0LnBybworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybwpAQCAtMjM3LDYg KzIzNyw5IEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9WSURFTz0xKSB7CiAgICAgICAgICAg ICAgICAgICAgICAgICQkU09VUkNFX0RJUi8uLi9XZWJLaXRMaWJyYXJpZXMvCiAKICAgICAgICAg REVGSU5FUys9TlNHRU9NRVRSWV9UWVBFU19TQU1FX0FTX0NHR0VPTUVUUllfVFlQRVMKKyAgICAg ICAgY29udGFpbnMoQ09ORklHLCAieDg2IikgeworICAgICAgICAgICAgREVGSU5FUys9TlNfQlVJ TERfMzJfTElLRV82NAorICAgICAgICB9CiAKICAgICAgICAgSEVBREVSUyArPSAkJFBXRC9XZWJD b3JlU3VwcG9ydC9XZWJTeXN0ZW1JbnRlcmZhY2UuaCBcCiAgICAgICAgICAgICAgICAgICAgJCRQ V0QvV2ViQ29yZVN1cHBvcnQvUVRLaXRGdWxsU2NyZWVuVmlkZW9IYW5kbGVyLmgK