[patch] x11-libs/wxGTK-3.2.2.1-r2.ebuild net-libs/webkit-gtk:4.1 support

wxGTK-3.2.2.1-webkitgtk2-4.1.patch (text/plain), 7.91 KB, created by mehw on 2023-07-23 15:37:18 UTC

Backported from 1b8664426603376b68f8ca3c54de97ec630e5940

Add support for building WebView with libwebkit2gtk-4.1

libwebkit2gtk-4.1 has the same API as libwebkit2gtk-4.0, except that the
former links with libsoup-3.0 and the latter links with libsoup-2.4.

Fixes #23630.

diff -Nuar a/build/cmake/init.cmake b/build/cmake/init.cmake
--- a/build/cmake/init.cmake	2023-02-13 15:45:39.000000000 +0100
+++ b/build/cmake/init.cmake	2023-07-12 13:56:00.988591804 +0200
@@ -439,15 +439,21 @@
     if(wxUSE_WEBVIEW)
         if(WXGTK)
             if(wxUSE_WEBVIEW_WEBKIT)
-                find_package(LIBSOUP)
+                set(WEBKIT_LIBSOUP_VERSION 2.4)
                 if(WXGTK2)
                     find_package(WEBKIT 1.0)
                 elseif(WXGTK3)
-                    find_package(WEBKIT2)
+                    find_package(WEBKIT2 4.1 QUIET)
+                    if(WEBKIT2_FOUND)
+                        set(WEBKIT_LIBSOUP_VERSION 3.0)
+                    else()
+                        find_package(WEBKIT2 4.0)
+                    endif()
                     if(NOT WEBKIT2_FOUND)
                         find_package(WEBKIT 3.0)
                     endif()
                 endif()
+                find_package(LIBSOUP ${WEBKIT_LIBSOUP_VERSION})
             endif()
             set(wxUSE_WEBVIEW_WEBKIT OFF)
             set(wxUSE_WEBVIEW_WEBKIT2 OFF)
diff -Nuar a/build/cmake/modules/FindLIBSOUP.cmake b/build/cmake/modules/FindLIBSOUP.cmake
--- a/build/cmake/modules/FindLIBSOUP.cmake	2023-02-13 15:45:39.000000000 +0100
+++ b/build/cmake/modules/FindLIBSOUP.cmake	2023-07-12 13:57:37.725071495 +0200
@@ -31,19 +31,27 @@
 # LibSoup does not provide an easy way to retrieve its version other than its
 # .pc file, so we need to rely on PC_LIBSOUP_VERSION and REQUIRE the .pc file
 # to be found.
+SET(LIBSOUP_VERSION 2.4)
+if(DEFINED LIBSOUP_FIND_VERSION)
+    SET(LIBSOUP_VERSION ${LIBSOUP_FIND_VERSION})
+endif()
+
+set(LIBSOUP_INCLUDE_DIRS LIBSOUP_INCLUDE_DIRS-NOTFOUND)
+set(LIBSOUP_LIBRARIES LIBSOUP_LIBRARIES-NOTFOUND)
+
 FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_LIBSOUP QUIET libsoup-2.4)
+PKG_CHECK_MODULES(PC_LIBSOUP QUIET libsoup-${LIBSOUP_VERSION})
 
 if(PC_LIBSOUP_FOUND)
     FIND_PATH(LIBSOUP_INCLUDE_DIRS
         NAMES libsoup/soup.h
         HINTS ${PC_LIBSOUP_INCLUDEDIR}
         ${PC_LIBSOUP_INCLUDE_DIRS}
-        PATH_SUFFIXES libsoup-2.4
+        PATH_SUFFIXES libsoup-${LIBSOUP_VERSION}
         )
 
     FIND_LIBRARY(LIBSOUP_LIBRARIES
-        NAMES soup-2.4
+        NAMES soup-${LIBSOUP_VERSION}
         HINTS ${PC_LIBSOUP_LIBDIR}
         ${PC_LIBSOUP_LIBRARY_DIRS}
         )
diff -Nuar a/build/cmake/modules/FindWEBKIT2.cmake b/build/cmake/modules/FindWEBKIT2.cmake
--- a/build/cmake/modules/FindWEBKIT2.cmake	2023-02-13 15:45:39.000000000 +0100
+++ b/build/cmake/modules/FindWEBKIT2.cmake	2023-07-12 14:02:04.674395225 +0200
@@ -5,7 +5,10 @@
 #  WEBKIT2_LIBRARIES   - List of libraries when using Webkit2.
 #  WEBKIT2_FOUND       - True if Webkit2 found.
 
-SET( WEBKIT2_VERSION 4.0)
+SET(WEBKIT2_VERSION 4.0)
+if(DEFINED WEBKIT2_FIND_VERSION)
+    SET(WEBKIT2_VERSION ${WEBKIT2_FIND_VERSION})
+endif()
 
 set(WEBKIT2_INCLUDE_DIR WEBKIT2_INCLUDE_DIR-NOTFOUND)
 set(WEBKIT2_LIBRARY WEBKIT2_LIBRARY-NOTFOUND)
diff -Nuar a/configure b/configure
--- a/configure	2023-02-13 15:45:39.000000000 +0100
+++ b/configure	2023-06-02 03:26:19.656463116 +0200
@@ -41737,12 +41737,12 @@
         pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.0" 2>/dev/null`
+  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -41755,12 +41755,12 @@
         pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.0" 2>/dev/null`
+  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -41779,9 +41779,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.0"`
+	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.1"`
         else
-	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.0"`
+	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.1"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WEBKIT_PKG_ERRORS" >&5
@@ -43055,7 +43055,7 @@
         ;;
 esac
 if test "$wxUSE_STC" = "yes" ; then
-    wxconfig_3rdparty="scintilla $wxconfig_3rdparty"
+    wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
 fi
 case "$wxUSE_EXPAT" in
     builtin)
diff -Nuar a/configure.in b/configure.in
--- a/configure.in	2023-02-13 15:45:39.000000000 +0100
+++ b/configure.in	2023-07-12 14:07:40.204059027 +0200
@@ -7503,14 +7503,14 @@
         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 webkitgtk])
                                   ])
             fi
             if test "$USE_WEBVIEW_WEBKIT2" = 0; then
@@ -8299,7 +8299,7 @@
         ;;
 esac
 if test "$wxUSE_STC" = "yes" ; then
-    wxconfig_3rdparty="scintilla $wxconfig_3rdparty"
+    wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
 fi
 case "$wxUSE_EXPAT" in
     builtin)
diff -Nuar a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp
--- a/src/gtk/webview_webkit2.cpp	2023-02-13 15:45:39.000000000 +0100
+++ b/src/gtk/webview_webkit2.cpp	2023-07-12 14:09:41.540660702 +0200
@@ -166,15 +166,18 @@
     {
         switch (error->code)
         {
+#if SOUP_MAJOR_VERSION < 3
             case SOUP_STATUS_CANCELLED:
                 type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
                 break;
 
             case SOUP_STATUS_CANT_RESOLVE:
+#endif
             case SOUP_STATUS_NOT_FOUND:
                 type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
                 break;
 
+#if SOUP_MAJOR_VERSION < 3
             case SOUP_STATUS_CANT_RESOLVE_PROXY:
             case SOUP_STATUS_CANT_CONNECT:
             case SOUP_STATUS_CANT_CONNECT_PROXY:
@@ -186,6 +189,7 @@
             case SOUP_STATUS_MALFORMED:
                 type = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
+#endif
 
             case SOUP_STATUS_BAD_REQUEST:
                 type = wxWEBVIEW_NAV_ERR_REQUEST;