From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBE1B-0004gy-Us for guix-patches@gnu.org; Wed, 25 Apr 2018 02:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBE18-00059X-8v for guix-patches@gnu.org; Wed, 25 Apr 2018 02:35:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59020) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fBE18-000593-3w for guix-patches@gnu.org; Wed, 25 Apr 2018 02:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fBE17-0007Nk-RF for guix-patches@gnu.org; Wed, 25 Apr 2018 02:35:01 -0400 Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBE0D-0003rM-I8 for guix-patches@gnu.org; Wed, 25 Apr 2018 02:34:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBE09-0004fP-TX for guix-patches@gnu.org; Wed, 25 Apr 2018 02:34:05 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:23218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBE09-0004eM-DR for guix-patches@gnu.org; Wed, 25 Apr 2018 02:34:01 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id A64384406A for ; Wed, 25 Apr 2018 08:33:58 +0200 (CEST) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wZHabO-lTEeC for ; Wed, 25 Apr 2018 08:33:57 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 1A21943B26 for ; Wed, 25 Apr 2018 08:33:57 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 071DCB32 for ; Wed, 25 Apr 2018 08:33:56 +0200 (CEST) Date: Wed, 25 Apr 2018 08:33:46 +0200 From: Rutger Helling Message-ID: <20180425083346.29a434e9@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Vcu5XsutvWAac/l+BgLvMsB"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31254@debbugs.gnu.org --Sig_/Vcu5XsutvWAac/l+BgLvMsB Content-Type: multipart/mixed; boundary="MP_/TMSIDAR=+RlkL6_HYPVEoHw" --MP_/TMSIDAR=+RlkL6_HYPVEoHw Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, I saw QEMU was just updated to 2.12. I noticed a few things in the release notes, namely: * QEMU can now be built with Python 3. * Support for SDL 1.2 is considered deprecated and will be removed entirely in a future release. As a result, the first patch builds QEMU with Python 3 and SDL 2. The second patch is optional and adds the GTK 3 frontend, which IMO is a nice alternative to the SDL frontend. This does increase the size of QEMU a bit. OTOH it seems unlikely that most people who use QEMU don't already have GTK 3 installed in some form. --MP_/TMSIDAR=+RlkL6_HYPVEoHw Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-qemu-Build-with-Python-3-and-SDL-2.patch =46rom 2f1626d4526fee5e7a2836d811c96cc2c823ce71 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 08:13:44 +0200 Subject: [PATCH 1/2] gnu: qemu: Build with Python 3 and SDL 2. * gnu/packages/virtualization.scm (qemu)[arguments]: Add configure-flag to = build with Python 3. [inputs]: Use sdl2 instead of sdl. [native-inputs]: Use python instead of python@2. * gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove pyt= hon from inherited packages and use python@2 instead. [inputs]: Remove sdl2 instead of sdl from inherited packages. --- gnu/packages/virtualization.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 86f4d7136..46b136e31 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -5,7 +5,7 @@ ;;; Copyright =C2=A9 2016, 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2017 Alex Vong ;;; Copyright =C2=A9 2017 Andy Patterson -;;; Copyright =C2=A9 2017 Rutger Helling +;;; Copyright =C2=A9 2017, 2018 Rutger Helling ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2018 Sou Bunnbu @@ -101,6 +101,11 @@ ;; boot_sector_test: assertion failed (signature =3D=3D SIGNATURE):= (0x00000000 =3D=3D 0x0000dead) #:parallel-tests? #f #:configure-flags (list "--enable-usb-redir" "--enable-opengl" + ;; Remove below once Python 3 becomes the d= efault + ;; 'python' binary. + (string-append "--python=3D" + (assoc-ref %build-inputs "py= thon") + "/bin/python3") (string-append "--smbd=3D" (assoc-ref %outputs "out") "/libexec/samba-wrapper") @@ -187,7 +192,7 @@ exec smbd $@"))) ;; ("pciutils" ,pciutils) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) - ("sdl" ,sdl) + ("sdl2" ,sdl2) ("spice" ,spice) ("usbredir" ,usbredir) ("util-linux" ,util-linux) @@ -197,7 +202,7 @@ exec smbd $@"))) (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) ; incompatible with Python 3 acc= ording to error message + ("python" ,python) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") @@ -231,9 +236,13 @@ server and embedded PowerPC, and S390 guests.") ;; Restrict to the targets supported by Guix. ''("--target-list=3Di386-softmmu,x86_64-softmmu,mips64el-softmmu,a= rm-softmmu,aarch64-softmmu")))) =20 + ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer neces= sary. + (native-inputs `(("python-2" ,python-2) + ,@(fold alist-delete (package-native-inputs qemu) + '("python")))) ;; Remove dependencies on optional libraries, notably GUI libraries. (inputs (fold alist-delete (package-inputs qemu) - '("libusb" "mesa" "sdl" "spice" "virglrenderer" + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) =20 (define-public libosinfo --=20 2.17.0 --MP_/TMSIDAR=+RlkL6_HYPVEoHw Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-qemu-Enable-GTK-3-frontend.patch =46rom a0cc0f8f5632374567ee760d629d80703ec0f41e Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 08:14:33 +0200 Subject: [PATCH 2/2] gnu: qemu: Enable GTK 3 frontend. * gnu/packages/virtualization.scm (qemu)[inputs]: Add "gettext", "gtk+" to inputs. * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove "gettext", "gtk+" from inherited inputs. --- gnu/packages/virtualization.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 46b136e31..3b8e698a8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -177,7 +178,9 @@ exec smbd $@"))) (inputs ; TODO: Add optional inp= uts. `(("alsa-lib" ,alsa-lib) ("attr" ,attr) + ("gettext" ,gettext-minimal) ("glib" ,glib) + ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) ("libcap" ,libcap) ; virtfs support requires libcap & lib= attr @@ -242,8 +245,8 @@ server and embedded PowerPC, and S390 guests.") '("python")))) ;; Remove dependencies on optional libraries, notably GUI libraries. (inputs (fold alist-delete (package-inputs qemu) - '("libusb" "mesa" "sdl2" "spice" "virglrenderer" - "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gettex= t" + "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) =20 (define-public libosinfo (package --=20 2.17.0 --MP_/TMSIDAR=+RlkL6_HYPVEoHw-- --Sig_/Vcu5XsutvWAac/l+BgLvMsB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlrgIUsACgkQ86cn20T8 yjbuIgf9H4S9FVG2L5q4VQt7kSOMrEACsnpAGhfgwxfW0OHNEga3PNaMUspumvuF yZDBRRds1QAYbh4G/KnpvDq6HqMd/mFWsfxVEC+yD0zi4CL6eOMRhMWmCDGnrrWJ oUdfDd6aD2If3k8qZ7+k0m0HoRY0SY/m7xW8cnqmbIoRKutEiyHDGSqe9LK4Dajm U+/H6Vb3gaC0Kq4mrY1KGL8d8zZmqhRpV6f9ICku0G84laOKHWPLdM4QvwUMElf+ t413vpzgQgGMIY86mj0OV2zBL8WmW+hfHwJ6h7lhcRi/4v+qCjikQccdOXxfyLl3 h/IUZLZhMh5P6hZQKYN1GTFyu7da7w== =RWAa -----END PGP SIGNATURE----- --Sig_/Vcu5XsutvWAac/l+BgLvMsB--