solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'webkit2_support_4.1' of https://github.com/swt2c/wxWidgets

Browse source 
Add support for building WebView with libwebkit2gtk-4.1.

See #23633.
This commit is contained in:
Vadim Zeitlin 2023-06-15 23:42:11 +02:00
commit d78399dcc9
7 changed files with 7881 additions and 6416 deletions
Download patch file Download diff file Expand all files Collapse all files

16
configure.in
View file

@ -6846,15 +6846,27 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK3" = 1; then
PKG_CHECK_MODULES([WEBKIT],
[webkit2gtk-4.0],
[webkit2gtk-4.1],
[
USE_WEBVIEW_WEBKIT2=1
CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
],
[
AC_MSG_WARN([webkit2gtk not found, falling back to webkitgtk])
AC_MSG_WARN([webkit2gtk-4.1 not found, falling back to webkit2gtk-4.0])
])
if test "$USE_WEBVIEW_WEBKIT2" = 0; then
PKG_CHECK_MODULES([WEBKIT],
[webkit2gtk-4.0],
[
USE_WEBVIEW_WEBKIT2=1
CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
],
[
AC_MSG_WARN([webkit2gtk-4.0 not found, falling back to webkitgtk])
])
fi
fi
if test "$USE_WEBVIEW_WEBKIT2" = 0; then
webkitgtk=webkit-1.0