diff options
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r-- | net-libs/webkit-gtk/Manifest | 13 | ||||
-rw-r--r-- | net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch | 30 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 1 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 1 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild | 1 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 1 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 1 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild | 1 |
8 files changed, 43 insertions, 6 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 22067ed6b32b..87948a7f583f 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,11 +1,12 @@ AUX 2.38.3-gcc-13.patch 775 BLAKE2B 53d5c23f612ec6d9cb96f5c6d33e1a029120a2ca82d5e3833f910cf637cfe9cda0404f8bfd06601bbb04c36fefd77a1017ec764adba12b3fda0b3f6eed36168e SHA512 c83a769456c02991309c97cb9cb88e0e6335a22cf2c0fd30c3565740c9de316bb5c0e44768485193e28ec692ba3f0f0c0bb01c0e5ab62167a0540c8b1b1e8916 AUX 2.38.5-gcc-13.patch 1128 BLAKE2B 1ca6050cda18720060a90eedba3561d12b4af9d19093effef469a20ecaa1040cd5634621b63962e8a430a02d18800913a3af35e51b424c37cc233640f306f6ed SHA512 f83c027e015888f7852e86f4266a8db9a7dc94cbda82c0ded1e38a0306a047e02a5a4993c9573e6e1617aaaebb3830206336b01863d726cfa685415e689f1104 +AUX 2.40.0-respect-RUBY.patch 1447 BLAKE2B 2212d15e50362004349245ee75285d96951d2ca8d15a30b8a4b6707bea93ea0e12a5993ec88848085e4ec71ac835b5d87a18f26240e014a4cf3812ef2c8096f9 SHA512 430bad9af15922cb9e4b879694a5759f8e30c56b75b7d90d91ef96dabb94ae023dd80a87d436bef3d13bb3a0c7b971af9639f654a587886413e4ed5f355ccb51 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef DIST webkitgtk-2.40.0.tar.xz 40042140 BLAKE2B 4f26d893da99c7aed18594a844b1f91e32178a1bdd236e0cdd21683ed095ab2196f37c13f749e69b22b72146b98fca2a27778948aabde336d17c4d40dcf0cdc1 SHA512 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc -EBUILD webkit-gtk-2.38.5-r410.ebuild 8104 BLAKE2B 12ce4446fac010ab80024129f3445e7bb42943651ec745af807c3670dee4c2b5f737aeda1b20a29863ec6781ed0bc3a1008a1d787499b4a9f7ee4c1b4acb07be SHA512 899417ba2b5317a659b03214d4c0f3004fc6f40c830729c36f78a3e44290c4af36d8800a81d2420a0fc30899b767872819bb4f79892cccc4a2081bc3e2b98f8a -EBUILD webkit-gtk-2.38.5-r500.ebuild 7983 BLAKE2B 8d7c4b3cf1dc32b5d9e20feff6a3cfaa811d3c2ecd51538732a588d8ba894765a36ff8157b2fc8a0642788e03b4d6bfa4c68234cfd748f9b48bc0b2789d6ed6e SHA512 0ad81d601444a9a4f3ec9f707feddac680cdd4fde2886b01c87b58ca983ae0d48cdef83cbbdc38c84fb54172f5b38dec524b23869ba7d525cb0a45365042d407 -EBUILD webkit-gtk-2.38.5.ebuild 7830 BLAKE2B fa84ee044888e4e3247d3aa59afbbc56bddfa6cadee3658d51eafdea792a59be3a8029ac811e9c89aae41a1a8e15e382e18d68bb5483f67706f55967f7ceb4e3 SHA512 99730ff6c145ae42e562dbcd3a864f9ee4d1f408c7269d69043c11e61739ccd575c7017ef875047bae0fbefdf1271f88d745d325f83e932573cdfc2f22e5e4c4 -EBUILD webkit-gtk-2.40.0-r410.ebuild 7630 BLAKE2B cd407f958c96ae15cab64561a401460d5617f0f31ddeb262a18b9a31432d5aa2e4849aedd60719e3fa92c886e17d02c72368bb33ec2968bdd881bf0bb5f55209 SHA512 659aa28c1158be157820ebc5b3b0767207cc3c50f9e1dbe87672f6eaad6421efbae167affcb7b0a07a9a1ecc020cbe410b3c26afb053907af3014be701eea282 -EBUILD webkit-gtk-2.40.0-r600.ebuild 7509 BLAKE2B 299856be11f9682216622772b78921458698098988401131a8dbaa96545a06463766d20d6010da5d7f4fb0cc966ae0c64c04b2bc4c71175d8804b0f5952d4c4c SHA512 88b82bb721cf4dde3aefa4d3bc2eb85476f4859db0a781a8d84bdb54a00b02cc07e947f9394558808cccd09e2b559572733541d533616fef87c263f105e2fb12 -EBUILD webkit-gtk-2.40.0.ebuild 7356 BLAKE2B 80e92f9424132c55a8a589ddd51ee1a34be53966b69a58bdd03944fba18a54f174697d274d601113b643f431cd803f86b5ba1a9344de57f568ac9538befdda74 SHA512 ed60f95dd52803f6785349449bad1420cb6dda4c1f16b1e95f1b38bfe242dcfe40d4eb79a23c225c513463bb893c653f2b61796a57f2f2c6525fa7f17e1078cd +EBUILD webkit-gtk-2.38.5-r410.ebuild 8152 BLAKE2B e9925588c4443a717eb7ebb546751173450483434989a7873abfa38fd1b8c7f99a03b720d9ddf203e6e851269cf4d27718f89612aae325661e820616b32ce65b SHA512 8d57f629d4b9e75122bc150f40661c94bc86ebaa9e2a3ab11fa835575355441e2ed23885a5ea03c10a48fe7882c463666ca07d31e5309d3479f0efc8a76c308d +EBUILD webkit-gtk-2.38.5-r500.ebuild 8031 BLAKE2B 4875f2ba95e80bc258d45bf8491dab8714ebb5e20665541d1d8f322850e635ac9b8efb5bde41fa47224984279c32aa4c79f8091c2753aacd640627766b56d485 SHA512 751c5f7bb1609d6e2bfaccc31c5c4ef1ba90c6e784df02ab923d21aa180537f34fea3c5d686b9a3ca2cc0fd59419826efd39111e085a274bf40c7d04e3df55ca +EBUILD webkit-gtk-2.38.5.ebuild 7878 BLAKE2B 095e3729897708663abd5c83a5be334640da07ffc5ab44dc99aaf2dd74ecba18bc5afb3de55da3d686211548d6aa1ec32058098a18334b818f7da94de4dcc503 SHA512 139a7d99290f903b8cd517d739a8c553bc9e969de796f3abddeb437609d0b062382285679807417b62642f418a2b4f9c57e87aa7b177c0893330326b5149ab7d +EBUILD webkit-gtk-2.40.0-r410.ebuild 7678 BLAKE2B b06da39d8777bed865612ff88414e55a75b4f194835fff068cd3b6315607e0c9c4d6317e9bee8ae4eec7dd93cff927de6d00dcd157fbc3e5da073ee203d2931c SHA512 534135955ab0432d3d1b057c961218f37547483cf62a599e36a0b2fab3a1dec97b0cf601f0bab95885fc05d34a307152a30894aab9afc54e7e9db911e14784ec +EBUILD webkit-gtk-2.40.0-r600.ebuild 7557 BLAKE2B 2d4dd0cae88fb6178be8885e0a839eb51e715ba6ded7e931e44c67494d57977daac2ac3e3b46fc8ed1f67a12bb83254f7e8faedb6b133619bb22a5590cd77f94 SHA512 e7de2a6b96121587ef22c249b346b7018e1f787303c208283422963518c9a91858a19dde8bedf4f35d84d389e447a56e84512854375a1a70518eb39f836acdd7 +EBUILD webkit-gtk-2.40.0.ebuild 7404 BLAKE2B 26da7073109d0429c0165e690c8545cb64f81e00289deb5173f03624261c41ac2874b79fa3bc73ffcca41638e952f32f2b5c199f5aa3c15eec85bc3f670f6871 SHA512 7334887c189c11d76543e523952fae4a189634c15b9a8c2b4775af93bd856922bfc9debbc037f4f41c0227e5a4fa945c7abff2ce5f45b24f63a0fb49b6f2c6cc MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369 diff --git a/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch b/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch new file mode 100644 index 000000000000..058dbb36cb96 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/771744 +https://github.com/WebKit/WebKit/pull/12358 + +From 5cda2bac84e6900401810b56ba4de82de714cae0 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 4 Apr 2023 04:31:01 +0100 +Subject: [PATCH] postprocess-asm rule doesn't respect RUBY_EXECUTABLE + https://bugs.webkit.org/show_bug.cgi?id=254965 + +Reviewed by NOBODY (OOPS!). + +postprocess-asm is a Ruby script with #/!/usr/bin/env ruby as its shebang which +looks up Ruby in PATH. webkit, however, has RUBY_EXECUTABLE as a CMake option. +It's possible for the Ruby used by CMake (and the other rules during the build) +to be different to the first Ruby found in PATH. This makes the usage for postprocess-asm +consistent with other uses in webkit. + +* Source/JavaScriptCore/CMakeLists.txt +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1507,7 +1507,7 @@ endif () + if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP) + message(STATUS "Enabling asm postprocessing") + +- set(LowLevelInterpreter_LAUNCHER "${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm") ++ set(LowLevelInterpreter_LAUNCHER "${RUBY_EXECUTABLE} ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm") + get_target_property(PROP_RULE_LAUNCH_COMPILE LowLevelInterpreterLib RULE_LAUNCH_COMPILE) + if (PROP_RULE_LAUNCH_COMPILE) + set(LowLevelInterpreter_LAUNCHER "${LowLevelInterpreter_LAUNCHER} ${PROP_RULE_LAUNCH_COMPILE}") + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild index a9832445dcde..e153b458de45 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild @@ -156,6 +156,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/2.38.3-gcc-13.patch eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild index 8f393f7f4889..2ff1d54297c4 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild @@ -158,6 +158,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/2.38.3-gcc-13.patch eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild index f4bcc13e3e66..a845061cb588 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild @@ -154,6 +154,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/2.38.3-gcc-13.patch eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild index 91bd845a4163..ef3510d3d31e 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild @@ -145,6 +145,7 @@ src_prepare() { cmake_src_prepare gnome2_src_prepare eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild index 6d4bea0a0c88..520cc3925b2f 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild @@ -146,6 +146,7 @@ src_prepare() { cmake_src_prepare gnome2_src_prepare eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild index b6fa733b5b32..07c7e859bc5b 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild @@ -143,6 +143,7 @@ src_prepare() { cmake_src_prepare gnome2_src_prepare eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { |