bug#25484: QEMU depends on two different version of libjpeg

[Ricardo Wurmus]

Ricardo Wurmus <address@hidden> writes:

> Ludovic Courtès <address@hidden> writes:
>
>> While building ‘qemu’ as of 840f38ba37af1d09eb1e896a6350d6ab7f6532d0, we
>> see:
>>
>> --8<---------------cut here---------------start------------->8---
>> ld: warning: libjpeg.so.62, needed by 
>> /gnu/store/9a3r8wjnfyxfc912i6inlw8k6pw3rlxy-spice-0.12.8/lib/libspice-server.so,
>>  may conflict with libjpeg.so.8
>> --8<---------------cut here---------------end--------------->8---
>>
>> Indeed, ‘guix graph -t references qemu’ shows ‘libjpeg’ and
>> ‘libjpeg-turbo’ as indirect dependencies.
>>
>> Any idea how to fix that?
>
> “libjpeg-turbo” is used by “spice” but I just built “spice” successfully
> with “libjpeg-8” instead of “libjpeg-turbo”.  This seems to be okay.

Attached is a patch.  I successfully built “spice” and “qemu” and
confirmed with “guix graph -t references qemu -b d3js > graph.html” that
libjpeg-turbo has disappeared.

>From b277b1a282a91ab236f8a5ed7c7a47a46c8de279 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 19 Jan 2017 15:22:06 +0100
Subject: [PATCH] gnu: spice: Build with libjpeg-8.

* gnu/packages/spice.scm (spice)[inputs]: Replace libjpeg-turbo with
libjpeg-8.
---
 gnu/packages/spice.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 805f47a60..4d7c96e53 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven <address@hidden>
+;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -217,7 +218,7 @@ which allows users to view a desktop computing 
environment.")
     (inputs
       `(("cyrus-sasl" ,cyrus-sasl)
         ("glib" ,glib)
-        ("libjpeg-turbo" ,libjpeg-turbo)
+        ("libjpeg" ,libjpeg-8)
         ("lz4" ,lz4)
         ("opus" ,opus)
         ("zlib" ,zlib)))
-- 
2.11.0