From 948545ba81680a867bd887381dd1f941b5560484 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:17:31 +0100
Subject: [PATCH] Include helper ID in chromium helper plist

Same as the cefsimple example does.

CMake already has code to replace this variable.
---
 samples/webview/cef_helper_info.plist.in | 2 +-
 samples/webview/webview.bkl              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/webview/cef_helper_info.plist.in b/samples/webview/cef_helper_info.plist.in
index cf6ad7392c..3ed98af440 100644
--- a/samples/webview/cef_helper_info.plist.in
+++ b/samples/webview/cef_helper_info.plist.in
@@ -9,7 +9,7 @@
     <key>CFBundleExecutable</key>
     <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleIdentifier</key>
-    <string>org.wxwidgets.webviewChromium.helper</string>
+    <string>org.wxwidgets.webviewsample.helper${BUNDLE_ID_SUFFIX}</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
diff --git a/samples/webview/webview.bkl b/samples/webview/webview.bkl
index cec1bb8839..129834c5fc 100644
--- a/samples/webview/webview.bkl
+++ b/samples/webview/webview.bkl
@@ -39,6 +39,7 @@
                     ln -fs "../../../webview Helper.app/Contents/MacOS/webview Helper" "$$helper_contents/MacOS/$$helper_name"; \
                     sed -e "s/\$${PRODUCT_NAME}/$$helper_name/"  \
                         -e "s/\$${EXECUTABLE_NAME}/$$helper_name/" \
+                        -e "s/\$${BUNDLE_ID_SUFFIX}/.$$helper_name/" \
                         $(TOP_SRCDIR)/samples/webview/cef_helper_info.plist.in > "$$helper_contents/Info.plist"; \
                     cp webview_helper.app/Contents/PkgInfo "$$helper_contents"; \
                     cp -Rf webview_helper.app/Contents/Resources "$$helper_contents"; \
@@ -89,6 +90,7 @@
                 mkdir -p webview_helper.app/Contents/Resources
                 sed -e "s/\$${PRODUCT_NAME}/webview Helper/"  \
                     -e "s/\$${EXECUTABLE_NAME}/webview Helper/" \
+                    -e "s/\$${BUNDLE_ID_SUFFIX}//" \
                     $(TOP_SRCDIR)/samples/webview/cef_helper_info.plist.in >webview_helper.app/Contents/Info.plist
                 /bin/echo "APPL????" >webview_helper.app/Contents/PkgInfo
                 <!--Fix CEF link path -->