From ad69f3779ad49381fcf8fbb752a7d91ef7c9a8c5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 13 Sep 2023 21:02:58 +0200
Subject: [PATCH] Remove "adv" library from webview sample

This library doesn't contain anything any more and exists only for
compatibility, so don't reference it.
---
 samples/webview/Makefile.in | 7 +------
 samples/webview/webview.bkl | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in
index 2abe5270d4..9c1878b7b0 100644
--- a/samples/webview/Makefile.in
+++ b/samples/webview/Makefile.in
@@ -32,7 +32,6 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
 EXTRALIBS_STC = @EXTRALIBS_STC@
 EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
 WX_CPPFLAGS = @WX_CPPFLAGS@
@@ -82,7 +81,6 @@ COND_PLATFORM_UNIX_1_LIBCEF_LINK = -L$(top_srcdir)//3rdparty/cef/Release/ \
 @COND_PLATFORM_UNIX_1@LIBCEF_LINK = $(COND_PLATFORM_UNIX_1_LIBCEF_LINK)
 @COND_PLATFORM_WIN32_1@LIBCEF_LINK = \
 @COND_PLATFORM_WIN32_1@	$(top_srcdir)//3rdparty/cef/Release/libcef/libcef.lib
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -143,9 +141,6 @@ COND_PLATFORM_OS2_1___webview_chromium___os2_emxbindcmd = $(NM) \
 @COND_TOOLKIT_OSX_IPHONE@____webview_chromium_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= \
 @COND_TOOLKIT_OSX_IPHONE@	$(__webview_chromium_app_Contents_PkgInfo___depname)
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
 @COND_PLATFORM_WIN32_1@__webview_chromium___win32rc \
 @COND_PLATFORM_WIN32_1@	= webview_chromium_sample_rc.o
 @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@__package___depname \
@@ -300,7 +295,7 @@ data:
 @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@	cp -f $(top_srcdir)//src/osx/carbon/wxmac.icns webview_chromium_helper.app/Contents/Resources/wxmac.icns
 
 @COND_USE_WEBVIEW_CHROMIUM_1@webview_chromium$(EXEEXT): $(WEBVIEW_CHROMIUM_OBJECTS) $(__webview_chromium___win32rc)
-@COND_USE_WEBVIEW_CHROMIUM_1@	$(CXX) -o $@ $(WEBVIEW_CHROMIUM_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -Wl,-rpath,. $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_LINK) $(LDFLAGS)  $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__LIBCEF_DLL_WRAPPER_NAME_p) $(__LIB_SCINTILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_WEBVIEW_CHROMIUM_1@	$(CXX) -o $@ $(WEBVIEW_CHROMIUM_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -Wl,-rpath,. $(__LIBCEF_WRAPPER_PATH_p) $(LIBCEF_LINK) $(LDFLAGS)  $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webviewchromium-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__LIBCEF_DLL_WRAPPER_NAME_p) $(__LIB_SCINTILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_USE_WEBVIEW_CHROMIUM_1@	$(__webview_chromium___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1_USE_WEBVIEW_CHROMIUM_1@webview_chromium.app/Contents/PkgInfo: $(__webview_chromium___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
diff --git a/samples/webview/webview.bkl b/samples/webview/webview.bkl
index 9421e44dad..15b74e59f6 100644
--- a/samples/webview/webview.bkl
+++ b/samples/webview/webview.bkl
@@ -75,7 +75,6 @@
         <wx-lib>webviewchromium</wx-lib>
         <wx-lib>webview</wx-lib>
         <wx-lib>stc</wx-lib>
-        <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <ldflags>-Wl,-rpath,.</ldflags>