diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-19 17:55:18 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-19 17:57:12 +0200 |
| commit | e38a71eea9abaa4e03ef1d7081104f93d26e31b3 (patch) | |
| tree | 7e04790f82ab80e26caa30d1366fc596a1b091a7 /gnu/packages/qemu.scm | |
| parent | 20848f3637af2bb97db03e9cd2e01d11494c6f02 (diff) | |
gnu: qemu: Adjust to newer GLib versions.
* gnu/packages/qemu.scm (qemu-patch): New procedure.
(%glib-memory-vtable-patch, %glib-duplicate-test-patch): New
variables.
Diffstat (limited to 'gnu/packages/qemu.scm')
| -rw-r--r-- | gnu/packages/qemu.scm | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index fc90346371..71600b2347 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -40,6 +40,28 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages perl)) +(define (qemu-patch commit file-name sha256) + "Return an origin for COMMIT." + (origin + (method url-fetch) + (uri (string-append + "http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=" + commit)) + (sha256 sha256) + (file-name file-name))) + +(define %glib-memory-vtable-patch + (qemu-patch "deb847bf" + "qemu-glib-memory-vtable.patch" + (base32 + "0afb7rvxy14104jxmhr7m02w5baiz0c7vhq3h642h09jgxrcmzzi"))) + +(define %glib-duplicate-test-patch + (qemu-patch "98cf48f6" + "qemu-glib-duplicate-test.patch" + (base32 + "1aicbplzdj5s5y13jmqyvfajay05x9dnkzd197waz8v6kha7d9d5"))) + (define-public qemu-headless ;; This is QEMU without GUI support. (package @@ -52,7 +74,12 @@ (sha256 (base32 "1nqv5p94zpnhcaqkifnn83ap7dd0qrb0qiicswbyhhby0f48pzpc")) - (patches (map search-patch '("qemu-CVE-2015-6855.patch"))))) + (patches (list (search-patch "qemu-CVE-2015-6855.patch") + + ;; These two patches allow QEMU's tests to run + ;; correctly with 'gtester' from the latest GLib. + %glib-memory-vtable-patch + %glib-duplicate-test-patch)))) (build-system gnu-build-system) (arguments '(#:phases (alist-replace |