forked from pool/nodejs-electron
Bruno Pitrus
042a08719d
revert — vscode crashes OBS-URL: https://build.opensuse.org/request/show/1178282 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=152
32 lines
2.0 KiB
Diff
32 lines
2.0 KiB
Diff
Work around this linker error:
|
|
|
|
[ 9463s] /usr/lib64/gcc/x86_64-suse-linux/12/../../../../x86_64-suse-linux/bin/ld: obj/electron/chromium_src/chrome/extension_navigation_ui_data.o: warning: relocation against `_ZN10extensions12WebViewGuest4TypeE' in read-only section `.text'
|
|
[ 9463s] /usr/lib64/gcc/x86_64-suse-linux/12/../../../../x86_64-suse-linux/bin/ld: obj/electron/chromium_src/chrome/extension_navigation_ui_data.o: in function `guest_view::GuestView<extensions::WebViewGuest>::AsDerivedGuest(guest_view::GuestViewBase*)':
|
|
[ 9463s] /home/abuild/rpmbuild/BUILD/src/out/Release/../../components/guest_view/browser/guest_view.h:67:(.text+0xdd): undefined reference to `extensions::WebViewGuest::Type'
|
|
|
|
This is not upstreamable as the problem is due to Electron changes to chromium, and is in dead code that would be removed in LTO builds.
|
|
|
|
--- src/extensions/browser/guest_view/web_view/web_view_guest.cc.old 2023-09-28 10:14:03.660044621 +0200
|
|
+++ src/extensions/browser/guest_view/web_view/web_view_guest.cc 2023-09-29 08:05:41.827245244 +0200
|
|
@@ -285,9 +285,6 @@ std::string WebViewGuest::GetPartitionID
|
|
}
|
|
|
|
// static
|
|
-const char WebViewGuest::Type[] = "webview";
|
|
-
|
|
-// static
|
|
int WebViewGuest::GetOrGenerateRulesRegistryID(int embedder_process_id,
|
|
int webview_instance_id) {
|
|
bool is_web_view = embedder_process_id && webview_instance_id;
|
|
--- src/extensions/browser/guest_view/web_view/web_view_guest.h.old 2023-09-28 10:14:03.660044621 +0200
|
|
+++ src/extensions/browser/guest_view/web_view/web_view_guest.h 2023-09-29 08:06:13.200529820 +0200
|
|
@@ -49,7 +49,7 @@ class WebViewGuest : public guest_view::
|
|
int embedder_process_id,
|
|
int view_instance_id);
|
|
|
|
- static const char Type[];
|
|
+ constexpr static const char Type[] = "webview";
|
|
|
|
// Returns the WebView partition ID associated with the render process
|
|
// represented by |render_process_host|, if any. Otherwise, an empty string is
|