From 2ff544cb629e4f7df293a27318a3c0bde5b46838 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 4 Jul 2024 15:05:22 +0200 Subject: [PATCH] package/wlroots: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, wlroots fails to build with output: Applying 0001-Add-feature-macros-to-more-C-files-.patch using patch: patching file backend/wayland/output.c patching file types/data_device/wlr_data_device.c patching file types/data_device/wlr_drag.c patching file types/wlr_export_dmabuf_v1.c patching file types/wlr_idle.c patching file types/wlr_keyboard_shortcuts_inhibit_v1.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file types/wlr_keyboard_shortcuts_inhibit_v1.c.rej patching file types/wlr_pointer_constraints_v1.c patching file types/wlr_primary_selection.c patching file types/wlr_relative_pointer_v1.c patching file types/wlr_screencopy_v1.c patching file types/wlr_virtual_pointer_v1.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file types/wlr_virtual_pointer_v1.c.rej patching file types/wlr_xdg_decoration_v1.c patching file types/xdg_shell/wlr_xdg_popup.c patching file types/xdg_shell/wlr_xdg_positioner.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file types/xdg_shell/wlr_xdg_positioner.c.rej patching file types/xdg_shell/wlr_xdg_shell.c patching file types/xdg_shell/wlr_xdg_surface.c This commit refreshes the package patch on the current package version. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-Add-feature-macros-to-more-C-files.patch} | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) rename package/wlroots/{0001-Add-feature-macros-to-more-C-files-.patch => 0001-Add-feature-macros-to-more-C-files.patch} (87%) diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch similarity index 87% rename from package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch rename to package/wlroots/0001-Add-feature-macros-to-more-C-files.patch index 0e1ae9d87a..9467318b31 100644 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch +++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files.patch @@ -1,4 +1,4 @@ -From cf37ba4c0bf31316b698ba23015f91903766871d Mon Sep 17 00:00:00 2001 +From 7854cd141f6f4c896afdc86229671d443ca7ba10 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Thu, 18 Feb 2021 22:31:39 +0000 Subject: [PATCH] Add feature macros to more C files @@ -11,6 +11,8 @@ see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 Signed-off-by: Paul Cercueil [Retrieved from: https://github.com/swaywm/wlroots/pull/2493] Signed-off-by: Fabrice Fontaine +[Julien: refreshed the patch to be applied with fuzz factor 0] +Signed-off-by: Julien Olivain --- backend/wayland/output.c | 1 + types/data_device/wlr_data_device.c | 1 + @@ -31,7 +33,7 @@ Signed-off-by: Fabrice Fontaine 16 files changed, 16 insertions(+) diff --git a/backend/wayland/output.c b/backend/wayland/output.c -index d5410e0d32..8ff8fa2a00 100644 +index c4b95e1..d5699d3 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -1,3 +1,4 @@ @@ -40,7 +42,7 @@ index d5410e0d32..8ff8fa2a00 100644 #include #include diff --git a/types/data_device/wlr_data_device.c b/types/data_device/wlr_data_device.c -index 6cd84ec0ab..beac496124 100644 +index 7e67479..2db13a6 100644 --- a/types/data_device/wlr_data_device.c +++ b/types/data_device/wlr_data_device.c @@ -1,3 +1,4 @@ @@ -49,7 +51,7 @@ index 6cd84ec0ab..beac496124 100644 #include #include diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c -index 53bf4066a1..e3c1e249b4 100644 +index c1fa801..8981ea0 100644 --- a/types/data_device/wlr_drag.c +++ b/types/data_device/wlr_drag.c @@ -1,3 +1,4 @@ @@ -58,7 +60,7 @@ index 53bf4066a1..e3c1e249b4 100644 #include #include diff --git a/types/wlr_export_dmabuf_v1.c b/types/wlr_export_dmabuf_v1.c -index a8e2a4bde3..98ceae68f1 100644 +index c1d26e6..cd06615 100644 --- a/types/wlr_export_dmabuf_v1.c +++ b/types/wlr_export_dmabuf_v1.c @@ -1,3 +1,4 @@ @@ -67,7 +69,7 @@ index a8e2a4bde3..98ceae68f1 100644 #include #include diff --git a/types/wlr_idle.c b/types/wlr_idle.c -index 4c338931cc..80fd871fab 100644 +index cb3a1cc..5f1fa95 100644 --- a/types/wlr_idle.c +++ b/types/wlr_idle.c @@ -1,3 +1,4 @@ @@ -76,16 +78,16 @@ index 4c338931cc..80fd871fab 100644 #include #include diff --git a/types/wlr_keyboard_shortcuts_inhibit_v1.c b/types/wlr_keyboard_shortcuts_inhibit_v1.c -index fe4e64b04e..8360a9c21c 100644 +index cc9bac1..3924893 100644 --- a/types/wlr_keyboard_shortcuts_inhibit_v1.c +++ b/types/wlr_keyboard_shortcuts_inhibit_v1.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include #include - #include + #include diff --git a/types/wlr_pointer_constraints_v1.c b/types/wlr_pointer_constraints_v1.c -index eca45984c4..f1db8e3415 100644 +index 7a8d209..70b0984 100644 --- a/types/wlr_pointer_constraints_v1.c +++ b/types/wlr_pointer_constraints_v1.c @@ -1,3 +1,4 @@ @@ -94,7 +96,7 @@ index eca45984c4..f1db8e3415 100644 #include #include diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c -index 0875462c8c..7e0e11ddaa 100644 +index d576bf0..bac4daa 100644 --- a/types/wlr_primary_selection.c +++ b/types/wlr_primary_selection.c @@ -1,3 +1,4 @@ @@ -103,7 +105,7 @@ index 0875462c8c..7e0e11ddaa 100644 #include #include diff --git a/types/wlr_relative_pointer_v1.c b/types/wlr_relative_pointer_v1.c -index 8613f2b91c..3f8dd8b72a 100644 +index 44da791..f6925b8 100644 --- a/types/wlr_relative_pointer_v1.c +++ b/types/wlr_relative_pointer_v1.c @@ -1,3 +1,4 @@ @@ -112,7 +114,7 @@ index 8613f2b91c..3f8dd8b72a 100644 #include #include diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c -index 6feb074274..29864c2364 100644 +index 4ca659a..76c582e 100644 --- a/types/wlr_screencopy_v1.c +++ b/types/wlr_screencopy_v1.c @@ -1,3 +1,4 @@ @@ -121,16 +123,16 @@ index 6feb074274..29864c2364 100644 #include #include diff --git a/types/wlr_virtual_pointer_v1.c b/types/wlr_virtual_pointer_v1.c -index a9d1fd7bc4..5566e9e013 100644 +index b452ff5..661e613 100644 --- a/types/wlr_virtual_pointer_v1.c +++ b/types/wlr_virtual_pointer_v1.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include #include - #include + #include diff --git a/types/wlr_xdg_decoration_v1.c b/types/wlr_xdg_decoration_v1.c -index 544035b7b8..904474c088 100644 +index fcd97a5..1850665 100644 --- a/types/wlr_xdg_decoration_v1.c +++ b/types/wlr_xdg_decoration_v1.c @@ -1,3 +1,4 @@ @@ -139,7 +141,7 @@ index 544035b7b8..904474c088 100644 #include #include diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c -index 69b4cfe19f..05d6551fc8 100644 +index fa99acd..8361eef 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -1,3 +1,4 @@ @@ -148,16 +150,16 @@ index 69b4cfe19f..05d6551fc8 100644 #include #include diff --git a/types/xdg_shell/wlr_xdg_positioner.c b/types/xdg_shell/wlr_xdg_positioner.c -index f88bf323b8..8881c49916 100644 +index 6a991bb..dae879b 100644 --- a/types/xdg_shell/wlr_xdg_positioner.c +++ b/types/xdg_shell/wlr_xdg_positioner.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include #include - #include "types/wlr_xdg_shell.h" + #include diff --git a/types/xdg_shell/wlr_xdg_shell.c b/types/xdg_shell/wlr_xdg_shell.c -index 0480d5f354..c93fe7c3fb 100644 +index 70b777d..16d275a 100644 --- a/types/xdg_shell/wlr_xdg_shell.c +++ b/types/xdg_shell/wlr_xdg_shell.c @@ -1,3 +1,4 @@ @@ -166,7 +168,7 @@ index 0480d5f354..c93fe7c3fb 100644 #include #include "types/wlr_xdg_shell.h" diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c -index edf562abcd..c1dfbfba7e 100644 +index a03b90a..a6267cf 100644 --- a/types/xdg_shell/wlr_xdg_surface.c +++ b/types/xdg_shell/wlr_xdg_surface.c @@ -1,3 +1,4 @@ @@ -174,3 +176,6 @@ index edf562abcd..c1dfbfba7e 100644 #include #include #include +-- +2.45.2 +