| Message ID | 20231117180208.401854-1-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-multimedia] projucer: Refresh patch to apply cleanly | expand |
Hi, Le ven. 17 nov. 2023 à 19:02, Khem Raj <raj.khem@gmail.com> a écrit : > This was resulting on rejects on master > > patching file modules/juce_core/system/juce_StandardHeader.h > Hunk #1 FAILED at 64 (different line endings). > 1 out of 1 hunk FAILED -- rejects in file modules/juce_core/system/juce_StandardHeader.h > Patch 0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch does not apply (enforce with -f) > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > Cc: Yoann Congal <yoann.congal@smile.fr> > --- > ...r-Include-utility-for-GCC-12-compatibil.patch | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) I forgot to rebuild after the devtool cycle, sorry. Devtool seems to change the line ending between the commit and the generated patch... Smell like a bug : https://bugzilla.yoctoproject.org/show_bug.cgi?id=15285 Regards,
diff --git a/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch b/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch index ae77aeef10..3efef247ae 100644 --- a/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch +++ b/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch @@ -9,15 +9,13 @@ Signed-off-by: Yoann Congal <yoann.congal@smile.fr> modules/juce_core/system/juce_StandardHeader.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h -index fe164cdd3..cda6bbe86 100644 --- a/modules/juce_core/system/juce_StandardHeader.h +++ b/modules/juce_core/system/juce_StandardHeader.h @@ -64,6 +64,7 @@ - #include <typeindex> - #include <unordered_map> - #include <unordered_set> -+#include <utility> - #include <vector> - #include <set> - + #include <typeindex> + #include <unordered_map> + #include <unordered_set> ++#include <utility> + #include <vector> + #include <set> +
This was resulting on rejects on master patching file modules/juce_core/system/juce_StandardHeader.h Hunk #1 FAILED at 64 (different line endings). 1 out of 1 hunk FAILED -- rejects in file modules/juce_core/system/juce_StandardHeader.h Patch 0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch does not apply (enforce with -f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Yoann Congal <yoann.congal@smile.fr> --- ...r-Include-utility-for-GCC-12-compatibil.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)