diff --git a/network/misc/webkit2gtk/actions.py b/network/misc/webkit2gtk/actions.py index 3d5caf83d4..f2e4fcc51b 100644 --- a/network/misc/webkit2gtk/actions.py +++ b/network/misc/webkit2gtk/actions.py @@ -15,6 +15,7 @@ docs = ["AUTHORS", "COPYING.LIB", "THANKS", \ def setup(): #shelltools.system("rm -r Source/ThirdParty/gtest/") + #pisitools.dosed("Source/cmake/OptionsGTK.cmake", "2.99.5", "2.72.0") cmaketools.configure("-DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -27,9 +28,11 @@ def setup(): -DENABLE_WEB_AUDIO=ON \ -DENABLE_WEBGL=ON \ -DUSE_LIBHYPHEN=OFF \ + -DUSE_SOUP2=ON \ -DUSE_WOFF2=OFF \ -DUSE_SYSTEMD=OFF \ - -DJPEG_INCLUDE_DIR=/usr/include/openjpeg-2.3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DJPEG_INCLUDE_DIR=/usr/include/openjpeg-2.4 \ -DSHOULD_INSTALL_JS_SHELL=ON \ -DUSE_WPE_RENDERER=OFF \ -DENABLE_MINIBROWSER=ON") diff --git a/network/misc/webkit2gtk/files/fix-build.patch b/network/misc/webkit2gtk/files/fix-build.patch new file mode 100644 index 0000000000..90da751187 --- /dev/null +++ b/network/misc/webkit2gtk/files/fix-build.patch @@ -0,0 +1,12 @@ +--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h ++++ a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h +@@ -33,6 +33,9 @@ + #if USE(LIBEPOXY) + #include + #else ++#if HAVE(OPENGL_ES_3) ++#include ++#endif // HAVE(OPENGL_ES_3) + #include + #include + #endif diff --git a/network/misc/webkit2gtk/pspec.xml b/network/misc/webkit2gtk/pspec.xml index 806ff4d169..5c3847dbdf 100644 --- a/network/misc/webkit2gtk/pspec.xml +++ b/network/misc/webkit2gtk/pspec.xml @@ -14,7 +14,7 @@ library An opensource web browser engine for GTK+ applications The GTK+ port of WebKit is intended to provide a browser component primarily for users of the portable GTK+ UI toolkit on platforms like Linux. - http://www.webkitgtk.org/releases/webkitgtk-2.30.5.tar.xz + http://www.webkitgtk.org/releases/webkitgtk-2.33.1.tar.xz cmake which @@ -55,11 +55,7 @@ wpebackend-fdo-devel - gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch - gentoo/2.28.2-opengl-without-X-fixes.patch - gentoo/2.28.2-non-jumbo-fix.patch - gentoo/2.28.4-non-jumbo-fix2.patch - gentoo/2.30.3-fix-noGL-build.patch + fix-build.patch @@ -139,6 +135,13 @@ + + 2021-06-07 + 2.33.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-02-27 2.30.5