rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Add a temporary patch to fix capstone header location."

Browse Source 
This has now been fixed in capstone, see
https://github.com/aquynh/capstone/issues/1339

This reverts commit e0155fb5be.
This commit is contained in:
Richard W.M. Jones 2019-01-12 07:35:33 +00:00
parent e0155fb5be
commit f1ea04bd67
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Temporary-workaround-Fix-location-of-capstone-header.patch
View File

@ -1,27 +0,0 @@
From 429451516fe80ccd83163e279a81b1440aa27781 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
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 <capstone.h>
+#include <capstone/capstone.h>
#else
--
2.19.1

9
qemu.spec
View File

@ -127,7 +127,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
Summary: QEMU is a FAST! processor emulator Summary: QEMU is a FAST! processor emulator
Name: qemu Name: qemu
Version: 3.1.0 Version: 3.1.0
Release: 3%{?rcrel}%{?dist} Release: 4%{?rcrel}%{?dist}
Epoch: 2 Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/ URL: http://www.qemu.org/
@ -154,10 +154,6 @@ Source21: 95-kvm-ppc64-memlock.conf
# Good ol' keymap 86 still messin with us # Good ol' keymap 86 still messin with us
Patch0: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch 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 # documentation deps
@ -1639,6 +1635,9 @@ getent passwd qemu >/dev/null || \
%changelog %changelog
* Sat Jan 12 2019 Richard W.M. Jones <rjones@redhat.com> - 2:3.1.0-4
- Remove temporary patch and rebuild against fixed capstone.
* Fri Jan 11 2019 Richard W.M. Jones <rjones@redhat.com> - 2:3.1.0-3 * Fri Jan 11 2019 Richard W.M. Jones <rjones@redhat.com> - 2:3.1.0-3
- Rebuild for unannounced libcapstone soname bump from 3 to 4. - Rebuild for unannounced libcapstone soname bump from 3 to 4.
- Add a temporary patch to fix capstone header location. - Add a temporary patch to fix capstone header location.