diff options
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-non-arm-non-x86.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.48.2.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.48.1.bb) | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-non-arm-non-x86.patch b/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-non-arm-non-x86.patch deleted file mode 100644 index 2381acb1b0..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-non-arm-non-x86.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 8bee9eb95ae24c6a410f9cd614976f4653d020d9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
| 3 | Date: Wed, 2 Apr 2025 15:01:55 -0500 | ||
| 4 | Subject: [PATCH] REGRESSION(290945.129@webkitglib/2.48): Broke non-x86, | ||
| 5 | non-ARM builds https://bugs.webkit.org/show_bug.cgi?id=287662 | ||
| 6 | |||
| 7 | Unreviewed stable branch build fix. | ||
| 8 | |||
| 9 | * Source/WebCore/platform/audio/DenormalDisabler.cpp: | ||
| 10 | |||
| 11 | Canonical link: https://commits.webkit.org/290945.155@webkitglib/2.48 | ||
| 12 | |||
| 13 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/8bee9eb95ae24c6a410f9cd614976f4653d020d9] | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | Source/WebCore/platform/audio/DenormalDisabler.cpp | 2 +- | ||
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp b/Source/WebCore/platform/audio/DenormalDisabler.cpp | ||
| 20 | index 35715e663ce7e..44ba08a33d5d9 100644 | ||
| 21 | --- a/Source/WebCore/platform/audio/DenormalDisabler.cpp | ||
| 22 | +++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp | ||
| 23 | @@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler() | ||
| 24 | } | ||
| 25 | } | ||
| 26 | #else | ||
| 27 | -DenormalDisabler::DenormalDisabler() = default | ||
| 28 | +DenormalDisabler::DenormalDisabler() = default; | ||
| 29 | DenormalDisabler::~DenormalDisabler() = default; | ||
| 30 | #endif | ||
| 31 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.48.2.bb index a58b44440e..75a39558db 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.48.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.48.2.bb | |||
| @@ -18,9 +18,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
| 18 | file://sys_futex.patch \ | 18 | file://sys_futex.patch \ |
| 19 | file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \ | 19 | file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \ |
| 20 | file://fix-ftbfs-riscv64.patch \ | 20 | file://fix-ftbfs-riscv64.patch \ |
| 21 | file://fix-ftbfs-non-arm-non-x86.patch \ | ||
| 22 | " | 21 | " |
| 23 | SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f" | 22 | SRC_URI[sha256sum] = "ec58f6dfc25d3b360388e192f865068d69aab09b4d7df021f90e314d2fa54f37" |
| 24 | 23 | ||
| 25 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 24 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
| 26 | 25 | ||
