diff options
| -rw-r--r-- | net-libs/webkit-gtk/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.30.4-r10.ebuild (renamed from net-libs/webkit-gtk/webkit-gtk-2.30.3-r10.ebuild) | 31 |
2 files changed, 17 insertions, 16 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 5e05ea7f..2e9c9547 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1 +1 @@ -DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf +DIST webkitgtk-2.30.4.tar.xz 22310784 BLAKE2B 648f03c929212b57f3197b0540e002dca5b277c44e9e73612b20ac1861747585aeb835ce25e98d5073d67a5ab5fc7c13985d280e6e658ac22619233db911ae97 SHA512 dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3-r10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r10.ebuild index 083fbf61..f28fc31f 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.30.3-r10.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r10.ebuild @@ -2,9 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python3_{6..8} ) -CMAKE_MIN_VERSION=3.10 inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs virtualx @@ -15,9 +13,9 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" LICENSE="LGPL-2+ BSD" SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" -IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X" +IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X" # gstreamer with opengl/gles2 needs egl REQUIRED_USE=" @@ -103,19 +101,19 @@ RDEPEND=" gamepad? ( >=dev-libs/libmanette-0.2.4 ) " unset wpe_depend +DEPEND="${RDEPEND}" # paxctl needed for bug #407085 # Need real bison, not yacc -DEPEND="${RDEPEND} +BDEPEND=" ${PYTHON_DEPS} >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 - dev-lang/ruby:2.5 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig - + dev-lang/ruby:2.5 >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp @@ -168,13 +166,12 @@ pkg_setup() { } src_prepare() { - eapply "${FILESDIR}"/${PV}-icu68.patch eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch - eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch - cmake-utils_src_prepare + eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch + cmake_src_prepare gnome2_src_prepare } @@ -234,6 +231,7 @@ src_configure() { -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) $(cmake-utils_use_find_package gles2-only OpenGLES2) -DENABLE_GLES2=$(usex gles2-only) + -DENABLE_MINIBROWSER=$(usex examples) -DENABLE_VIDEO=$(usex gstreamer) -DENABLE_WEB_AUDIO=$(usex gstreamer) -DENABLE_INTROSPECTION=$(usex introspection) @@ -247,13 +245,13 @@ src_configure() { -DENABLE_WAYLAND_TARGET=$(usex wayland) -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package opengl OpenGL) + $(cmake_utils-use_find_package opengl OpenGL) -DENABLE_X11_TARGET=$(usex X) -DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled} -DENABLE_WEBGL=${opengl_enabled} -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DCMAKE_BUILD_TYPE=Release + -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that + -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy -DPORT=GTK ${ruby_interpreter} ) @@ -267,6 +265,9 @@ src_configure() { # mycmakeargs+=( -DUSE_LD_GOLD=OFF ) # fi + # https://bugs.gentoo.org/761238 + append-cppflags -DNDEBUG + WK_USE_CCACHE=NO cmake-utils_src_configure } @@ -285,6 +286,6 @@ src_install() { cmake-utils_src_install # Prevents crashes on PaX systems, bug #522808 - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" + pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess" + pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" } |