From e0155fb5bed6f77a0f683416c053e0c583054695 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Jan 2019 09:43:39 +0000 Subject: [PATCH] Add a temporary patch to fix capstone header location. --- ...ound-Fix-location-of-capstone-header.patch | 27 +++++++++++++++++++ qemu.spec | 5 ++++ 2 files changed, 32 insertions(+) create mode 100644 0001-Temporary-workaround-Fix-location-of-capstone-header.patch diff --git a/0001-Temporary-workaround-Fix-location-of-capstone-header.patch b/0001-Temporary-workaround-Fix-location-of-capstone-header.patch new file mode 100644 index 0000000..6f30e9d --- /dev/null +++ b/0001-Temporary-workaround-Fix-location-of-capstone-header.patch @@ -0,0 +1,27 @@ +From 429451516fe80ccd83163e279a81b1440aa27781 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 11 Jan 2019 09:41:06 +0000 +Subject: [PATCH] Temporary workaround: Fix location of capstone headers. + +See: +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/NTFMIAACL7ALBHUC3FZDSB3UMNR2SYJT/ +--- + include/disas/capstone.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/disas/capstone.h b/include/disas/capstone.h +index 84e214956d..2eb6be222b 100644 +--- a/include/disas/capstone.h ++++ b/include/disas/capstone.h +@@ -3,7 +3,7 @@ + + #ifdef CONFIG_CAPSTONE + +-#include ++#include + + #else + +-- +2.19.1 + diff --git a/qemu.spec b/qemu.spec index 2591729..e206b96 100644 --- a/qemu.spec +++ b/qemu.spec @@ -154,6 +154,10 @@ Source21: 95-kvm-ppc64-memlock.conf # Good ol' keymap 86 still messin with us Patch0: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch +# Temporary workaround for capstone 4. See: +# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/NTFMIAACL7ALBHUC3FZDSB3UMNR2SYJT/ +Patch1: 0001-Temporary-workaround-Fix-location-of-capstone-header.patch + # documentation deps @@ -1637,6 +1641,7 @@ getent passwd qemu >/dev/null || \ %changelog * Fri Jan 11 2019 Richard W.M. Jones - 2:3.1.0-3 - Rebuild for unannounced libcapstone soname bump from 3 to 4. +- Add a temporary patch to fix capstone header location. * Tue Dec 18 2018 Adam Williamson - 2:3.1.0-1.1 - Restore patch to drop phantom 86 key from en-us keymap (bz #1658676)