152650 2016-01-01 22:44:44 -0800 [CMake][GTK][OSX] webkit-gtk 2.11.2 fails to build WebKit2-4.0.gir, dyld fails to locate built libraries prior to installation 2016-03-12 02:23:32 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Mac OS X 10.11 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=152183 https://bugs.webkit.org/show_bug.cgi?id=150798 P2 Normal --- 126492 1 jeremyhu webkit-unassigned bugs-noreply commit-queue oldest_to_newest 1151922 0 jeremyhu 2016-01-01 22:44:44 -0800 I'm trying to build webkit-gtk 2.11.2 on OS X (the last version we had working was 2.4.9, before the move to cmake). We are configuring as follows: cmake -DCMAKE_INSTALL_PREFIX=/opt/local -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_COLOR_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_INSTALL_RPATH=/opt/local/lib -DCMAKE_INSTALL_NAME_DIR=/opt/local/lib -DCMAKE_SYSTEM_PREFIX_PATH="/opt/local;/usr" -DCMAKE_MODULE_PATH=/opt/local/share/cmake/Modules -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev -DPORT=GTK -DENABLE_X11_TARGET=ON -DENABLE_QUARTZ_TARGET=OFF -DLLVM_CONFIG_EXE=/opt/local/bin/llvm-config-mp-3.7 -DENABLE_VIDEO=ON -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.11" -DCMAKE_OSX_SYSROOT="/" After working around bug #152640, bug #152641, and https://bugzilla.gnome.org/show_bug.cgi?id=625195, the build fails at: [ 96%] Generating ../../WebKit2-4.0.gir cd /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2 && CC=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang CFLAGS=-Wno-deprecated-declarations LDFLAGS= LD_LIBRARY_PATH="/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/lib:" /opt/local/bin/g-ir-scanner --quiet --warn-all --symbol-prefix=webkit --identifier-prefix=WebKit --namespace=WebKit2 --nsversion=4.0 --include=GObject-2.0 --include=Gtk-3.0 --include=Soup-2.4 --include-uninstalled=/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/JavaScriptCore-4.0.gir --library=webkit2gtk-4.0 --library=javascriptcoregtk-4.0 -L/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/lib -L/opt/local/lib --no-libtool --pkg=gobject-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --pkg-export=webkit2gtk-4.0 --output=/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/WebKit2-4.0.gir --c-include="webkit2/webkit2.h" -DBUILDING_WEBKIT -DWEBKIT2_COMPILATION -I/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source -I/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2 -I/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/JavaScriptCore/ForwardingHeaders -I/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/DerivedSources -I/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/DerivedSources/webkit2gtk -I/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/DerivedSources/ForwardingHeaders/webkit2gtk /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/DerivedSources/webkit2gtk/webkit2/WebKitEnumTypes.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/DerivedSources/webkit2gtk/webkit2/WebKitVersion.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitAutocleanups.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitEditingCommands.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitEditorState.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitError.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitForwardDeclarations.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResult.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitPermissionRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/webkit2.h /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/UIProcess/API/gtk/*.cpp dyld: Library not loaded: /opt/local/lib/libwebkit2gtk-4.0.37.dylib Referenced from: /opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/tmp-introspectx4dcfN/WebKit2-4.0 Reason: image not found Command '['/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/tmp-introspectx4dcfN/WebKit2-4.0', '--introspect-dump=/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/tmp-introspectx4dcfN/functions.txt,/opt/local/var/macports/build/_Volumes_Home_jeremy_src_macports_trunk_dports_www_webkit-gtk-devel/webkit-gtk-devel/work/webkitgtk-2.11.2/Source/WebKit2/tmp-introspectx4dcfN/dump.xml']' returned non-zero exit status -5 make[2]: *** [WebKit2-4.0.gir] Error 1 Not sure if this is a bug in g-ir-scanner or in the build system, so starting with webkit. It looks like you probably want to have DYLD_LIBRARY_PATH set in addition to your LD_LIBRARY_PATH since you're actually executing that intermediate file. That's what makes me suspect that this may also need some change in g-ir-scanner. 1172241 1 jeremyhu 2016-03-08 15:23:07 -0800 Bug #150798 was addressed by just disabling gtk-doc and gobject-intorspection on OSX. That's not really a fix. This should be fixed properly. 1174002 2 273823 jeremyhu 2016-03-12 01:17:36 -0800 Created attachment 273823 Patch to fix gobject-introspection on OSX 1174008 3 273823 commit-queue 2016-03-12 02:23:28 -0800 Comment on attachment 273823 Patch to fix gobject-introspection on OSX Clearing flags on attachment: 273823 Committed r198058: <http://trac.webkit.org/changeset/198058> 1174009 4 commit-queue 2016-03-12 02:23:32 -0800 All reviewed patches have been landed. Closing bug. 273823 2016-03-12 01:17:36 -0800 2016-03-12 02:23:28 -0800 Patch to fix gobject-introspection on OSX 0001-GTK-Mac-Enable-support-for-gobject-introspection-on-.patch text/plain 4879 jeremyhu RnJvbSAxNTJkNTIxZGZmMDJhYzAwZmNkMTBkNjJmN2M2YzEzZGI4OGNjYTE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJlbXkgSHVkZGxlc3RvbiBTZXF1b2lhIDxqZXJlbXlodUBh cHBsZS5jb20+CkRhdGU6IFR1ZSwgOCBNYXIgMjAxNiAxNzoyMTozNiAtMDgwMApTdWJqZWN0OiBb UEFUQ0ggMS8yXSBbR1RLXVtNYWNdIEVuYWJsZSBzdXBwb3J0IGZvciBnb2JqZWN0IGludHJvc3Bl Y3Rpb24gb24KIE1hYwoKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MjY1MAoKU2lnbmVkLW9mZi1ieTogSmVyZW15IEh1ZGRsZXN0b24gU2VxdW9pYSA8amVyZW15aHVA YXBwbGUuY29tPgotLS0KIENoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgIHwgIDkgKysr KysrKysrCiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICB8ICA5ICsrKysrKysrKwog U291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UgfCAxOCArKysrKysrKysrKysrLS0tLS0K IFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlICAgIHwgIDkgKysrKysrKy0tCiA0IGZpbGVz IGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv Q2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDdmMDhiMDQuLjdkOWRiZTggMTAwNjQ0Ci0tLSBh L0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNi0wMy0wOCAg SmVyZW15IEh1ZGRsZXN0b24gU2VxdW9pYSAgPGplcmVteWh1QGFwcGxlLmNvbT4KKworICAgICAg ICBbR1RLXVtNYWNdIERvbid0IGZvcmNlIEVOQUJMRV9JTlRST1NQRUNUSU9OPU9GRiBvbiBNYWMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjY1MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNl L2NtYWtlL09wdGlvbnNHVEsuY21ha2U6CisKIDIwMTYtMDMtMDUgIE1pY2hhZWwgQ2F0YW56YXJv ICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCBHVEsv RUZMIGJ1aWxkIGFmdGVyIHIxOTc1NzUgYW5kIGFkZCBtYW5kYXRvcnkgR251VExTIGRlcGVuZGVu Y3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCAyN2U0OWQ4Li4yNjJhMTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTIgQEAKKzIwMTYtMDMtMDggIEplcmVteSBIdWRkbGVzdG9uIFNlcXVvaWEgIDxqZXJlbXlodUBh cHBsZS5jb20+CisKKyAgICAgICAgW0dUS11bTWFjXSBVc2UgRFlMRF9MSUJSQVJZX1BBVEggb24g T1NYIHJhdGhlciB0aGVuIExEX0xJQlJBUllfUEFUSAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAxNi0wMy0w OCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE5Nzc5MyBhbmQgcjE5Nzc5OS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1H VEsuY21ha2UKaW5kZXggMjI4NzhlZS4uNzI5Y2YzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21h a2UKQEAgLTg4OCwxNSArODg4LDIzIEBAIGFkZF9kZXBlbmRlbmNpZXMod2Via2l0Mmd0a2luamVj dGVkYnVuZGxlIEdPYmplY3RET01CaW5kaW5ncykKIGFkZF93ZWJraXQyX3ByZWZpeF9oZWFkZXIo d2Via2l0Mmd0a2luamVjdGVkYnVuZGxlKQogdGFyZ2V0X2xpbmtfbGlicmFyaWVzKHdlYmtpdDJn dGtpbmplY3RlZGJ1bmRsZSBXZWJLaXQyKQogCi0jIEFkZCAke0NNQUtFX0xJQlJBUllfT1VUUFVU X0RJUkVDVE9SWX0gdG8gTERfTElCUkFSWV9QQVRICi1zdHJpbmcoQ09NUEFSRSBFUVVBTCAiJEVO VntMRF9MSUJSQVJZX1BBVEh9IiAiIiBsZF9saWJyYXJ5X3BhdGhfbm90X2V4aXN0KQorIyBBZGQg JHtDTUFLRV9MSUJSQVJZX09VVFBVVF9ESVJFQ1RPUll9IHRvIExEX0xJQlJBUllfUEFUSCBvciBE WUxEX0xJQlJBUllfUEFUSAoraWYgKEFQUExFKQorICAgIHNldChMT0FERVJfTElCUkFSWV9QQVRI X1ZBUiAiRFlMRF9MSUJSQVJZX1BBVEgiKQorICAgIHNldChQUkVWX0xPQURFUl9MSUJSQVJZX1BB VEggIiRFTlZ7RFlMRF9MSUJSQVJZX1BBVEh9IikKK2Vsc2UgKCkKKyAgICBzZXQoTE9BREVSX0xJ QlJBUllfUEFUSF9WQVIgIkxEX0xJQlJBUllfUEFUSCIpCisgICAgc2V0KFBSRVZfTE9BREVSX0xJ QlJBUllfUEFUSCAiJEVOVntMRF9MSUJSQVJZX1BBVEh9IikKK2VuZGlmICgpCisKK3N0cmluZyhD T01QQVJFIEVRVUFMICIke1BSRVZfTE9BREVSX0xJQlJBUllfUEFUSH0iICIiIGxkX2xpYnJhcnlf cGF0aF9ub3RfZXhpc3QpCiBpZiAobGRfbGlicmFyeV9wYXRoX2RvZXNfbm90X2V4aXN0KQogICAg IHNldChJTlRST1NQRUNUSU9OX0FERElUSU9OQUxfTElCUkFSWV9QQVRICiAgICAgICAgICIke0NN QUtFX0xJQlJBUllfT1VUUFVUX0RJUkVDVE9SWX0iCiAgICAgKQogZWxzZSAoKQogICAgIHNldChJ TlRST1NQRUNUSU9OX0FERElUSU9OQUxfTElCUkFSWV9QQVRICi0gICAgICAgICIke0NNQUtFX0xJ QlJBUllfT1VUUFVUX0RJUkVDVE9SWX06JEVOVntMRF9MSUJSQVJZX1BBVEh9IgorICAgICAgICAi JHtDTUFLRV9MSUJSQVJZX09VVFBVVF9ESVJFQ1RPUll9OiR7UFJFVl9MT0FERVJfTElCUkFSWV9Q QVRIfSIKICAgICApCiBlbmRpZiAoKQogCkBAIC05MDksNyArOTE3LDcgQEAgYWRkX2N1c3RvbV9j b21tYW5kKAogICAgIERFUEVORFMgV2ViS2l0MgogICAgIERFUEVORFMgJHtDTUFLRV9CSU5BUllf RElSfS9KYXZhU2NyaXB0Q29yZS0ke1dFQktJVEdUS19BUElfVkVSU0lPTn0uZ2lyCiAgICAgQ09N TUFORCBDQz0ke0NNQUtFX0NfQ09NUElMRVJ9IENGTEFHUz0tV25vLWRlcHJlY2F0ZWQtZGVjbGFy YXRpb25zIExERkxBR1M9Ci0gICAgICAgIExEX0xJQlJBUllfUEFUSD0iJHtJTlRST1NQRUNUSU9O X0FERElUSU9OQUxfTElCUkFSWV9QQVRIfSIKKyAgICAgICAgJHtMT0FERVJfTElCUkFSWV9QQVRI X1ZBUn09IiR7SU5UUk9TUEVDVElPTl9BRERJVElPTkFMX0xJQlJBUllfUEFUSH0iCiAgICAgICAg ICR7SU5UUk9TUEVDVElPTl9TQ0FOTkVSfQogICAgICAgICAtLXF1aWV0CiAgICAgICAgIC0td2Fy bi1hbGwKQEAgLTk1MSw3ICs5NTksNyBAQCBhZGRfY3VzdG9tX2NvbW1hbmQoCiAgICAgREVQRU5E UyAke0NNQUtFX0JJTkFSWV9ESVJ9L1dlYktpdDItJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059Lmdp cgogICAgIENPTU1BTkQgQ0M9JHtDTUFLRV9DX0NPTVBJTEVSfSBDRkxBR1M9LVduby1kZXByZWNh dGVkLWRlY2xhcmF0aW9ucwogICAgICAgICBMREZMQUdTPSIke0lOVFJPU1BFQ1RJT05fQURESVRJ T05BTF9MREZMQUdTfSIKLSAgICAgICAgTERfTElCUkFSWV9QQVRIPSIke0lOVFJPU1BFQ1RJT05f QURESVRJT05BTF9MSUJSQVJZX1BBVEh9IgorICAgICAgICAke0xPQURFUl9MSUJSQVJZX1BBVEhf VkFSfT0iJHtJTlRST1NQRUNUSU9OX0FERElUSU9OQUxfTElCUkFSWV9QQVRIfSIKICAgICAgICAg JHtJTlRST1NQRUNUSU9OX1NDQU5ORVJ9CiAgICAgICAgIC0tcXVpZXQKICAgICAgICAgLS13YXJu LWFsbApkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2Uv Y21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCA1NDY3MWZlLi42YjAxZjFhIDEwMDY0NAotLS0g YS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9u c0dUSy5jbWFrZQpAQCAtNDE4LDEyICs0MTgsMTcgQEAgaWYgKFVTRV9MSUJIWVBIRU4pCiAgICAg ZW5kaWYgKCkKIGVuZGlmICgpCiAKLSMgT3ZlcnJpZGUgdGhlIGNhY2hlZCB2YXJpYWJsZXMsIGd0 ay1kb2MgYW5kIGdvYmplY3QtaW50cm9zcGVjdGlvbiBkbyBub3QgcmVhbGx5IHdvcmsgd2hlbiBj cm9zcy1idWlsZGluZyBvciB3aGVuIGJ1aWxkaW5nIG9uIE1hYy4KLWlmIChDTUFLRV9DUk9TU0NP TVBJTElORyBPUiBBUFBMRSkKKyMgT3ZlcnJpZGUgdGhlIGNhY2hlZCB2YXJpYWJsZXMsIGd0ay1k b2MgYW5kIGdvYmplY3QtaW50cm9zcGVjdGlvbiBkbyBub3QgcmVhbGx5IHdvcmsgd2hlbiBjcm9z cy1idWlsZGluZy4KK2lmIChDTUFLRV9DUk9TU0NPTVBJTElORykKICAgICBzZXQoRU5BQkxFX0dU S0RPQyBPRkYpCiAgICAgc2V0KEVOQUJMRV9JTlRST1NQRUNUSU9OIE9GRikKIGVuZGlmICgpCiAK KyMgT3ZlcnJpZGUgdGhlIGNhY2hlZCB2YXJpYWJsZSwgZ3RrLWRvYyBkb2VzIG5vdCByZWFsbHkg d29yayB3aGVuIGJ1aWxkaW5nIG9uIE1hYy4KK2lmIChBUFBMRSkKKyAgICBzZXQoRU5BQkxFX0dU S0RPQyBPRkYpCitlbmRpZiAoKQorCiBzZXQoREVSSVZFRF9TT1VSQ0VTX0dPQkpFQ1RfRE9NX0JJ TkRJTkdTX0RJUiAke0RFUklWRURfU09VUkNFU19ESVJ9L3dlYmtpdGRvbSkKIHNldChERVJJVkVE X1NPVVJDRVNfV0VCS0lUR1RLX0RJUiAke0RFUklWRURfU09VUkNFU19ESVJ9L3dlYmtpdGd0aykK IHNldChERVJJVkVEX1NPVVJDRVNfV0VCS0lUR1RLX0FQSV9ESVIgJHtERVJJVkVEX1NPVVJDRVNf V0VCS0lUR1RLX0RJUn0vd2Via2l0KQotLSAKMi43LjIKCg==