From 490ef2c2dc8b4e808f37add1adee21a754efd9a9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Apr 2024 12:05:28 +0100 Subject: gentoo auto-resync : 21:04:2024 - 12:05:28 --- net-libs/Manifest.gz | Bin 31832 -> 31832 bytes net-libs/gnome-online-accounts/Manifest | 3 - .../b9638e2418408be4906752297e700506766dcf20.patch | 25 -- .../gnome-online-accounts-3.48.0.ebuild | 83 ------- net-libs/gupnp/Manifest | 2 - net-libs/gupnp/gupnp-1.6.5.ebuild | 77 ------ net-libs/libsignon-glib/Manifest | 2 +- .../libsignon-glib/libsignon-glib-2.1-r2.ebuild | 4 +- net-libs/webkit-gtk/Manifest | 7 - .../files/2.42.1-arm64-non-jumbo-fix.patch | 38 --- .../webkit-gtk/files/2.42.4-wasm-assert-fix.patch | 53 ---- .../webkit-gtk/files/2.42.5-x86-build-fix.patch | 33 --- net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 272 --------------------- net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 265 -------------------- net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 262 -------------------- 15 files changed, 3 insertions(+), 1123 deletions(-) delete mode 100644 net-libs/gnome-online-accounts/files/b9638e2418408be4906752297e700506766dcf20.patch delete mode 100644 net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild delete mode 100644 net-libs/gupnp/gupnp-1.6.5.ebuild delete mode 100644 net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch delete mode 100644 net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch delete mode 100644 net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index dff9a0fce67a..2d85ce6cce79 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest index 2fa7ed5966b4..70d4ad90b7af 100644 --- a/net-libs/gnome-online-accounts/Manifest +++ b/net-libs/gnome-online-accounts/Manifest @@ -1,6 +1,3 @@ -AUX b9638e2418408be4906752297e700506766dcf20.patch 696 BLAKE2B 5a5cde5acee207004703ecc898e20f80b056258555520ac12103d4951e688fd9248de51369e2f6090bbdab377790db557037f3dc8cc84f564d328cc74c7ae1d0 SHA512 d974f9e7b119ce04204785a4e71878f74ce7ffc37b36a04abdc683bb5edcedb653060f95d9016b220c52353cefb46fb94b357b95fac16c17138714ecce349e2d -DIST gnome-online-accounts-3.48.0.tar.xz 382964 BLAKE2B 9b64329415118ca3d44f4662db31d82f262c27b4d8cda8ba9eb05b8e606081ae3eb06b5bf691c165b9bb7cf984fdeba8389390d72a4b3595a7d39b1d6ea11df1 SHA512 67e6c39d38187dc58175f6b694c66a92d9b9152b179db41ee05a8c512db5b16f1dd1eb1503c7d732b09126942abc00206ba956f7a54c6ae7a285a9e3101be7a5 DIST gnome-online-accounts-3.48.1.tar.xz 383124 BLAKE2B a9e18bf034454429a84be0920110f4d74fba9462fb1f7f23e74f304e963323413d99af2d84caa9ef1c6841917f5b8249ac94dc433ba04546f2ae23d6268dcd70 SHA512 8f191994b8f38bee4b922b10b94e96d6f7cb323de0e9a1f29febea848cb2002320357262ccf6f28839e32e9216faeb28a871f878e1ad9478c61650fdd3549737 -EBUILD gnome-online-accounts-3.48.0.ebuild 2001 BLAKE2B 31777257e4d72208c86dc295a7941f942aa9e35ca7b5507561dfd10a1045fb7c632e0c2926d08e903a2d30fa4524153c367fb0980db9a24c10a62d4319364e5f SHA512 833d108ad7a5b4eb530218f7981a1d60bc3fca5cfeab583a7df877d03589218a7a7dfb0ff5bbab5ea981822f66c2ac2ab3894d172af753eeb425bb76a2a9813a EBUILD gnome-online-accounts-3.48.1.ebuild 1893 BLAKE2B 02d3810304f050b48df6e17c770aac35dddfb09e175b2c5be1eed4eab39a758256c4986f1626ff8e9d1ae3e1d35a525fa13b74118f0a7cca375a568a89423b2f SHA512 29cc129d6f0c88c5c720022f5ed5052b019cf7e1c9d3b95c7f2702f481e05bdb1946c51744a147442aeefd8d6a8dadb1e1c70ae352e82305b6f12a93f21c61ae MISC metadata.xml 497 BLAKE2B c9f25a548f7d6c51efc6dcd12d2c23ce4121621bccd62b0dd29ea9c83170eb5d91ccdb208362c7d4a246207162bc34f5c9f447baaa079b46a848c64ba26ee9a7 SHA512 9950752a3f1465eca98bc46d691ec3105f9d6806449923189884028e4d591977b2840f515348b948985cc75ec9e389155d4a54c2a460e4fc6c757ca30ad466bc diff --git a/net-libs/gnome-online-accounts/files/b9638e2418408be4906752297e700506766dcf20.patch b/net-libs/gnome-online-accounts/files/b9638e2418408be4906752297e700506766dcf20.patch deleted file mode 100644 index 233e96966f84..000000000000 --- a/net-libs/gnome-online-accounts/files/b9638e2418408be4906752297e700506766dcf20.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9638e2418408be4906752297e700506766dcf20 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= -Date: Fri, 24 Nov 2023 16:19:47 +0100 -Subject: [PATCH] goabackend: Fix build with libxml2 2.12 - -libxml/xmlIO.h no longer includes libxml/parser.h. ---- - src/goabackend/goaewsclient.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/goabackend/goaewsclient.c b/src/goabackend/goaewsclient.c -index 4cb23581..01a52d14 100644 ---- a/src/goabackend/goaewsclient.c -+++ b/src/goabackend/goaewsclient.c -@@ -27,6 +27,7 @@ - #include - - #include -+#include - #include - - #include "goaewsclient.h" --- -GitLab - diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild deleted file mode 100644 index f5fe62b36550..000000000000 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala xdg - -DESCRIPTION="GNOME framework for accessing online accounts" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" - -LICENSE="LGPL-2+" -SLOT="0/1" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc x86" - -IUSE="debug gnome gtk-doc +introspection kerberos man +vala" -REQUIRED_USE="vala? ( introspection )" - -# libsoup used in goaoauthprovider -# goa kerberos provider is incompatible with app-crypt/heimdal, see -# https://bugzilla.gnome.org/show_bug.cgi?id=692250 -# json-glib-0.16 needed for bug #485092 -RDEPEND=" - >=dev-libs/glib-2.67.4:2 - sys-apps/dbus - introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) - >=x11-libs/gtk+-3.19.12:3 - >=net-libs/webkit-gtk-2.33.1:4.1 - >=dev-libs/json-glib-0.16 - >=app-crypt/libsecret-0.5 - >=net-libs/libsoup-3.0:3.0 - dev-libs/libxml2:2 - >=net-libs/rest-0.9.0:1.0 - kerberos? ( - app-crypt/gcr:0=[gtk] - app-crypt/mit-krb5 - ) -" -# goa-daemon can launch gnome-control-center -PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )" - -DEPEND="${RDEPEND} - vala? ( $(vala_depend) ) - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.30.0 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - dev-libs/gobject-introspection-common - gnome-base/gnome-common -" -BDEPEND="gtk-doc? ( dev-util/gtk-doc )" - -PATCHES=( - # Backport fix for libxml2 2.12 - "${FILESDIR}"/b9638e2418408be4906752297e700506766dcf20.patch -) - -src_prepare() { - default - use vala && vala_setup -} - -src_configure() { - # TODO: Give users a way to set the G/FB/Windows Live secrets - local emesonargs=( - -Dgoabackend=true - -Dinspector=false - -Dexchange=true - -Dfedora=false - -Dgoogle=true - -Dimap_smtp=true - $(meson_use kerberos) - -Dlastfm=true - -Dmedia_server=true - -Downcloud=true - -Dwindows_live=true - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - -Dman=true - $(meson_use vala vapi) - ) - meson_src_configure -} diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest index 2f7eac6465b2..89ccbb0f0c6f 100644 --- a/net-libs/gupnp/Manifest +++ b/net-libs/gupnp/Manifest @@ -2,9 +2,7 @@ AUX gupnp-1.4.3-libxml2-2.12.patch 1633 BLAKE2B 25ba13c651219dcd19ea293ac1c7fb4e AUX gupnp-1.4.3-meson-1.2.0-fix.patch 280 BLAKE2B f1f9a4125ebb98949438beec3746c1b0752a4b6911f965b2bc5d4ed5057d891506b0b0b9a52cd7f1868f67c6ddcaa145676154653cde7af26035d609bb0dc9ef SHA512 27570f138d5256ca9e0801d1f43d6e8f3e6f965c95b9aad429babaf078f4bdc1311f51da8c7485fc7f7b6adb0da924eb177b6bfbfbc81e46e6821ccc3f923ab4 AUX gupnp-1.6.6-libxml2-2.12.patch 1560 BLAKE2B 3260eae7d363b58d8e1a2a244e6d55942ae78dfd9a2937b2115d96aa92e2eb8be2ded71e6e5185e9734d9694908cf787db6b82de0018e33ab51813c4fe7f1913 SHA512 7bfcc60c69cc56aa8ce1c01613d8281d6b3fbb179da2f89fccc2205270b29b1220ece4a9be6f9fc06dde047fce7fbdf156010edf5880ff47e882008351166ffb DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb -DIST gupnp-1.6.5.tar.xz 163380 BLAKE2B 92c29db56a0fe9596bb0c523fc31be0783d6cf95b1926868a6e8a5e95ed9e28aa04ddf0f6740681995244c5020cfddb9b8ab8aeaf2baeb622185aa3a76a2986e SHA512 c34def9accb0984e17298156b7d325eebd89cc0f0f9568740b15f20a05ce523c8f97b5cc98cee1245c0bdea0a5b4fe97878b810c3325239d87d7d577cd0742a5 DIST gupnp-1.6.6.tar.xz 245860 BLAKE2B 9cf9bb4a61e224f74aff18fb4d4491f7e9cb36cf812709b74a8c08581954d82c3c6e59d2b46cac517685a0d191846fbdb6690ac79cebc77a26b6a7d1347f3ae0 SHA512 6721f7dfda273074255e1b418d244eba72a24976e1407fdbaf24fd15a8c15a7a6d389690131563aa1f3b15fdeefb2e100da494c04c6c8e29201d402f072fcbe6 EBUILD gupnp-1.4.3.ebuild 2328 BLAKE2B 551160f7d1ce7ed984fc20273f83ee3bfa952bd3045dbac39be2a8e70c5eb20c724e5bbf05f81dde0c8b1a0da77ff153e1f369e34509a4eb0629e109d32c2d9e SHA512 9657d0fcfecb5cb110970db70bf701426e2d71420b3c1a93a6a2a8de197c6cbb9b5c11403d9b556354eedf8d5074ea5f30823167e7a2c2cdd6a5540819624031 -EBUILD gupnp-1.6.5.ebuild 2295 BLAKE2B 5cd3b1b0b034043c19d967f0ab1440e5642ed30a6ddbed0e12d27f415e5f7f580bb8edf3bc43307410458ba0d67efcaf268e5df2e4580fc427a1b0d2615046fd SHA512 31d4f5f15886acf5d1c98df9959983ccdb7bfa8a83acc19446fc123cd398b4c3d111eaab42f3f4a4dea455977320d0f6c62031e8d64c1ae0e0657ee88383a477 EBUILD gupnp-1.6.6.ebuild 2354 BLAKE2B cd9842d3efd882e071b73bcebdb60a41e33ba51cc7cc6e9ffba44899f8937adcbede6f2dea4d058dfe82d474a829a1dac1ee999b9147b5f210be3698b58f8ab2 SHA512 204adcedc2b935620be213c4830e04490d972778482b4fcb3da048e14b5a44a8e57d6ea21da0c774e98df7f6931ec27e085f6c1398281c20693d2a31be2fea79 MISC metadata.xml 346 BLAKE2B c0c2d7c5a0f1906cc1789a30daec476919e7332f2a8aed9ec78e824be2776e7a18202b8fe19e519340cc9437d4147e223eb6830460c2a4c499cd483c77524cd5 SHA512 84998e9f5ebf374d1bfea85f7eb4b89f8459ee62ec89dc8b9bd36de354a307ad854cd7521eecd31b410659d5128a4dd9545ab7037eb5b7f8b41efdb8054b9b2c diff --git a/net-libs/gupnp/gupnp-1.6.5.ebuild b/net-libs/gupnp/gupnp-1.6.5.ebuild deleted file mode 100644 index ce3ed15b7941..000000000000 --- a/net-libs/gupnp/gupnp-1.6.5.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="xml(+)" - -inherit gnome.org meson-multilib python-single-r1 vala xdg - -DESCRIPTION="An object-oriented framework for creating UPnP devs and control points" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp" - -LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+ -SLOT="1.6/1.6-0" # - -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" - -IUSE="connman gtk-doc +introspection networkmanager +vala" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( connman networkmanager ) - gtk-doc? ( introspection ) -" - -# prefix: uuid dependency can be adapted to non-linux platforms -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}] - >=net-libs/gssdp-1.6.2:1.6=[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}] - >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - virtual/pkgconfig - !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) - vala? ( $(vala_depend) - >=net-libs/gssdp-1.5.2:1.6[vala] - net-libs/libsoup:3.0[vala] - ) -" - -src_prepare() { - default - use vala && vala_setup - - # This makes sense for upstream but not for us downstream, bug #906124. - sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die -} - -multilib_src_configure() { - local backend=system - use kernel_linux && backend=linux - use connman && backend=connman - use networkmanager && backend=network-manager - - local emesonargs=( - -Dcontext_manager=${backend} - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - $(meson_native_use_bool gtk-doc gtk_doc) - -Dexamples=false - ) - meson_src_configure -} - -multilib_src_install_all() { - python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6 - if use gtk-doc ; then - mkdir "${ED}"/usr/share/gtk-doc || die - mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die - fi -} diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest index f9c2e5f54bce..6357011a66cc 100644 --- a/net-libs/libsignon-glib/Manifest +++ b/net-libs/libsignon-glib/Manifest @@ -1,5 +1,5 @@ AUX libsignon-glib-2.1-docs-optional.patch 693 BLAKE2B 7a03207ee21e674b89e5b6203d000b4657e49283ff4ba28515b7a814092aafa8b6ce373a932d7ba8ce8f11b37ec4923cbe223265eb96093a06a4fc699364f8f6 SHA512 280d54782c2390456caabb6a7a590349d0b4ff29d0490fda6c9b8d140b229548f6a4d4bd3553f16c5bf57055f3bc61996161cce99963d317dc21f82efe6eeeb3 AUX libsignon-glib-2.1-meson-0.61.patch 1027 BLAKE2B 83f70af857671b42287b556931fa8edc7a2253842868e704b7a0b56e1d538d60e3f81909455a0912256102e80eeac2a72f44c535bef0709953e1bced14187354 SHA512 13ef68824ab388ac20873bfbef61182ee71e5793f9ac19c53bd2c7bf539aec78998786134b2552e99d6c8b6eb546a14dc08836cea797626f01ec97084b66251e DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf -EBUILD libsignon-glib-2.1-r2.ebuild 2055 BLAKE2B cf0bdd559b599ab4c374d2bcf6e380a078a5fb3dc6e9d3dc3ae1a1be36eb5de634b58e727170545fc7f1cceaa7d22ac16f550048c2cc9e04efaddf7c9b91fdaa SHA512 5cb07c206540ec756f14cc92699054757a258c742f88cc13fe76d9d65f3bfad2311ed099d2c3c2453e12d06e4fc9da92553fae73a4ec04bbbbc7d64682703a51 +EBUILD libsignon-glib-2.1-r2.ebuild 2055 BLAKE2B ee48514514bc191ed87b095d03d9dd31cb744f744c78a071806da8c0630a3f2b0dce8219046cc83c954e36a57a2b87a21d41cd508e3ea9524a1b61d2d51784c9 SHA512 b1c9ecd081e7dfd081fadbcf8807c41db5428501a0ce24f868918afbedefb3418839dc4372b5a2b7c1e900a8c5d35b6042976eca9035f139d76e077d2a988a84 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild index db53f2f42860..84711961b404 100644 --- a/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild +++ b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit meson python-r1 vala DESCRIPTION="GLib binding for the D-Bus API provided by signond" diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index aafe33c218d0..89fc10d96e97 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,14 +1,7 @@ -AUX 2.42.1-arm64-non-jumbo-fix.patch 1491 BLAKE2B 2902c8f26730fe92c3604ef264ed4bfc9b88d39fdc0f9babb9d48849840167b9d52eb45d20d8e4ea4a3363a8a3bb6b89a5a1ae32a24a0f9a0e86581c3c6d3d6e SHA512 f9be3b4bc29a8c7ae81e4cd5e817e52de409694db72303a255ee8660a1157b8392e3b9d8ff65a9ed84ee762b6b8b007aa2bf3811bba2276352182101097657d8 AUX 2.42.3-arm64-non-jumbo-fix-925621.patch 1025 BLAKE2B 6a9641b4c05b62c143b2be5ed1d2d8563839466d56831b4dcba503c8892848155f753b0c892407882e41d9cdebd418eff68b94918ed098526813feb1cb87c435 SHA512 238531fe2cc6dff154527abafb8d9c3f0586a82122675d763a440d8dd58162840ebd0539b2ca5c797b203707b4b4470207e509f050220881bc5474660b057ab7 -AUX 2.42.4-wasm-assert-fix.patch 1631 BLAKE2B fe7272f849a816e85440ac3df0d33338ec1335e1b55508ea910be02ce103ea8907d401f8553761514d42164e1d771391abe7bcbcd18765358255569fd70e50f1 SHA512 83b1737e232d09128f18cc9662fc6d614bb1274f53d839fbf4048d5e4160b71a880229b46e6e99e914db93a936415d805821fbc82beb9b2ee54f6505a8ebe395 -AUX 2.42.5-x86-build-fix.patch 1375 BLAKE2B 0ce7224b81fbcf6602845cc5ba454c6e2c86301fb9b075c435308e420c42ed907fec18ef8e0c4e00f2b78cf3776531d9092f6c62fa176f149d21713da6fc52ee SHA512 aad29eecab37d12a983aa5748c08761458769643d1c9cd87c017c58a4ac00c0c6f3cf7f04d0b30e846485def9414a75a46f29256ca7a7dec89aa25b081b6f1dd AUX 2.44.1-branch-patchset.patch 11288 BLAKE2B 0966d524063bc6137464eca431d161ac3b8ec0687f5cb2fa318d95734ceebd6bf9a4bef8db39b135f02a5e64ab453a9e74b3484db1411cf8ad85292d9d4cf034 SHA512 7f2420e49e085fecd630a62866ba2df0470e89f5bf92251436e9aca55200a158b96e866bf15bef283abf4b81d484d9747368fcd3ed2c58d0650aee1df9d9cd52 AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802 -DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516 SHA512 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169 -EBUILD webkit-gtk-2.42.5-r410.ebuild 8354 BLAKE2B b9d9d8f58c0e1d0f5676c1f1ec30aa8967f84cc9cc7f12422d61120c4bea9fe1f8bf0aaf4f4ebbb0ec71b3d9146f4444dd513d5ea7e5de6df37658a511843c17 SHA512 079ccfa5fde801f5d9ae5eebb98d624f488f5d4ea04e64a029e3e3bde3df1cf7df5b067c740063070f1b35c200c5965ec72444bd75f5969154db25aab7806db7 -EBUILD webkit-gtk-2.42.5-r600.ebuild 8251 BLAKE2B c64822cc8aebe1fc31fe70a43a34261d7ee121a3f518e1d5e2cbfb91b9e41717196377de57535f8aa547be689f082de653643a4f1f7e8e5c36ce8f5af5276aeb SHA512 d6dc05ee61b7bb0e6db90671337b5436ecc3884e94a8e750f4c55e2b06339dbbe92904d0d1cf515303ca4e2809b3464eda70c16954a90bf9d9569bab9b358a5d -EBUILD webkit-gtk-2.42.5.ebuild 8080 BLAKE2B ec3c77f34c528e4e81e6a292db60f69bd6ea31ee3cfaea3c4ea91e9196bac5c18b663821ec5a403968d7219bf3f0e54429d9d598502afadb4b173703237971bc SHA512 db29fb92f5cdba3aef6e60dbd7d29580403ca93c095e7d022d39b8c8d5978536002fc23549fc73e0993c2430beae79101bed2a13832c1c7f7b06701838296e39 EBUILD webkit-gtk-2.44.1-r410.ebuild 8153 BLAKE2B 06c69a117128b5489925c4ee7d373d4152679155a30b83472e3c382be96fda4ec19322f3b73ce7a9524f5be61db71b6fe126876817777be22ba9844de84d2854 SHA512 1af3eabd3e18786bc027eb72168b03ccacec24daddfc9eeaf886d97bbf6ab29d7a5039e191d5ebf9fe156cc069ca9c57b09f58f3955f5b8905ffe2f1188ddb58 EBUILD webkit-gtk-2.44.1-r600.ebuild 8846 BLAKE2B e95a70b739d0df8e85414c8ed3c16d70cb40fe6bddb8f41bc4322f02ac9f8d88197d8687ba555b1d071e44851c85545e75d898d865361ea74e55375eac498d4d SHA512 287c81e077b8ad094823fa4a8cbaad7a8d3b6fbbf3d6bfe62c05a9509502abebdf1421b1e31427a6a959a5d3e6bcb5ff9292b773b7aa3b05c7e7d5b1f3151060 EBUILD webkit-gtk-2.44.1.ebuild 8001 BLAKE2B 1ecfff526fca6a304d9334a095f031a59d619645b5dcd6fdc8b2f9024af99e82e0a0fbd790b702894780fad3612971dad37257cd10dcd2ceb1ef75fb010723fc SHA512 9a08a2ff8248c40751d7ff5b6bee72d214ed86cbf7c6c00cac87b24d184dba07d618f329efd31026a2291ae9cb29393eb0f078f875b54dd381e2d061c5ff6df1 diff --git a/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch deleted file mode 100644 index ec05d647d7f8..000000000000 --- a/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c5e664167ec74b24a9082506fe17dee1ea194185 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Wed, 18 Oct 2023 13:08:30 +0300 -Subject: [PATCH] [JSC] Fix Air OptimizePairedLoadStore missing header includes - -Reviewed by NOBODY (OOPS!). - -Fixes compile errors with non-unified build by adding missing include files for -single unit compilation. -Fixed compilation errors: - -error: incomplete type 'JSC::CCallHelpers' named in nested name specifier -error: function 'JSC::B3::Air::Inst::forEachDefWithExtraClobberedRegs' is used but not defined in this translation unit, and cannot be defined in any other translation unit because its type does not have linkage - -* Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp ---- - Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -https://github.com/WebKit/WebKit/pull/19242 - -diff --git a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp -index e6fc4d116d00..8321ba03822a 100644 ---- a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp -+++ b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp -@@ -32,7 +32,9 @@ - #include "AirArgInlines.h" - #include "AirCode.h" - #include "AirInst.h" -+#include "AirInstInlines.h" - #include "AirPhaseScope.h" -+#include "CCallHelpers.h" - #include - - namespace JSC { namespace B3 { namespace Air { --- -2.42.0 - diff --git a/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch b/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch deleted file mode 100644 index da54b9b9a0e2..000000000000 --- a/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 509b303bf5650710bee5e151decc1a723a54657f Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Tue, 2 Jan 2024 12:25:20 -0800 -Subject: [PATCH] Source/JavaScriptCore/wasm/generateWasm.py: return value in - int for memorybits - -https://bugs.webkit.org/show_bug.cgi?id=266942 - -Reviewed by Justin Michaud. - -The assert function currently checks, if power number raised to the -number fits memorybits. This seems not always work on every system, -as it happens, that the float numbers are not correctly rounded. - -This patch adds an int, so its being rounded to a full number and works -on my system, where otherwise the rounding would fail. The return method -also returns the result as an int. - -Example: -import math - -2 ** 3 -= 8 - -2.0 ** 3.0 -= 7.999999999999999 - -int(2.0) ** int(3.0) -= 8 - -2 ** int(3.0) -= 8 - -Signed-off-by: Conrad Kostecki -Canonical link: https://commits.webkit.org/272577@main ---- - Source/JavaScriptCore/wasm/generateWasm.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/JavaScriptCore/wasm/generateWasm.py b/Source/JavaScriptCore/wasm/generateWasm.py -index 434223d346a0..7a99210b60a2 100755 ---- a/Source/JavaScriptCore/wasm/generateWasm.py -+++ b/Source/JavaScriptCore/wasm/generateWasm.py -@@ -136,5 +136,5 @@ def memoryLog2Alignment(op): - if not match: - print(op["name"]) - memoryBits = int(match.group(2) if match.group(2) else match.group(1)) -- assert 2 ** math.log(memoryBits, 2) == memoryBits -+ assert 2 ** int(math.log(memoryBits, 2)) == memoryBits - return str(int(math.log(memoryBits / 8, 2))) --- -2.43.0 - diff --git a/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch b/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch deleted file mode 100644 index f5f4120f06cc..000000000000 --- a/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Feb 2024 11:00:49 -0600 -Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= - =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= - =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= - =?UTF-8?q?=3D268739?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unreviewed build fix. Seems a backport went badly, and we didn't notice -because the code is architecture-specific. - -* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: -(JSC::CLoop::execute): ---- - Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 5064ead6cd2e..9a2e2653b121 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild deleted file mode 100644 index b41dc9910b2a..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..12} ) -USE_RUBY="ruby30 ruby31 ruby32 ruby33" - -inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org" -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" - -LICENSE="LGPL-2+ BSD" -SLOT="4.1/0" # soname version of libwebkit2gtk-4.1 -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" - -IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X" -REQUIRED_USE="|| ( aqua wayland X )" - -# Tests do not run when built from tarballs -# https://bugs.webkit.org/show_bug.cgi?id=215986 -RESTRICT="test" - -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is -# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -# TODO: gst-plugins-base[X] is only needed when build configuration ends up -# with GLX set, but that's a bit automagic too to fix -# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary -RDEPEND=" - >=x11-libs/cairo-1.16.0[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-61.2:= - media-libs/libjpeg-turbo:0= - >=media-libs/libepoxy-1.4.0 - >=net-libs/libsoup-3.0.8:3.0[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3 - sys-libs/zlib:0 - >=app-accessibility/at-spi2-core-2.46.0:2 - media-libs/libwebp:= - - >=dev-libs/glib-2.70.0:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.20:1.0 - >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] - media-libs/gst-plugins-base:1.0[opengl] - >=media-plugins/gst-plugins-opus-1.20:1.0 - >=media-libs/gst-plugins-bad-1.20:1.0 - ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt - ) - - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - jpegxl? ( >=media-libs/libjxl-0.7.0:= ) - avif? ( >=media-libs/libavif-0.9.0:= ) - lcms? ( media-libs/lcms:2 ) - - media-libs/mesa - media-libs/libglvnd - wayland? ( - >=dev-libs/wayland-1.15 - >=dev-libs/wayland-protocols-1.15 - >=gui-libs/libwpe-1.5.0:1.0 - >=gui-libs/wpebackend-fdo-1.7.0:1.0 - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) - - systemd? ( sys-apps/systemd:= ) - gamepad? ( >=dev-libs/libmanette-0.2.4 ) - != 5 for C++17-specific compiler flags" - fi - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - gnome2_src_prepare - - # Fix USE=-jumbo-build compilation on arm64 - eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch - eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch - # Fix assert failure on some machines, bug #920704 - eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch - # Fix compilation on x86, bug #924873 - eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007) - filter-lto - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") - fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - local RUBY - for rubyimpl in ${USE_RUBY}; do - if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then - RUBY="$(type -P ${rubyimpl})" - ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found" - # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly - # so it doesn't respect RUBY_EXECUTABLE, bug #771744. - sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die - - # TODO: Check Web Audio support - # should somehow let user select between them? - - local mycmakeargs=( - -DPython_EXECUTABLE="${PYTHON}" - ${ruby_interpreter} - # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy - -DPORT=GTK - # Source/cmake/WebKitFeatures.cmake - -DENABLE_API_TESTS=OFF - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DENABLE_GAMEPAD=$(usex gamepad) - -DENABLE_MINIBROWSER=$(usex examples) - -DENABLE_PDFJS=$(usex pdf) - -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service) - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_VIDEO=$(usex gstreamer) - -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer) - -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer) - -DENABLE_WEBDRIVER=ON - -DENABLE_WEBGL=ON - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DUSE_AVIF=$(usex avif) - # Source/cmake/OptionsGTK.cmake - -DENABLE_DOCUMENTATION=OFF - -DENABLE_INTROSPECTION=$(usex introspection) - -DENABLE_JOURNALD_LOG=$(usex systemd) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_GBM=ON - -DUSE_GTK4=OFF - -DUSE_JPEGXL=$(usex jpegxl) - -DUSE_LCMS=$(usex lcms) - -DUSE_LIBHYPHEN=ON - -DUSE_LIBSECRET=$(usex keyring) - -DUSE_OPENGL_OR_ES=ON - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_SOUP2=OFF - -DUSE_WOFF2=ON - ) - - # https://bugs.gentoo.org/761238 - append-cppflags -DNDEBUG - - WK_USE_CCACHE=NO cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/gtk-doc/html - # This will install API docs specific to webkit2gtk-4.1 - doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*} -} - -pkg_postinst() { - optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue" - optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta" - optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash" - optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild deleted file mode 100644 index 9e1a4792fde3..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..12} ) -USE_RUBY="ruby30 ruby31 ruby32 ruby33" - -inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org" -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" - -LICENSE="LGPL-2+ BSD" -SLOT="6/0" # soname version of libwebkit2gtk-6.0 -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" - -IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X" -REQUIRED_USE="|| ( aqua wayland X )" - -# Tests do not run when built from tarballs -# https://bugs.webkit.org/show_bug.cgi?id=215986 -RESTRICT="test" - -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is -# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -# TODO: gst-plugins-base[X] is only needed when build configuration ends up -# with GLX set, but that's a bit automagic too to fix -# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary -RDEPEND=" - >=x11-libs/cairo-1.16.0[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=gui-libs/gtk-4.4.0:4[introspection?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-61.2:= - media-libs/libjpeg-turbo:0= - >=media-libs/libepoxy-1.4.0 - >=net-libs/libsoup-3.0.8:3.0[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3 - sys-libs/zlib:0 - >=app-accessibility/at-spi2-core-2.46.0:2 - media-libs/libwebp:= - - >=dev-libs/glib-2.70.0:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.20:1.0 - >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] - media-libs/gst-plugins-base:1.0[opengl] - >=media-plugins/gst-plugins-opus-1.20:1.0 - >=media-libs/gst-plugins-bad-1.20:1.0 - ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt - ) - - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - jpegxl? ( >=media-libs/libjxl-0.7.0:= ) - avif? ( >=media-libs/libavif-0.9.0:= ) - lcms? ( media-libs/lcms:2 ) - - media-libs/mesa - media-libs/libglvnd - wayland? ( - >=dev-libs/wayland-1.15 - >=dev-libs/wayland-protocols-1.15 - >=gui-libs/libwpe-1.5.0:1.0 - >=gui-libs/wpebackend-fdo-1.7.0:1.0 - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) - - systemd? ( sys-apps/systemd:= ) - gamepad? ( >=dev-libs/libmanette-0.2.4 ) - != 5 for C++17-specific compiler flags" - fi - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - gnome2_src_prepare - - # Fix USE=-jumbo-build compilation on arm64 - eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch - eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch - # Fix assert failure on some machines, bug #920704 - eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch - # Fix compilation on x86, bug #924873 - eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007) - filter-lto - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") - fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - local RUBY - for rubyimpl in ${USE_RUBY}; do - if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then - RUBY="$(type -P ${rubyimpl})" - ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found" - # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly - # so it doesn't respect RUBY_EXECUTABLE, bug #771744. - sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die - - # TODO: Check Web Audio support - # should somehow let user select between them? - - local mycmakeargs=( - -DPython_EXECUTABLE="${PYTHON}" - ${ruby_interpreter} - # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy - -DPORT=GTK - # Source/cmake/WebKitFeatures.cmake - -DENABLE_API_TESTS=OFF - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DENABLE_GAMEPAD=$(usex gamepad) - -DENABLE_MINIBROWSER=$(usex examples) - -DENABLE_PDFJS=$(usex pdf) - -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service) - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_VIDEO=$(usex gstreamer) - -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer) - -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer) - -DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1 - -DENABLE_WEBGL=ON - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DUSE_AVIF=$(usex avif) - # Source/cmake/OptionsGTK.cmake - -DENABLE_DOCUMENTATION=OFF - -DENABLE_INTROSPECTION=$(usex introspection) - -DENABLE_JOURNALD_LOG=$(usex systemd) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_GBM=ON - -DUSE_GTK4=ON # webkit2gtk-6.0 - -DUSE_JPEGXL=$(usex jpegxl) - -DUSE_LCMS=$(usex lcms) - -DUSE_LIBHYPHEN=ON - -DUSE_LIBSECRET=$(usex keyring) - -DUSE_OPENGL_OR_ES=ON - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_SOUP2=OFF - -DUSE_WOFF2=ON - ) - - # https://bugs.gentoo.org/761238 - append-cppflags -DNDEBUG - - WK_USE_CCACHE=NO cmake_src_configure -} - -pkg_postinst() { - optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue" - optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta" - optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash" - optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild deleted file mode 100644 index 823fcda8ef91..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..12} ) -USE_RUBY="ruby30 ruby31 ruby32 ruby33" - -inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org" -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 ~loong ppc ppc64 ~riscv ~sparc x86" - -IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X" -REQUIRED_USE="|| ( aqua wayland X )" - -# Tests do not run when built from tarballs -# https://bugs.webkit.org/show_bug.cgi?id=215986 -RESTRICT="test" - -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is -# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -# TODO: gst-plugins-base[X] is only needed when build configuration ends up -# with GLX set, but that's a bit automagic too to fix -RDEPEND=" - >=x11-libs/cairo-1.16.0[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-61.2:= - media-libs/libjpeg-turbo:0= - >=media-libs/libepoxy-1.4.0 - >=net-libs/libsoup-2.54:2.4[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3 - sys-libs/zlib:0 - >=app-accessibility/at-spi2-core-2.46.0:2 - media-libs/libwebp:= - - >=dev-libs/glib-2.70.0:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.20:1.0 - >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] - media-libs/gst-plugins-base:1.0[opengl] - >=media-plugins/gst-plugins-opus-1.20:1.0 - >=media-libs/gst-plugins-bad-1.20:1.0 - ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt - ) - - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - jpegxl? ( >=media-libs/libjxl-0.7.0:= ) - avif? ( >=media-libs/libavif-0.9.0:= ) - lcms? ( media-libs/lcms:2 ) - - media-libs/mesa - media-libs/libglvnd - wayland? ( - >=dev-libs/wayland-1.15 - >=dev-libs/wayland-protocols-1.15 - >=gui-libs/libwpe-1.5.0:1.0 - >=gui-libs/wpebackend-fdo-1.7.0:1.0 - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) - - systemd? ( sys-apps/systemd:= ) - gamepad? ( >=dev-libs/libmanette-0.2.4 ) -" -DEPEND="${RDEPEND}" -# Need real bison, not yacc -BDEPEND=" - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gperf-3.0.1 - dev-util/unifdef - >=sys-devel/bison-2.4.3 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) - sys-devel/gettext - virtual/pkgconfig - - >=dev-lang/perl-5.10 - virtual/perl-Data-Dumper - virtual/perl-Carp - virtual/perl-JSON-PP - - wayland? ( dev-util/wayland-scanner ) -" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and -# gnome2_src_prepare, and both apply ${PATCHES[@]} -PATCHES=() - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++17 ; then - die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" - fi - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - gnome2_src_prepare - - # Fix USE=-jumbo-build compilation on arm64 - eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch - eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch - # Fix assert failure on some machines, bug #920704 - eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch - # Fix compilation on x86, bug #924873 - eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007) - filter-lto - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") - fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - local RUBY - for rubyimpl in ${USE_RUBY}; do - if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then - RUBY="$(type -P ${rubyimpl})" - ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found" - # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly - # so it doesn't respect RUBY_EXECUTABLE, bug #771744. - sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die - - # TODO: Check Web Audio support - # should somehow let user select between them? - - local mycmakeargs=( - -DPython_EXECUTABLE="${PYTHON}" - ${ruby_interpreter} - # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy - -DPORT=GTK - # Source/cmake/WebKitFeatures.cmake - -DENABLE_API_TESTS=OFF - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DENABLE_GAMEPAD=$(usex gamepad) - -DENABLE_MINIBROWSER=$(usex examples) - -DENABLE_PDFJS=$(usex pdf) - -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service) - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_VIDEO=$(usex gstreamer) - -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer) - -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer) - -DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1 - -DENABLE_WEBGL=ON - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DUSE_AVIF=$(usex avif) - # Source/cmake/OptionsGTK.cmake - -DENABLE_DOCUMENTATION=OFF - -DENABLE_INTROSPECTION=$(usex introspection) - -DENABLE_JOURNALD_LOG=$(usex systemd) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_GBM=ON - -DUSE_GTK4=OFF - -DUSE_JPEGXL=$(usex jpegxl) - -DUSE_LCMS=$(usex lcms) - -DUSE_LIBHYPHEN=ON - -DUSE_LIBSECRET=$(usex keyring) - -DUSE_OPENGL_OR_ES=ON - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_SOUP2=ON - -DUSE_WOFF2=ON - ) - - # https://bugs.gentoo.org/761238 - append-cppflags -DNDEBUG - - WK_USE_CCACHE=NO cmake_src_configure -} - -pkg_postinst() { - optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue" - optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta" - optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash" - optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls" -} -- cgit v1.2.3