[gnome-build-meta/abderrahim/update-qemu: 25/25] core-deps/qemu.bst: add patch to fix build with latest glib

[Abderrahim Kitouni <akitouni src gnome org>]

commit 8f23b018a93c755c548c08b7a013a3d279b862a7
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Feb 15 14:52:57 2021 +0100

    core-deps/qemu.bst: add patch to fix build with latest glib

 elements/core-deps/qemu.bst                    |  2 ++
 files/qemu/Fix-build-after-glib-e38982df.patch | 39 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
---
diff --git a/elements/core-deps/qemu.bst b/elements/core-deps/qemu.bst
index eaf2c741..213a331f 100644
--- a/elements/core-deps/qemu.bst
+++ b/elements/core-deps/qemu.bst
@@ -3,6 +3,8 @@ kind: autotools
 sources:
 - kind: tar
   url: https://download.qemu.org/qemu-5.2.0.tar.xz
+- kind: patch
+  path: files/qemu/Fix-build-after-glib-e38982df.patch
 
 build-depends:
 - core-deps/spice-protocol.bst
diff --git a/files/qemu/Fix-build-after-glib-e38982df.patch b/files/qemu/Fix-build-after-glib-e38982df.patch
new file mode 100644
index 00000000..5b60823c
--- /dev/null
+++ b/files/qemu/Fix-build-after-glib-e38982df.patch
@@ -0,0 +1,39 @@
+diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
+index 9fa779e1..a1402a2e 100644
+--- a/disas/arm-a64.cc
++++ b/disas/arm-a64.cc
+@@ -17,10 +17,8 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-extern "C" {
+ #include "qemu/osdep.h"
+ #include "disas/dis-asm.h"
+-}
+ 
+ #include "vixl/a64/disasm-a64.h"
+ 
+diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
+index 2164762b..b89acf7a 100644
+--- a/include/disas/dis-asm.h
++++ b/include/disas/dis-asm.h
+@@ -9,6 +9,10 @@
+ #ifndef DISAS_DIS_ASM_H
+ #define DISAS_DIS_ASM_H
+ 
++#ifdef  __cplusplus
++extern "C" {
++#endif
++
+ typedef void *PTR;
+ typedef uint64_t bfd_vma;
+ typedef int64_t bfd_signed_vma;
+@@ -507,4 +511,8 @@ static inline bfd_vma bfd_getb16(const bfd_byte *addr)
+ 
+ typedef bool bfd_boolean;
+ 
++#ifdef  __cplusplus
++}
++#endif
++
+ #endif /* DISAS_DIS_ASM_H */