From 1e7d00f5d8b50ee2d47286131ce4208d644bcca8 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 28 Feb 2021 17:05:52 +0300 Subject: [PATCH] webkit2gtk ver. bump --- network/misc/webkit-gtk2/actions.py | 61 +++---- .../files/gentoo/2.28.2-non-jumbo-fix.patch | 34 ++++ .../2.28.2-opengl-without-X-fixes.patch | 53 ++++++ .../files/gentoo/2.28.4-non-jumbo-fix2.patch | 31 ++++ .../files/gentoo/2.30.3-fix-noGL-build.patch | 27 ++++ ...webkit-gtk-2.24.4-eglmesaext-include.patch | 10 ++ network/misc/webkit-gtk2/pspec.xml | 152 +++++++----------- 7 files changed, 239 insertions(+), 129 deletions(-) create mode 100644 network/misc/webkit-gtk2/files/gentoo/2.28.2-non-jumbo-fix.patch create mode 100644 network/misc/webkit-gtk2/files/gentoo/2.28.2-opengl-without-X-fixes.patch create mode 100644 network/misc/webkit-gtk2/files/gentoo/2.28.4-non-jumbo-fix2.patch create mode 100644 network/misc/webkit-gtk2/files/gentoo/2.30.3-fix-noGL-build.patch create mode 100644 network/misc/webkit-gtk2/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch diff --git a/network/misc/webkit-gtk2/actions.py b/network/misc/webkit-gtk2/actions.py index 515b85f7ea..a0fccabbe0 100755 --- a/network/misc/webkit-gtk2/actions.py +++ b/network/misc/webkit-gtk2/actions.py @@ -5,54 +5,39 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import get -from pisi.actionsapi import autotools +from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools -shelltools.export("XDG_DATA_HOME", get.workDIR()) -#pisitools.flags.replace("-ggdb3", "-g") - -cflags = get.CFLAGS().replace("-ggdb3","") -cxxflags = get.CXXFLAGS().replace("-gddb3", "") - -paths = ["JavaScriptCore", "WebCore", "WebKit"] -docs = ["AUTHORS", "ChangeLog", "COPYING.LIB", "THANKS", \ +paths = ["JavaScriptCore", "WebCore", "WebKit", "WebKit2"] +docs = ["AUTHORS", "COPYING.LIB", "THANKS", \ "LICENSE-LGPL-2", "LICENSE-LGPL-2.1", "LICENSE"] def setup(): - autotools.autoreconf("-fiv") - shelltools.export("CFLAGS", cflags) - shelltools.export("CXXFLAGS", cxxflags) - autotools.configure("--prefix=/usr \ - --libexecdir=/usr/lib/WebKitGTK \ - --disable-static \ - --disable-webkit2 \ - --disable-gtk-doc \ - --disable-silent-rules \ - --disable-wayland-target \ - --enable-geolocation \ - --enable-glx \ - --enable-webgl \ - --with-gnu-ld \ - --with-gtk=2.0 \ - --enable-x11-target \ - --enable-video \ - --enable-web-audio \ - --enable-introspection") - - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + #shelltools.system("rm -r Source/ThirdParty/gtest/") + cmaketools.configure("-DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ + -DENABLE_CREDENTIAL_STORAGE=ON \ + -DENABLE_GEOLOCATION=ON \ + -DENABLE_VIDEO=ON \ + -DENABLE_WEB_AUDIO=ON \ + -DENABLE_WEBGL=ON \ + -DUSE_LIBHYPHEN=OFF \ + -DUSE_WOFF2=OFF \ + -DUSE_SYSTEMD=OFF \ + -DJPEG_INCLUDE_DIR=/usr/include/openjpeg-2.3 \ + -DSHOULD_INSTALL_JS_SHELL=ON \ + -DENABLE_MINIBROWSER=ON") def build(): - shelltools.export("CFLAGS", cflags) - shelltools.export("CXXFLAGS", cxxflags) - autotools.make("-j1 all stamp-po") + cmaketools.make() def install(): - shelltools.export("CFLAGS", cflags) - shelltools.export("CXXFLAGS", cxxflags) - autotools.rawInstall("-j1 DESTDIR=%s" % get.installDIR()) - - pisitools.domove("/usr/share/gtk-doc/html", "/usr/share/doc/webkit-gtk2") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) pisitools.dodoc("NEWS") shelltools.cd("Source") diff --git a/network/misc/webkit-gtk2/files/gentoo/2.28.2-non-jumbo-fix.patch b/network/misc/webkit-gtk2/files/gentoo/2.28.2-non-jumbo-fix.patch new file mode 100644 index 0000000000..da9f1d3f56 --- /dev/null +++ b/network/misc/webkit-gtk2/files/gentoo/2.28.2-non-jumbo-fix.patch @@ -0,0 +1,34 @@ +From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Tue, 12 May 2020 15:28:45 +0300 +Subject: [PATCH] Try to fix an apparent non-unified build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In member function ‘WTF::RefPtr +WebKit::InjectedBundleHitTestResult::urlElementHandle() const’: +Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: error: no matching function for call to +‘WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)’ + 57 | return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement()); + | ^ +In file included from Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29 +--- + .../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp +index df8e55df1f0..26f045bd3fc 100644 +--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp ++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp +@@ -32,6 +32,7 @@ + #include "WebImage.h" + #include + #include ++#include + #include + #include + #include +-- +2.20.1 + diff --git a/network/misc/webkit-gtk2/files/gentoo/2.28.2-opengl-without-X-fixes.patch b/network/misc/webkit-gtk2/files/gentoo/2.28.2-opengl-without-X-fixes.patch new file mode 100644 index 0000000000..6976c3ce4d --- /dev/null +++ b/network/misc/webkit-gtk2/files/gentoo/2.28.2-opengl-without-X-fixes.patch @@ -0,0 +1,53 @@ +From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Sat, 9 May 2020 23:11:52 +0300 +Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix + some build configurations + +--- + Source/WebCore/platform/graphics/GLContext.cpp | 5 ++++- + Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp +index b217988b990..1ba0eb8a482 100644 +--- a/Source/WebCore/platform/graphics/GLContext.cpp ++++ b/Source/WebCore/platform/graphics/GLContext.cpp +@@ -28,6 +28,9 @@ + + #if USE(GLX) + #include "GLContextGLX.h" ++#endif ++ ++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) + #include "OpenGLShims.h" + #endif + +@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext() + + static bool initializeOpenGLShimsIfNeeded() + { +-#if USE(OPENGL_ES) || USE(LIBEPOXY) ++#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE) + return true; + #else + static bool initialized = false; +diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp +index 3515be452b2..82cce70f14b 100644 +--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp ++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp +@@ -64,7 +64,10 @@ + + #if USE(GLX) + #include +-#include ++#endif ++ ++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) ++#include "WebCore/OpenGLShims.h" + #endif + + #if USE(GSTREAMER) +-- +2.20.1 + diff --git a/network/misc/webkit-gtk2/files/gentoo/2.28.4-non-jumbo-fix2.patch b/network/misc/webkit-gtk2/files/gentoo/2.28.4-non-jumbo-fix2.patch new file mode 100644 index 0000000000..d7bc379d2b --- /dev/null +++ b/network/misc/webkit-gtk2/files/gentoo/2.28.4-non-jumbo-fix2.patch @@ -0,0 +1,31 @@ +From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Sat, 11 Jul 2020 15:28:05 +0300 +Subject: [PATCH] Try to fix another apparent non-unified build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42: required from here +/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’ + 79 | static_assert(sizeof(_Tp)>0, + | ^~~~~~~~~~~ +--- + Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h +index 55d9e34df61..12a7a83cc61 100644 +--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h ++++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h +@@ -19,6 +19,7 @@ + + #pragma once + ++#include "ImageBuffer.h" + #include "RenderSVGResourceContainer.h" + #include "SVGClipPathElement.h" + #include "SVGUnitTypes.h" +-- +2.20.1 + diff --git a/network/misc/webkit-gtk2/files/gentoo/2.30.3-fix-noGL-build.patch b/network/misc/webkit-gtk2/files/gentoo/2.30.3-fix-noGL-build.patch new file mode 100644 index 0000000000..5e9f426773 --- /dev/null +++ b/network/misc/webkit-gtk2/files/gentoo/2.30.3-fix-noGL-build.patch @@ -0,0 +1,27 @@ +From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Fri, 27 Nov 2020 22:47:30 +0200 +Subject: [PATCH] [X11] Fix build with disabled OpenGL + +The added PlatformDisplayX11::visual() method requires symbols from +X11/Xutil.h, which wasn't added as an explicit include with only +EGL headers indirectly pulled it in with standard build options. +--- + Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +index 8fe3d3e92c88..2b2805446aad 100644 +--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp ++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +@@ -30,6 +30,7 @@ + + #if PLATFORM(X11) + #include ++#include + #include + #if PLATFORM(GTK) + #include +-- +2.20.1 + diff --git a/network/misc/webkit-gtk2/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch b/network/misc/webkit-gtk2/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch new file mode 100644 index 0000000000..9c277e719d --- /dev/null +++ b/network/misc/webkit-gtk2/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch @@ -0,0 +1,10 @@ +--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-08-26 17:55:46.000000000 +0300 ++++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-11-04 23:33:44.146933810 +0300 +@@ -31,6 +31,7 @@ + #include "WebKitWaylandServerProtocol.h" + #include + #include ++#include + #include + #include + #include diff --git a/network/misc/webkit-gtk2/pspec.xml b/network/misc/webkit-gtk2/pspec.xml index cea0cf2715..91825a48b5 100755 --- a/network/misc/webkit-gtk2/pspec.xml +++ b/network/misc/webkit-gtk2/pspec.xml @@ -2,10 +2,10 @@ - webkit-gtk2 + webkit2gtk http://webkitgtk.org - PisiLinux Community + Alihan Öztürk admins@pisilinux.org LGPLv2 @@ -14,87 +14,100 @@ 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.4.11.tar.xz + http://www.webkitgtk.org/releases/webkitgtk-2.30.5.tar.xz - mesa-devel + cmake + which + gperf gtk-doc - glib2-devel - gtk2-devel + bubblewrap ruby-devel + mesa-devel + gtk3-devel + gtk2-devel webp-devel + libwpe-devel cairo-devel icu4c-devel libXt-devel - enchant-devel sqlite-devel - geoclue-devel libsoup-devel - fontconfig-devel + wayland-devel libxslt-devel + geoclue-devel + libgudev-devel harfbuzz-devel + enchant2-devel + xdg-dbus-proxy + libtasn1-devel + libglvnd-devel + libnotify-devel + openjpeg2-devel libsecret-devel - libXcomposite-devel - libjpeg-turbo-devel - gstreamer-devel - gst-libav - gobject-introspection-devel - gst-plugins-base-devel - gst-plugins-bad-devel - gst-plugins-good - which + libgcrypt-devel + libseccomp-devel icon-theme-hicolor - gperf - libSM-devel + libjpeg-turbo-devel + gst-plugins-bad-devel + gst-plugins-base-devel + gobject-introspection-devel + wpebackend-fdo-devel - install-minibrowser.patch - enchant-2.x.patch - icu59.patch - pkgconfig-enchant-2.patch - icu68.patch - fix-ftbfs-gcc6.patch - gtk-doc.patch - grammar.patch + 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 - webkit-gtk2 + webkit2gtk atk zlib - glib2 - gtk2 + gtk3 mesa webp cairo icu4c libXt + glib2 + pango + libwpe libX11 libgcc libpng libxml2 - pango sqlite enchant geoclue libsoup libxslt + enchant2 + libtasn1 harfbuzz freetype + libglvnd libsecret + openjpeg2 + libnotify + libgcrypt + gstreamer + gst-libav fontconfig gdk-pixbuf libXdamage libXrender + libseccomp libXcomposite libjpeg-turbo - gstreamer - gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gobject-introspection + wpebackend-fdo /usr/lib @@ -104,83 +117,40 @@ - webkit-gtk2-devel + webkit2gtk-devel library data:doc Development files for GTK+ port of WebKit - libgcc - gtk2-devel + gtk3-devel glib2-devel - webkit-gtk2 libsoup-devel + webkit2gtk /usr/bin /usr/include /usr/lib/pkgconfig /usr/share/doc/webkit-gtk/Web* - /usr/share/doc/webkit-gtk2/html + /usr/share/doc/webkit2gtk/html /usr/share/doc/webkit-gtk/JavaScriptCore - - 2020-01-28 - 2.4.11 - Rebuild. - Pisi Linux Community - admin@pisilinux.org - - - 2018-08-09 - 2.4.11 - Rebuild. - Pisi Linux Community - admin@pisilinux.org - - - 2018-05-04 - 2.4.11 - Rebuild. - Pisi Linux Community - admin@pisilinux.org - - - 2018-02-05 - 2.4.11 - Rebuild for new toolchain - Pisi Linux Community - admin@pisilinux.org - - - 2017-02-27 - 2.4.11 - Rebuild for new toolchain. - Pisi Linux Community - admin@pisilinux.org - - - 2016-06-18 - 2.4.11 - Version Bump - Pisi Linux Community - admin@pisilinux.org - - 2016-06-9 - 2.4.9 - Release Bump - Pisi Linux Community - admin@pisilinux.org + 2021-02-27 + 2.30.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com - 2015-08-05 - 2.4.9 - First release - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org + 2020-01-30 + 2.26.3 + First release. + Mustafa Cinasal + muscnsl@gmail.com