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 <[email protected]>
Cc: Yoann Congal <[email protected]>
---
 ...r-Include-utility-for-GCC-12-compatibil.patch | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

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 <[email protected]>
  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>
+ 
-- 
2.42.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#106872): 
https://lists.openembedded.org/g/openembedded-devel/message/106872
Mute This Topic: https://lists.openembedded.org/mt/102652588/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to