diff --git a/1001-sw_64-arch-support.patch b/1001-sw_64-arch-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c04745582a7611b5568c544086cfb407ffc44ba --- /dev/null +++ b/1001-sw_64-arch-support.patch @@ -0,0 +1,25 @@ +From fc28e3dba8c33c201a671e487480f822c8b99bfb Mon Sep 17 00:00:00 2001 +From: lzq11122 +Date: Tue, 29 Jul 2025 14:45:58 +0800 +Subject: [PATCH 1/1] webkitgtk-add-loongarch-and-sw.patch + +--- + Source/WTF/wtf/dtoa/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 46b04529..b4ed5f31 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -88,7 +88,7 @@ int main(int argc, char** argv) { + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +- defined(__SH4__) || defined(__alpha__) || \ ++ defined(__SH4__) || defined(__alpha__) || defined(__loongarch64) || defined(__sw_64__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ +-- +2.43.5 + diff --git a/fix_code_error.patch b/fix_code_error.patch deleted file mode 100644 index 87d184146589396003d3a7f8cc9550bc0ddd3101..0000000000000000000000000000000000000000 --- a/fix_code_error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN webkitgtk-2.48.1/Source/WebCore/platform/audio/DenormalDisabler.cpp webkitgtk-2.48.1_bak/Source/WebCore/platform/audio/DenormalDisabler.cpp ---- webkitgtk-2.48.1/Source/WebCore/platform/audio/DenormalDisabler.cpp 2025-04-02 01:41:30.802833600 -0400 -+++ webkitgtk-2.48.1_bak/Source/WebCore/platform/audio/DenormalDisabler.cpp 2025-06-04 14:15:04.714509655 -0400 -@@ -91,7 +91,7 @@ - } - } - #else --DenormalDisabler::DenormalDisabler() = default -+DenormalDisabler::DenormalDisabler() = default; - DenormalDisabler::~DenormalDisabler() = default; - #endif - diff --git a/webkitgtk-2.48.1.tar.xz.asc b/webkitgtk-2.48.1.tar.xz.asc deleted file mode 100644 index 427f2489c3f5a129c7763dabbe38e01e661cd813..0000000000000000000000000000000000000000 --- a/webkitgtk-2.48.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmftAf8ACgkQbBAJtpOX -U5PdBg//TpfUIuSwl5OgwqsB8WNvrtCdGGwrYa3k9E9pp57KHLvlqNeDmToy/U9t -gAOIUIyIxgVBRgJQrcQW/NfPx49jd3ISt9h54A0c/MgIb4+4vsvoRz3pwX407+QR -7rZA72GA1im3u5+IWTGeeWzTGNQtvGbd1DzA6OpdvC0MRS2JAfYvgDHyAzaQu0Of -JZdMrZlwoaMeZDTKI+qV/ZY2mZ59xiD0ltRU6X1B7/YS2MEsqztO7FFWO/xuhdps -qIZF/jwuVfcGrI5JPVZzsf0V2RHmgF4j9rNEZwSxP8BkWfYQ+BjZI6gzKjVgDYED -6D70tf0+q9UqSSYaX0Wk2+IqaNiO09md4nYZJ1I6VLz8sm6AZTB2XXiWxB3hEuFO -j7Dk11I4DKPJjBHIQN/3kqutvRG5plyi4HIL2BzvnVstxrlTAocIFvhey1GOiLSu -UfX97ruyNECpwMIafxCsqOVAjg4wkf6df0yCJVokNRBunnsQPABjDXfhS7dDvE3B -6u2BIVudba2xEeMqqHZBrFAy4UXLcfJYnvvsBbPGFHibooCIuwd5VrTIVUE7bsI1 -QqEAlryx1grnyDN77aHri2bBK44aHMIix19kRgwdK8wcT3iz1vdUcgigcDYbD2Sc -0LGzxB5OY+jd7zvSczqNCX6Ll7W7dIgjR60nuVl4+yYNnzSM+EM= -=6kwl ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.48.1.tar.xz b/webkitgtk-2.48.3.tar.xz similarity index 78% rename from webkitgtk-2.48.1.tar.xz rename to webkitgtk-2.48.3.tar.xz index 026b5b0cc5ffab78c930cfdf121fba16d3e3d871..a8678c6ede58fe620af6ca3ca1ad466fb154d218 100644 Binary files a/webkitgtk-2.48.1.tar.xz and b/webkitgtk-2.48.3.tar.xz differ diff --git a/webkitgtk-2.48.3.tar.xz.asc b/webkitgtk-2.48.3.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..663f521a9128425ba055010d7d2c341fcac46485 --- /dev/null +++ b/webkitgtk-2.48.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmg26CoACgkQbBAJtpOX +U5N7Ng/9HAO3gM/ND9M8WW5/OChxZCZ7Xe88UBDd3ncNeDvIEsq/A3WeVId7yXpr +ta1ynsZM3ws/3zaEWNIXHoCDgDXeca0tYCiJN0VkFxXZqDpbgM8IaEZbF0HibdJA +/lX4YyF5mTvM1h0lTrdHpDHUxdqKRRNKX5VdlDdRSZyNAkJsP+ryeGudUW62MvP4 +VBXvK2ZSLdBFTY+ddc02MOaGKg6ToVo2PMQtDMJd4ujjQZ+F2H66Cbp4lthdx8JA +skcfHbVjsqLsUwBPtmYIEueIYn0x8mwyxS9ZIkVtsC2sMS9KyLOv5Tzig7VDaGJy +YcrVWUWc5OSKa23QZrCWqIkYyhlTGlhmcVHgO3C9mXjmAt8EGycrSW4HWFMeq6d6 +pz7otK0ZGWqaJVybpJcJ4QtLn5i+qf4wEIotQIBwOnb3EZiJ4aKpy5B+auS9q+xl +xpHP7eEl8r+R0CywwWYHFVRJn22jYSzcD5rF8lp3B4vj2Pn8sWN95ineUHICp9um +8Z4DRDjhwmOgtg4Fsnp0ZOLCqsYua7psJQ24RZ8MTxzReGbX7kOlE9l2IvsPoiR/ +9ENPaYChpeChaIlv1RsyvX785wl8mFxZLrxGG3JXf0kcDLd5SQ1xv2W0n4zqrzvO +zj2Yozkv/BdXPXiWuhCIF69qIlgxs2UM6f8AJfJ5/StDoPpY2aQ= +=3Phy +-----END PGP SIGNATURE----- diff --git a/webkitgtk.spec b/webkitgtk.spec index f985be9247fbc2d870f5ca0cc3e1ac98165aebaa..cc723591003aaf5c5ee093dbd94a635e8b5c256c 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their @@ -7,7 +7,7 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') -%ifnarch riscv64 loongarch64 +%ifnarch riscv64 loongarch64 sw_64 %global _lto_cflags %{nil} %endif @@ -16,7 +16,7 @@ %global with_gamepad 0 Name: webkitgtk -Version: 2.48.1 +Version: 2.48.3 Release: %{anolis_release}%{?dist} Summary: GTK web content engine library @@ -26,8 +26,8 @@ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc Patch01: riscv-use-unknown-cpu.patch -Patch02: fix_code_error.patch - +#Patch02: fix_code_error.patch +Patch03: 1001-sw_64-arch-support.patch BuildRequires: bison BuildRequires: bubblewrap @@ -125,7 +125,7 @@ Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) Provides: bundled(pdfjs) Provides: bundled(xdgmime) -%ifnarch loongarch64 +%ifnarch loongarch64 sw_64 Provides: bundled(skia) %endif Obsoletes: webkit2gtk5.0 < %{version}-%{release} @@ -147,7 +147,7 @@ Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) Provides: bundled(pdfjs) Provides: bundled(xdgmime) -%ifnarch loongarch64 +%ifnarch loongarch64 sw_64 Provides: bundled(skia) %endif @@ -233,6 +233,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %autosetup -p1 -n webkitgtk-%{version} %build +# /bin/cp -v /builddir/utils.h Source/WTF/wtf/dtoa/utils.h # Increase the DIE limit so our debuginfo packages can be size-optimized. # This previously decreased the size for x86_64 from ~5G to ~1.1G, but as of # 2022 it's more like 850 MB -> 675 MB. This requires lots of RAM on the @@ -243,6 +244,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %global _dwz_max_die_limit_aarch64 250000000 %global _dwz_max_die_limit_riscv64 250000000 %global _dwz_max_die_limit_loongarch64 250000000 +%global _dwz_max_die_limit_sw64 250000000 # Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough. %global _find_debuginfo_opts %limit_build -m 32768 @@ -252,7 +254,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 # Cf. https://bugs.webkit.org/show_bug.cgi?id=245697 # Disable BTI until this is fixed upstream. -%ifarch %{ix86} riscv64 loongarch64 +%ifarch %{ix86} riscv64 loongarch64 sw_64 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif @@ -273,7 +275,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif -%ifarch loongarch64 +%ifarch loongarch64 sw_64 -DUSE_SKIA=OFF \ %endif %ifarch aarch64 @@ -295,7 +297,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif -%ifarch loongarch64 +%ifarch loongarch64 sw_64 -DUSE_SKIA=OFF \ %endif %ifarch aarch64 @@ -318,7 +320,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif -%ifarch loongarch64 +%ifarch loongarch64 sw_64 -DUSE_SKIA=OFF \ %endif %ifarch aarch64 @@ -326,6 +328,11 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %endif %{nil} +# /bin/cp -v /builddir/utils.h %{_vendor}-%{_target_os}-build/webkitgtk-6.0/WTF/Headers/wtf/dragonbox/detail/util.h +# /bin/cp -v /builddir/utils.h /builddir/build/BUILD/webkitgtk-2.48.1/Source/WTF/wtf/dtoa/utils.h + +%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 + %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 export NINJA_STATUS="[1/2][%f/%t %es] " %cmake_build %limit_build -m 3072 @@ -456,6 +463,10 @@ export NINJA_STATUS="[2/2][%f/%t %es] " %endif %changelog +* Tue Jul 29 2025 lzq11122 - 2.48.3-1 +- fix spec for add sw64 architecture +- update to 2.48.3 + * Tue Jun 24 2025 doupengda - 2.48.1-3 - add support for loongarch64