From unknown Thu Aug 21 14:53:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Apr 2018 06:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 31254@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152463806628328 (code B ref -1); Wed, 25 Apr 2018 06:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Apr 2018 06:34:26 +0000 Received: from localhost ([127.0.0.1]:38684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBE0S-0007Mk-Js for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBE0Q-0007MV-M7 for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBE0J-0004k1-Rz for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:44100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBE0J-0004jr-Mi for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:11 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1524638037; x=1526452438; bh=JoE7wIo5sKknOC0NlIB xSkWSULKFbwJPB+I23qSthf0=; b=vP3j6eaMhzfXx8cVhiXdIhs87JlxOomTLnD PQx66ftm0+995CCGSFbR2+Ayr4AKIj9Br9LMiYrwfdw4XZe5BicZFs5LbTuvJYRI lBSw+l5WS30HGRWJUC9neKpm2C3XpHfiZd0AJipH7IAbQZZvktj2QdpkVgaK15ct RP9Bg1MWXX/EzZYxwbxRuKtsmc9xq76zc6YsYIOwqNti5T4bXv623T/lmYNGzGYF qW+PrmgURX+/wyBzf4wm8SZ103xPE2Pzc3GAdXRz+X/iRX52F+/o99FWQ2hVK2W4 vvuzaadQFmUVqfZQKl2aEfuB66St9yVC8oPBG3U8MDpAnZe2X0PfXstyHCORw/aY setcSRVGm/LWPwB0jQz5ONMXELOBRI7Rr/EXZHOXWs9KhpKfprrh/S6fgxXW6wMf 4+/33K9qOlnM/32TrA66GZq32K9aUAIPrsc9jdH4QwsI+642UgkzhsGQIA/wdKDK zlUKoeJclMd4Y7V+ieY+n/oza2GWBwUha/VxPEcubZys425YOcODkb93GRro9gt6 8apF7AO1gsbJMXwIpbmaeQRlxfz9k0zW1UjEsz5X91oSuBFz5s+1j9NkGr3M1rpz TgPryBg6Bdd0DUutDCigHX79J4UCpyrpAaf0Q79NtRMy+mlx401qBvwGtlLbceI9 P++9LNl4= X-Virus-Scanned: amavisd-new at mykolab.com 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" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --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-- From unknown Thu Aug 21 14:53:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Apr 2018 11:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Rutger Helling , 31254@debbugs.gnu.org Received: via spool by 31254-submit@debbugs.gnu.org id=B31254.152465515821590 (code B ref 31254); Wed, 25 Apr 2018 11:20:02 +0000 Received: (at 31254) by debbugs.gnu.org; 25 Apr 2018 11:19:18 +0000 Received: from localhost ([127.0.0.1]:38784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBISE-0005c9-2U for submit@debbugs.gnu.org; Wed, 25 Apr 2018 07:19:18 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:33315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBISC-0005c1-1c for 31254@debbugs.gnu.org; Wed, 25 Apr 2018 07:19:16 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A642C214C5; Wed, 25 Apr 2018 07:19:15 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 25 Apr 2018 07:19:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=vOqzrAy6H4OfC139TYrlzSh6mrTHaakvf4+V/9CggPk=; b=IQByOaXE +1zvwnoIsS6t9m84OCtkprN/TtUUWHfj2s2iIY94ZHqNEkKS4MKq2Vd+joXnlBmj eezKcvANlhUw0Xh2b7taRRFuCcrveyuFROD/RPEGx/1YB8igqQnSNJ09m3ygNCAG QHILIC592v9Goq0m/4MtOBpf/T1Mdh0GcpdXu9QxcLI6uK/yh4R0HymlIAoCcfJ5 RNihZJcCdyAsX2L4pxFKeBiB/4ItZJ1VzWZFKkxtXw6fFtZlAFT3DpobhIN8h8fi cJjpGHCIbAR4WsJElQgTuhq5prT18e/0uFgkXMJiCz1S4RapCmMpZGTTZW0hfOVV 9PltnBD55EgJ4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=vOqzrAy6H4OfC139TYrlzSh6mrTHa akvf4+V/9CggPk=; b=Pi3romtBH3yvIqnq28WY0D4Hkvr996HdX3zVMba94792G 8e8pF7WQjPgN+Ng48zbfi+Oo8nRFx5zXvqdpxtnsWGAv86b6gS0wdV9DKGngc/0g YvH8p25E9u1QjEOIl4LshyzUdpeShJMvlohvZrx7HoIymxb97IiFAclcawEY4kGL DMAiOehSqiOsra5Q2NVVcThQUMQH9fiMzP7Js5v3LceEoY/hk1cwsFDlam39F9K4 YId5S3IW3yVKE8/n4DR0xN1ymfih3Q7g52/a3DILUmMDzOwhU/mX8Ips7pyQwyaD oPmlOi1sru5NOqqnzeZy3bZ3K3LMcE1pK3XItnPYg== X-ME-Sender: Received: from localhost (228.92-221-162.customer.lyse.net [92.221.162.228]) by mail.messagingengine.com (Postfix) with ESMTPA id 2B53110253; Wed, 25 Apr 2018 07:19:15 -0400 (EDT) From: Marius Bakke In-Reply-To: <20180425083346.29a434e9@mykolab.com> References: <20180425083346.29a434e9@mykolab.com> User-Agent: Notmuch/0.26.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Wed, 25 Apr 2018 13:19:13 +0200 Message-ID: <87lgdb8rf2.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! Rutger Helling writes: > 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. Thanks for looking after this. I didn't realize it was using SDL1! > 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. Using `guix size`, stock qemu is ~916MiB, and adding gtk+ brings it to ~1131MiB. I'm not familiar with the GTK+ frontend, would it make sense to add it in a separate output? Alternatively, could we replace the SDL frontend with it? > From 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 t= o 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 p= ython > from inherited packages and use python@2 instead. > [inputs]: Remove sdl2 instead of sdl from inherited packages. [...] > @@ -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= default > + ;; 'python' binary. > + (string-append "--python=3D" > + (assoc-ref %build-inputs "= python") > + "/bin/python3") Note: You can use the 'python-wrapper' package, which has python3 as "/bin/python". Then this won't be necessary. > (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 a= ccording 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= ,arm-softmmu,aarch64-softmmu")))) >=20=20 > + ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer nec= essary. > + (native-inputs `(("python-2" ,python-2) > + ,@(fold alist-delete (package-native-inputs qemu) > + '("python")))) It's better to do this in the actual Qemu 2.10 package instead of arbitrarily using a different Python version in "qemu-minimal" IMO. Perhaps we should move "qemu@2.10" from (gnu packages bootloaders) into here and make this change in that package. WDYT? Ideally as a public "hidden-package" so it's not visible to end users. Can you try it? [...] > From 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. 'gettext' should probably be a native-input. That said I wonder if the GTK frontend should be a separate output due to the ~21% size increase, but no strong opinion. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlrgZDEACgkQoqBt8qM6 VPq/KggA1WBupMV8Fa1CARVuKlNsJc2DnYF9PRm2nGQC/54xp8BRhBmRSM1YgRm5 JOdux3Z1yYK3MWtvXiLXXEGyr6c+XWMeVeT/UF8saAOOFiIK+l7bmDhPxDJ1G/Va 52PziI4lFm1KsXpyGKHBgRg97SDJb0DPw/LAQTXk4MXwH/oZSed+AG32n5Won524 9/2oucJS/F0BjGjI8S7R5ds5jpUdzc2aikoocOhPntLhN5aNI1wCsJYmAoAKWGsC 1BrS8U4kqd+enl2Hx8xwob/uv0Na2IWaoeG0t99SHHBCoLlyHpw03Fva7NtoMkTB uTtlgwvqAL+8xw1RMIb4EvLI0ZQK0Q== =N9jy -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 21 14:53:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v2 Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Apr 2018 13:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Marius Bakke Cc: 31254@debbugs.gnu.org Received: via spool by 31254-submit@debbugs.gnu.org id=B31254.152466283115422 (code B ref 31254); Wed, 25 Apr 2018 13:28:01 +0000 Received: (at 31254) by debbugs.gnu.org; 25 Apr 2018 13:27:11 +0000 Received: from localhost ([127.0.0.1]:38858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBKRs-00040a-RJ for submit@debbugs.gnu.org; Wed, 25 Apr 2018 09:27:11 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:21306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBKRq-00040F-Qm for 31254@debbugs.gnu.org; Wed, 25 Apr 2018 09:27:03 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id E05AF40536; Wed, 25 Apr 2018 15:26:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1524662814; x=1526477215; bh=EMxG+dshNJIoVHewgPzib+8mxZ/IYpvKxP1OnHUZMn8=; b=fq3kjqo2sfOL gZZQ572oja+uiFqSZOXSEhgJwM0uGoPAypp9TeasJMGf41qOKe7T/m/TPR5e2xDW TAhB2iHJWZlhjVAyIfluJkX+1M2tBvbvw3CrN7F+cEjKRrZBWu9l+zFTTySA0wQh OryuPgjnMC+lCJF3rpKnMaKUT48oQbCsGgYWcA3woVAjAN0gN/OhSvZrpKDA12CP Odco7Gq+O6nJD0zRAIXlFH2W+96oS62F96GdRXQ0XnLhaHZUczVw2o78tZ6lZwqv pa0NSyf2NKvHIJVmc196sWEjRYvXmaELUvnCE4qNFvie2rq0hGqs3prwbJtPcg/S wh8DlYVc7RiFAVqelMnGC3sd2HPkgG0MERDk+SSoRVSObiVPgF5CQzB5PjsgE9CP AGS3oTmHmamTfc+ISTGbfwCUHBIqbwBL0obJrEY3j8qiYfolR5P73IRgpIygZvD0 tj8ullxjKtIPDFlt1+VeVL3dh52D18+Ew6h8fXsc0wQccN6eAuIK6nEfkqdL6uFN Bn8iBk9TzhmbdToulgdBbyemMap3PlzrlfrYlOL55ZU7Bqr4DcL1vGS8Usa04xL7 ll+jogHOfkwbhUmFSnLxIgqV7DrsCENI5FGvzOT8GD+NDdDu8VzALrekgSpZbsP8 ripqjkHjkh0Zs754oxKNIB1Ftyk/uS0= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -2.898 X-Spam-Level: X-Spam-Status: No, score=-2.898 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, FREEMAIL_FROM=0.001, TVD_PH_BODY_ACCOUNTS_PRE=0.001] autolearn=ham autolearn_force=no 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 AbrCDGLAPHEy; Wed, 25 Apr 2018 15:26:54 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id BEF8440502; Wed, 25 Apr 2018 15:26:54 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 91ACF164; Wed, 25 Apr 2018 15:26:54 +0200 (CEST) Date: Wed, 25 Apr 2018 15:26:42 +0200 From: Rutger Helling Message-ID: <20180425152642.2a361ae5@mykolab.com> In-Reply-To: <87lgdb8rf2.fsf@fastmail.com> References: <20180425083346.29a434e9@mykolab.com> <87lgdb8rf2.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/NijL.PgtTpHVQ8F50nK5OwC"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/NijL.PgtTpHVQ8F50nK5OwC Content-Type: multipart/mixed; boundary="MP_/.zgSgxYJOnt95_+u946KaNq" --MP_/.zgSgxYJOnt95_+u946KaNq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello Marius,=20 Thanks for the review! I've taken your suggestions into account and updated the patches. I don't think it's possible to seperate the GTK3 frontend, since it's just a parameter you pass to the qemu* binaries (-display gtk instead of -display sdl). =46rom my understanding if you have both GTK3 and SDL2 enabled it defaults to GTK3. We can remove the SDL2 frontend if there are no objections (and probably sdl from the --audio-drv-list). I just figured it'd be nicer to enable both to give users maximum flexibility. On Wed, 25 Apr 2018 13:19:13 +0200 Marius Bakke wrote: > Hello! >=20 > Rutger Helling writes: >=20 > > 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. =20 >=20 > Thanks for looking after this. I didn't realize it was using SDL1! >=20 > > 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. =20 >=20 > Using `guix size`, stock qemu is ~916MiB, and adding gtk+ brings it to > ~1131MiB. I'm not familiar with the GTK+ frontend, would it make > sense to add it in a separate output? >=20 > Alternatively, could we replace the SDL frontend with it? >=20 > > From 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 python from inherited packages and use python@2 instead. > > [inputs]: Remove sdl2 instead of sdl from inherited packages. =20 >=20 > [...] >=20 > > @@ -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 default > > + ;; 'python' binary. > > + (string-append "--python=3D" > > + (assoc-ref > > %build-inputs "python") > > + "/bin/python3") =20 >=20 > Note: You can use the 'python-wrapper' package, which has python3 as > "/bin/python". Then this won't be necessary. >=20 > > (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 according 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-softm= mu,arm-softmmu,aarch64-softmmu")))) > > =20 > > + ;; qemu-minimal-2.10 needs Python 2. Remove below once no > > longer necessary. > > + (native-inputs `(("python-2" ,python-2) > > + ,@(fold alist-delete (package-native-inputs > > qemu) > > + '("python")))) =20 >=20 > It's better to do this in the actual Qemu 2.10 package instead of > arbitrarily using a different Python version in "qemu-minimal" IMO. >=20 > Perhaps we should move "qemu@2.10" from (gnu packages bootloaders) > into here and make this change in that package. WDYT? Ideally as a > public "hidden-package" so it's not visible to end users. >=20 > Can you try it? >=20 > [...] >=20 > > From 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. =20 >=20 > 'gettext' should probably be a native-input. That said I wonder if > the GTK frontend should be a separate output due to the ~21% size > increase, but no strong opinion. --MP_/.zgSgxYJOnt95_+u946KaNq Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-qemu-Build-with-Python-3-and-SDL2-support.patch =46rom e1b40133c8aedf84090fbd4292af2b53eb22d669 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 14:59:11 +0200 Subject: [PATCH 1/2] gnu: qemu: Build with Python 3 and SDL2 support. * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl. [native-inputs]: Use python instead of python@2. Add python-wrapper. * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 inste= ad of sdl from inherited packages. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. [native-inputs]: Remove python from inherited packages and use python@2 ins= tead. --- gnu/packages/bootloaders.scm | 16 ---------------- gnu/packages/virtualization.scm | 30 ++++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 281bb98fa..4350ff3a5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -72,22 +72,6 @@ (base32 "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) =20 -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; . -;; TODO: When grub no longer needs this version, move to gnu/packages/debu= g.scm. -(define qemu-minimal-2.10 - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw"))))= )) - (define-public grub (package (name "grub") diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 86f4d7136..36bdc8f95 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 @@ -187,7 +187,7 @@ exec smbd $@"))) ;; ("pciutils" ,pciutils) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) - ("sdl" ,sdl) + ("sdl2" ,sdl2) ("spice" ,spice) ("usbredir" ,usbredir) ("util-linux" ,util-linux) @@ -197,7 +197,8 @@ 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) + ("python-wrapper" ,python-wrapper) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") @@ -233,9 +234,30 @@ server and embedded PowerPC, and S390 guests.") =20 ;; 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 +;; The GRUB test suite fails with later versions of Qemu, so we +;; keep it at 2.10 for now. See +;; . +;; TODO: When grub no longer needs this version, move to gnu/packages/debu= g.scm. +(define-public qemu-minimal-2.10 + (hidden-package + (package + (inherit qemu-minimal) + (version "2.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")))) + ;; 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"))))))) + (define-public libosinfo (package (name "libosinfo") --=20 2.17.0 --MP_/.zgSgxYJOnt95_+u946KaNq Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-qemu-Enable-GTK3-frontend.patch =46rom edea64c09dc1e0f391e860478dcf99f4d0d1a6d2 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 15:03:29 +0200 Subject: [PATCH 2/2] gnu: qemu: Enable GTK3 frontend. * gnu/packages/virtualization.scm (qemu)[native-inputs]: Add "gettext" to n= ative-inputs. [inputs]: Add "gtk+" to inputs. * gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove "ge= ttext" from inherited inputs. [inputs]: Remove "gtk+" from inherited inputs. --- gnu/packages/virtualization.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 36bdc8f95..a12debe52 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) @@ -173,6 +174,7 @@ exec smbd $@"))) `(("alsa-lib" ,alsa-lib) ("attr" ,attr) ("glib" ,glib) + ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) ("libcap" ,libcap) ; virtfs support requires libcap & lib= attr @@ -194,7 +196,8 @@ exec smbd $@"))) ;; ("vde2" ,vde2) ("virglrenderer" ,virglrenderer) ("zlib" ,zlib))) - (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. + (native-inputs `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; gtester, etc. ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python) @@ -233,8 +236,10 @@ server and embedded PowerPC, and S390 guests.") ''("--target-list=3Di386-softmmu,x86_64-softmmu,mips64el-softmmu,a= rm-softmmu,aarch64-softmmu")))) =20 ;; Remove dependencies on optional libraries, notably GUI libraries. + (native-inputs (fold alist-delete (package-native-inputs qemu) + '("gettext"))) (inputs (fold alist-delete (package-inputs qemu) - '("libusb" "mesa" "sdl2" "spice" "virglrenderer" + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) =20 ;; The GRUB test suite fails with later versions of Qemu, so we --=20 2.17.0 --MP_/.zgSgxYJOnt95_+u946KaNq-- --Sig_/NijL.PgtTpHVQ8F50nK5OwC Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlrgghIACgkQ86cn20T8 yjb29Qf+PojmeC3Z2zYx0qfoaOwr2tkOizYCa6LA8hkCLKWvCEH9xl0zsWCUsZFX x52sHY9PusKx8BKmqQYZnuCvfwJY8vPQCSEqTQOHjNgfuhROGyotoLAvvLl8XqXx BqXqQ2ceISHNB6hyeTv6cLOgBjE2vlC5OOa92EW/2W+o1SAICiHsJoDWH8LG4x3q iO/XO28UecnuCVwc6qrkuVvXmzA0K7LYzvE/xV1cxG22TU8oEA/rHePBTJMKd5Kv YNkJPLqRL1zcYdd6IC5sz1Ou/7ALqscYaTaybGQ7dvPGPUTCp6kqDeXB6hCxjrzl L60Pf5EWQX2e8V4prINnbNAG1J/xHw== =JSfi -----END PGP SIGNATURE----- --Sig_/NijL.PgtTpHVQ8F50nK5OwC-- From unknown Thu Aug 21 14:53:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v2 Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Apr 2018 13:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Rutger Helling Cc: 31254@debbugs.gnu.org Received: via spool by 31254-submit@debbugs.gnu.org id=B31254.152466363916741 (code B ref 31254); Wed, 25 Apr 2018 13:41:01 +0000 Received: (at 31254) by debbugs.gnu.org; 25 Apr 2018 13:40:39 +0000 Received: from localhost ([127.0.0.1]:38872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBKf1-0004Lx-6k for submit@debbugs.gnu.org; Wed, 25 Apr 2018 09:40:39 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:52957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBKf0-0004Lq-6o for 31254@debbugs.gnu.org; Wed, 25 Apr 2018 09:40:38 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0599D21964; Wed, 25 Apr 2018 09:40:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 25 Apr 2018 09:40:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=78NUCFs2llcyuHNC46dcr4MKMULyQEwAgAbYiHES35Y=; b=YYFIowmE w1P3I2ToY1uuVrePg7XUwLASkk0+U5OUg/Jn2dj3DQ0PLEyK+VzIPCiFvm2dwU6n r4TQpH0PWJBtBwf2CD0yrIdo30k0HBb8B/ltkN81RFsgTqK5e5G0m5IbHx2mUkJJ G5SA7j4r5z7XURY5w5jDoAnaHMJT+BccSsaItg5CiXaQ2x56nhSOlQiIvej5fxRR Tg4SNXfo4ni33ZbIeeT5s9537WFKhUG14KrTs10Mmc/rJ44DgSqHTObywBOCYiA+ qw6n4Upymi9UlFoheI058zf5Dle6ndHlxNaTOEREllJ5sU0V04HJPvdpHPTMZDE6 jzIV/znFejOR0A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=78NUCFs2llcyuHNC46dcr4MKMULyQ EwAgAbYiHES35Y=; b=V+Tc24eYTKgEl+yrtF3LW4f8ZfAo2kAmKQ5FF2usKszjb WDR73kGkkdythPJC3RH14rBvZnBAHeCBfzQELuo4Ap8jb6S789QP/j0j9yxK6ctE 2uWaNNSj23BrB+uH2ca9zubfTARdYoTVU2kxdK3H0SDaYyjtnsVxHTMKNENHN6Tk lYivZDM0iLJ4Hq0yMjj5sG1rv20H29cvi2XkBPLkVQ2RtZsta/HNzxLBNWR3I09s +7l45IgYegySF7sX5lsvfXEJNHygRVAGvrLMADXPZ83CliMKFmUIs5PB8eqS/zqy G7283INPac2wDgzHCvCeGhFsgO9CoI3Q0Z499zSwA== X-ME-Sender: Received: from localhost (228.92-221-162.customer.lyse.net [92.221.162.228]) by mail.messagingengine.com (Postfix) with ESMTPA id 7F8A41025D; Wed, 25 Apr 2018 09:40:36 -0400 (EDT) From: Marius Bakke In-Reply-To: <20180425152642.2a361ae5@mykolab.com> References: <20180425083346.29a434e9@mykolab.com> <87lgdb8rf2.fsf@fastmail.com> <20180425152642.2a361ae5@mykolab.com> User-Agent: Notmuch/0.26.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Wed, 25 Apr 2018 15:40:34 +0200 Message-ID: <87in8f8kvh.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Rutger Helling writes: > Hello Marius,=20 > > Thanks for the review! I've taken your suggestions into account and > updated the patches. > > I don't think it's possible to seperate the GTK3 frontend, since it's > just a parameter you pass to the qemu* binaries (-display gtk instead > of -display sdl). > > From my understanding if you have both GTK3 and SDL2 enabled it > defaults to GTK3. We can remove the SDL2 frontend if there are no > objections (and probably sdl from the --audio-drv-list). I just figured > it'd be nicer to enable both to give users maximum flexibility. OK! [...] > From e1b40133c8aedf84090fbd4292af2b53eb22d669 Mon Sep 17 00:00:00 2001 > From: Rutger Helling > Date: Wed, 25 Apr 2018 14:59:11 +0200 > Subject: [PATCH 1/2] gnu: qemu: Build with Python 3 and SDL2 support. > > * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. > * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl. > [native-inputs]: Use python instead of python@2. Add python-wrapper. > * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 ins= tead of > sdl from inherited packages. > * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. > [native-inputs]: Remove python from inherited packages and use python@2 i= nstead. > --- > gnu/packages/bootloaders.scm | 16 ---------------- > gnu/packages/virtualization.scm | 30 ++++++++++++++++++++++++++---- > 2 files changed, 26 insertions(+), 20 deletions(-) Can you adjust 'american-fuzzy-lop' to use the moved qemu-minimal-2.10 package too? Please also drop the '@@ (gnu packages bootloaders)' stuff and just use '(inherit qemu-minimal-2.10 ...)' now that it's public. [...] > @@ -187,7 +187,7 @@ exec smbd $@"))) > ;; ("pciutils" ,pciutils) > ("pixman" ,pixman) > ("pulseaudio" ,pulseaudio) > - ("sdl" ,sdl) > + ("sdl2" ,sdl2) > ("spice" ,spice) > ("usbredir" ,usbredir) > ("util-linux" ,util-linux) > @@ -197,7 +197,8 @@ exec smbd $@"))) > (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. > ("perl" ,perl) > ("pkg-config" ,pkg-config) > - ("python" ,python-2) ; incompatible with Python 3 a= ccording to error message > + ("python" ,python) > + ("python-wrapper" ,python-wrapper) The first "python" can be removed (only python-wrapper is necessary). > ("texinfo" ,texinfo))) > (home-page "https://www.qemu.org") > (synopsis "Machine emulator and virtualizer") > @@ -233,9 +234,30 @@ server and embedded PowerPC, and S390 guests.") >=20=20 > ;; 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=20 > +;; The GRUB test suite fails with later versions of Qemu, so we > +;; keep it at 2.10 for now. See > +;; . > +;; TODO: When grub no longer needs this version, move to gnu/packages/de= bug.scm. The TODO line can be removed too. And maybe add a comment such as "Keep it hidden since we don't backport security patches" or something along those lines. [...] > From edea64c09dc1e0f391e860478dcf99f4d0d1a6d2 Mon Sep 17 00:00:00 2001 > From: Rutger Helling > Date: Wed, 25 Apr 2018 15:03:29 +0200 > Subject: [PATCH 2/2] gnu: qemu: Enable GTK3 frontend. > > * gnu/packages/virtualization.scm (qemu)[native-inputs]: Add "gettext" to= native-inputs. > [inputs]: Add "gtk+" to inputs. > * gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove "= gettext" > from inherited inputs. > [inputs]: Remove "gtk+" from inherited inputs. LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlrghVMACgkQoqBt8qM6 VPrMlAf/QmkyG50dn+jW6NA9vnVXG1HjumWJrTxd2mjQiYzOrMtIjDOkdu8aGlQC w4WS+z4+WWjB19MtLr95Vm6RKPtAw4ynS7CqKkn+giq+ylz0RMA2QiztGUC/NIP0 uyTb9bP4bkve516x5CiTwj+Bk80btCU62JPRb865Q3VkTgkCNiFDjRneBnHctyLu l4VYY23ZqAPYhsd1fBkyg3cIr/hPzPrZBfYu0u7T9NAdlcJFJTYdkifaMMw+Qtr3 Rdaxsc7mcWqljaTCOrYqLvLkLWhNaEcDlOBCMyOixeSIBTt4GsEtlNt6yiKNQ6RI oNho0kyLWHCY51swPL5Ax5+wP0ZV1g== =YbTr -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 21 14:53:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v3 Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Apr 2018 06:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Marius Bakke Cc: 31254@debbugs.gnu.org Received: via spool by 31254-submit@debbugs.gnu.org id=B31254.152472423525008 (code B ref 31254); Thu, 26 Apr 2018 06:31:01 +0000 Received: (at 31254) by debbugs.gnu.org; 26 Apr 2018 06:30:35 +0000 Received: from localhost ([127.0.0.1]:39866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBaQE-0006V9-Bi for submit@debbugs.gnu.org; Thu, 26 Apr 2018 02:30:35 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:23094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBaQC-0006Uv-0V for 31254@debbugs.gnu.org; Thu, 26 Apr 2018 02:30:24 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 1B9923340; Thu, 26 Apr 2018 08:30:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1524724216; x=1526538617; bh=e9u3hQ0n28pE/6ru5gX34/IGDT8PnIlVEJsClJjZbYg=; b=00Zhm4amTQ9C HYyndNulfz/CNWllM7omEPEf7kRJeqjVt0nal5X1/SGrQ5huvmvMkTWhlDb6FNGN /sOMM+CuzzEbdQIfFd2/NYgcVOw6y6Ws9+9EKGVubHRCasnP47fmNOSvj+j/YQoT sGwUO8P+xKXGqHJ8M+o+1KMbDYrpgUohHXFEQBH1dPEDzNu24pYPtSAwttv1tKtx mpMlDoa1gcEEcImiQ7fLR0u0JoZREYMnBXTDCULb3fmKpl+1eUDV/sY3T1fu5uTf b2QmZho2aEdAmVREM3Gcmp4QBBDqlmisyn5r30XVwiCuvUnl4kRhQo5RAf0OIzAv O/RlAJGx/Selm48YMBpfNMBhkifEVImzhh1yODzKQmKKvT1pzQcq6s17Qf46yPY4 k2CQmVH1iTW9Gox2ObaHufiTpHjd0ZnoPwC1YQHxE6OAdeg0N4KY9LK582tT+UUj EfnrISQ5k8ihtvvPDNqagWvh3KpMTWkzVGqGMePLzwwGFDJYUPPsRVs6mRIHhb9u aYApyyGtyOP40CTkTBjMpBrU2NHc+P2r+c7NlYhcX9f4EbWd7QeCNi5vzbNWUHTI SwdeHb1+v27oTWWXOTu2PTzDxDSKHXuRwfy4laGzcW6AU58h/PG/kLghxqs5jfBe QxVfCSpxV7RloTKals6qJQ420VNnEbs= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, FREEMAIL_FROM=0.001] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id krhHHJtd0noB; Thu, 26 Apr 2018 08:30:16 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 12F15333E; Thu, 26 Apr 2018 08:30:16 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx003.mykolab.com (Postfix) with ESMTPS id DD587AFD; Thu, 26 Apr 2018 08:30:15 +0200 (CEST) Date: Thu, 26 Apr 2018 08:30:06 +0200 From: Rutger Helling Message-ID: <20180426083006.6a942577@mykolab.com> In-Reply-To: <87in8f8kvh.fsf@fastmail.com> References: <20180425083346.29a434e9@mykolab.com> <87lgdb8rf2.fsf@fastmail.com> <20180425152642.2a361ae5@mykolab.com> <87in8f8kvh.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/ad55_AMF5txwTi+TEDtzyk7"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/ad55_AMF5txwTi+TEDtzyk7 Content-Type: multipart/mixed; boundary="MP_/XMScmxfhsmbQPdz5/27s=nQ" --MP_/XMScmxfhsmbQPdz5/27s=nQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Thanks again! I've made the changes, so here's another set of patches. Note that the second patch is unchanged, just rebased. On Wed, 25 Apr 2018 15:40:34 +0200 Marius Bakke wrote: > Rutger Helling writes: >=20 > > Hello Marius,=20 > > > > Thanks for the review! I've taken your suggestions into account and > > updated the patches. > > > > I don't think it's possible to seperate the GTK3 frontend, since > > it's just a parameter you pass to the qemu* binaries (-display gtk > > instead of -display sdl). > > > > From my understanding if you have both GTK3 and SDL2 enabled it > > defaults to GTK3. We can remove the SDL2 frontend if there are no > > objections (and probably sdl from the --audio-drv-list). I just > > figured it'd be nicer to enable both to give users maximum > > flexibility. =20 >=20 > OK! >=20 > [...] >=20 > > From e1b40133c8aedf84090fbd4292af2b53eb22d669 Mon Sep 17 00:00:00 > > 2001 From: Rutger Helling > > Date: Wed, 25 Apr 2018 14:59:11 +0200 > > Subject: [PATCH 1/2] gnu: qemu: Build with Python 3 and SDL2 > > support. > > > > * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. > > * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead > > of sdl. [native-inputs]: Use python instead of python@2. Add > > python-wrapper. > > * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove > > sdl2 instead of sdl from inherited packages. > > * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. > > [native-inputs]: Remove python from inherited packages and use > > python@2 instead. --- > > gnu/packages/bootloaders.scm | 16 ---------------- > > gnu/packages/virtualization.scm | 30 ++++++++++++++++++++++++++---- > > 2 files changed, 26 insertions(+), 20 deletions(-) =20 >=20 > Can you adjust 'american-fuzzy-lop' to use the moved qemu-minimal-2.10 > package too? Please also drop the '@@ (gnu packages bootloaders)' > stuff and just use '(inherit qemu-minimal-2.10 ...)' now that it's > public. >=20 > [...] >=20 > > @@ -187,7 +187,7 @@ exec smbd $@"))) > > ;; ("pciutils" ,pciutils) > > ("pixman" ,pixman) > > ("pulseaudio" ,pulseaudio) > > - ("sdl" ,sdl) > > + ("sdl2" ,sdl2) > > ("spice" ,spice) > > ("usbredir" ,usbredir) > > ("util-linux" ,util-linux) > > @@ -197,7 +197,8 @@ exec smbd $@"))) > > (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. > > ("perl" ,perl) > > ("pkg-config" ,pkg-config) > > - ("python" ,python-2) ; incompatible with > > Python 3 according to error message > > + ("python" ,python) > > + ("python-wrapper" ,python-wrapper) =20 >=20 > The first "python" can be removed (only python-wrapper is necessary). >=20 > > ("texinfo" ,texinfo))) > > (home-page "https://www.qemu.org") > > (synopsis "Machine emulator and virtualizer") > > @@ -233,9 +234,30 @@ server and embedded PowerPC, and S390 guests.") > > =20 > > ;; 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 > > +;; The GRUB test suite fails with later versions of Qemu, so we > > +;; keep it at 2.10 for now. See > > +;; > > . > > +;; TODO: When grub no longer needs this version, move to > > gnu/packages/debug.scm. =20 >=20 > The TODO line can be removed too. And maybe add a comment such as > "Keep it hidden since we don't backport security patches" or > something along those lines. >=20 > [...] >=20 > > From edea64c09dc1e0f391e860478dcf99f4d0d1a6d2 Mon Sep 17 00:00:00 > > 2001 From: Rutger Helling > > Date: Wed, 25 Apr 2018 15:03:29 +0200 > > Subject: [PATCH 2/2] gnu: qemu: Enable GTK3 frontend. > > > > * gnu/packages/virtualization.scm (qemu)[native-inputs]: Add > > "gettext" to native-inputs. [inputs]: Add "gtk+" to inputs. > > * gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: > > Remove "gettext" from inherited inputs. > > [inputs]: Remove "gtk+" from inherited inputs. =20 >=20 > LGTM! --MP_/XMScmxfhsmbQPdz5/27s=nQ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-qemu-Build-with-Python-3-and-SDL2-support.patch =46rom 27b224a217e3896488eb5210d466e08452541a18 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 26 Apr 2018 08:14:50 +0200 Subject: [PATCH 1/2] gnu: qemu: Build with Python 3 and SDL2 support. * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl. [native-inputs]: Use python-wrapper instead of python@2. * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 inste= ad of sdl from inherited packages. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. [native-inputs]: Remove python-wrapper from inherited packages and use pyth= on@2 instead. * gnu/packages/debug.scm (american-fuzzy-lop): Inherit from moved hidden-pa= ckage qemu-minimal-2.10. --- gnu/packages/bootloaders.scm | 16 ---------------- gnu/packages/debug.scm | 3 ++- gnu/packages/virtualization.scm | 29 +++++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 281bb98fa..4350ff3a5 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -72,22 +72,6 @@ (base32 "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) =20 -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; . -;; TODO: When grub no longer needs this version, move to gnu/packages/debu= g.scm. -(define qemu-minimal-2.10 - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw"))))= )) - (define-public grub (package (name "grub") diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 112c656ff..c12baf4e2 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2014, 2015, 2016, 2017 Eric Bavier ;;; Copyright =C2=A9 2016, 2017, 2018 Efraim Flashner ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2018 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,7 +170,7 @@ tools that process C/C++ code.") (inputs `(("custom-qemu" ;; The afl-qemu tool builds qemu 2.10.0 with a few patches appli= ed. - ,(package (inherit (@@ (gnu packages bootloaders) qemu-minimal-2= .10)) + ,(package (inherit qemu-minimal-2.10) (name "afl-qemu") (inputs `(("afl-src" ,source) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 86f4d7136..74144b9db 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 @@ -187,7 +187,7 @@ exec smbd $@"))) ;; ("pciutils" ,pciutils) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) - ("sdl" ,sdl) + ("sdl2" ,sdl2) ("spice" ,spice) ("usbredir" ,usbredir) ("util-linux" ,util-linux) @@ -197,7 +197,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-wrapper" ,python-wrapper) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") @@ -233,9 +233,30 @@ server and embedded PowerPC, and S390 guests.") =20 ;; 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 +;; The GRUB test suite fails with later versions of Qemu, so we +;; keep it at 2.10 for now. See +;; . +;; This package is hidden since we do not backport updates to it. +(define-public qemu-minimal-2.10 + (hidden-package + (package + (inherit qemu-minimal) + (version "2.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")))) + ;; 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-wrapper"))))))) + (define-public libosinfo (package (name "libosinfo") --=20 2.17.0 --MP_/XMScmxfhsmbQPdz5/27s=nQ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-qemu-Enable-GTK3-frontend.patch =46rom cd8d059b51e78f942789ef1642c00500a4d6c86d Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 26 Apr 2018 08:17:05 +0200 Subject: [PATCH 2/2] gnu: qemu: Enable GTK3 frontend. * gnu/packages/virtualization.scm (qemu)[native-inputs]: Add "gettext" to n= ative-inputs. [inputs]: Add "gtk+" to inputs. * gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove "ge= ttext" from inherited inputs. [inputs]: Remove "gtk+" from inherited inputs. --- gnu/packages/virtualization.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 74144b9db..465439f01 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) @@ -173,6 +174,7 @@ exec smbd $@"))) `(("alsa-lib" ,alsa-lib) ("attr" ,attr) ("glib" ,glib) + ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) ("libcap" ,libcap) ; virtfs support requires libcap & lib= attr @@ -194,7 +196,8 @@ exec smbd $@"))) ;; ("vde2" ,vde2) ("virglrenderer" ,virglrenderer) ("zlib" ,zlib))) - (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. + (native-inputs `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; gtester, etc. ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) @@ -232,8 +235,10 @@ server and embedded PowerPC, and S390 guests.") ''("--target-list=3Di386-softmmu,x86_64-softmmu,mips64el-softmmu,a= rm-softmmu,aarch64-softmmu")))) =20 ;; Remove dependencies on optional libraries, notably GUI libraries. + (native-inputs (fold alist-delete (package-native-inputs qemu) + '("gettext"))) (inputs (fold alist-delete (package-inputs qemu) - '("libusb" "mesa" "sdl2" "spice" "virglrenderer" + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) =20 ;; The GRUB test suite fails with later versions of Qemu, so we --=20 2.17.0 --MP_/XMScmxfhsmbQPdz5/27s=nQ-- --Sig_/ad55_AMF5txwTi+TEDtzyk7 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlrhce4ACgkQ86cn20T8 yjbBawf8Cu4OyC6CdJM1sbz0xpFc87TYuxDoCWuXXMjXOZh5w2WbIobJFy6eaajs Lsne/lCs7pR02eh6d8k+hp1l3xVBEFLICXDcLQc5kT0Uq2T2GdH4PRdWEEA8gmc+ UbIAYVCH4GyIx+7hTbJ0J+l25BDVPEDkP4lCrKzee5mC2x2iObN0u5c1qYv8Yy56 9v/xq+Hq3Iy5Z5GOwmQ7kDl/BN0eR4rd1YiH9u4/w+sdX+XxU0FhqaalmU+6soIx TZJzQjhGmHWpGtQVTBd4TumxCVZrIV/So2mmdbNAwrhSrIIkIjxrU7sKRbt0bjyh THg1ev87LY6qoU84NR449pB5hCl6VQ== =6I4B -----END PGP SIGNATURE----- --Sig_/ad55_AMF5txwTi+TEDtzyk7-- From unknown Thu Aug 21 14:53:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v3 Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Apr 2018 10:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Rutger Helling Cc: 31254@debbugs.gnu.org Received: via spool by 31254-submit@debbugs.gnu.org id=B31254.152473817912984 (code B ref 31254); Thu, 26 Apr 2018 10:23:01 +0000 Received: (at 31254) by debbugs.gnu.org; 26 Apr 2018 10:22:59 +0000 Received: from localhost ([127.0.0.1]:39926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBe3H-0003NL-0B for submit@debbugs.gnu.org; Thu, 26 Apr 2018 06:22:59 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBe3F-0003NE-3t for 31254@debbugs.gnu.org; Thu, 26 Apr 2018 06:22:57 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id AB65921B7D; Thu, 26 Apr 2018 06:22:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 26 Apr 2018 06:22:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=YAarFRyJGQHHdHFa5+hCCrtuE4WwJo4X9J8mzmSHkVI=; b=g+ZeeeaI 5y33hsE8R2LxIL3tUjd7PWOJ942al57zJ6zd6EO8iW68Sfoh/jghy60MDvXGuj6x dLFXkOt+8f2mLWDYx6KwAvuL6WfdYmILBzi+/SdHxy9jSg62f71FV8qt5EWLrdXu oDjBhvCzZY9N0BvQDlnWFeizQsktYp7HBCi9bC78HgVldIcQVmn07ZvM006Gx6dV tdUCiEGOYAZkXFQZck8wNcZDN9svu+KbDk7fgF/C3FfSC1dRUj+i1QEwP9tQv/ap 4YJHGJJlub1UYfIylpVa2Zn4vixSOGgB96AaNSp3k3oX+sZxhhqjCP9p8bZRueFm 4vDL7QHLKHKD9w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=YAarFRyJGQHHdHFa5+hCCrtuE4WwJ o4X9J8mzmSHkVI=; b=VPGyyFOWpabaULOgwTcUhVq5OHa+CYS4RueL7S9SgWP41 byRNs+kE+3NX8uid8PIRxVujlrr2brD2gKLnviAU0RE0FbJ9kyLYlsHMHLuip3dx 0VVzH38jpvUlLYmjNTfV7N85gdpNJGbsPQ80uYZHv7NOe9PLjaLxDXrmXl1FPBt5 aT556DtB6lXVaNkXOM1bC+K71YTLU7kaLTpUMD5CH2z9wr0m3AoUKru6MmMmhYpr cTubEH+mECfWKbdwdIuW0bWG+/yfE48AScOr+eXU2r+/OPZR43WONgKtCSXEkW2T JhkKSV9GktMK8SDkISggG0LoEQ9n/HMzpCqvfbuOA== X-ME-Sender: Received: from localhost (228.92-221-162.customer.lyse.net [92.221.162.228]) by mail.messagingengine.com (Postfix) with ESMTPA id 406CC10256; Thu, 26 Apr 2018 06:22:56 -0400 (EDT) From: Marius Bakke In-Reply-To: <20180426083006.6a942577@mykolab.com> References: <20180425083346.29a434e9@mykolab.com> <87lgdb8rf2.fsf@fastmail.com> <20180425152642.2a361ae5@mykolab.com> <87in8f8kvh.fsf@fastmail.com> <20180426083006.6a942577@mykolab.com> User-Agent: Notmuch/0.26.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Thu, 26 Apr 2018 12:22:54 +0200 Message-ID: <87efj28dxd.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Rutger Helling writes: > Thanks again! I've made the changes, so here's another set of patches. > Note that the second patch is unchanged, just rebased. Excellent. Both patches LGTM. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlrhqH4ACgkQoqBt8qM6 VPpaOwgAtA6F81I1G6Yqt1IJaLNp3vN6favKl5MgvegOhlRv1qVegNV9puuJZapn pOQZAEoyKGZ4RqOr4O0D023fFiejPQS9toricS6a4+cb1x/YaaVPutQvgM0NZ2Ge 9KijS5hwwqj+bmt3JiRkmkhQmlbRoDw3Xsqtlw8ij2g7SxDCuH16t9KDvkTqyNzd lyMJLd0ZogJn+AKRdV0/b2zjHrq0cuF2GEJsKW68Pcddfuwd8BA5WGbiPvNCZ4Oh QjYDPWjoNfBvAI7w7MprnwyB2cHKY4/YM9uE4g+SVrcYRC12ycDe9zwJ1KrtyYfK luAhSbr/pYPjEZ2x9Wb+1RwltqKdbg== =q4SF -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 21 14:53:05 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Rutger Helling Subject: bug#31254: closed (Re: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v3) Message-ID: References: <20180426125440.6dcbe16a@mykolab.com> <20180425083346.29a434e9@mykolab.com> X-Gnu-PR-Message: they-closed 31254 X-Gnu-PR-Package: guix-patches Reply-To: 31254@debbugs.gnu.org Date: Thu, 26 Apr 2018 10:55:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1524740103-16017-1" This is a multi-part message in MIME format... ------------=_1524740103-16017-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31254: gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31254@debbugs.gnu.org. --=20 31254: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31254 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1524740103-16017-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31254-done) by debbugs.gnu.org; 26 Apr 2018 10:55:01 +0000 Received: from localhost ([127.0.0.1]:39969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBeYH-00049w-EG for submit@debbugs.gnu.org; Thu, 26 Apr 2018 06:55:01 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:44250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBeYD-00049Y-Gs for 31254-done@debbugs.gnu.org; Thu, 26 Apr 2018 06:54:58 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id 48535447BA; Thu, 26 Apr 2018 12:54:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1524740090; x=1526554491; bh=ohchGwc2GQgD1CbvrDV2x9E/d47onm2FMHst2PPgCOs=; b=d+EYfzd2ccXY 3Z1HNH+uBNBwz+HrZ+sPmYW3n8q475/f8D9o/sqd0Fo+cpNn+h66q8MVEdnKlc3g Vh1HxQBC3uNlQ07WjWs6WLcMpXDZwvto1pO8zgwhlgB89WNGICNwWvi529/fPkps i9Gq60CUhYToTPGPZsFxEAsZS5fZ32FQRIk599riNZ29URIjbvhNBkVeHBl1QqW7 lpPsP1APxM0A/UrHH7nthJ3shnklWb+yd5BZEmmP4DDFPqaAA/zx1k1CEIP1zFIf r5/dRZJz9grXHftwVLHczkOdGV3zdYxiGPNMulLovn0YKE7gesER8zrl2C2QjqfR 8m7+xJlXU8Q45WL7XHFt0rjePesmi8iJyHmfD30aJx9Iov1wVfVFxFzLnZk5B28D VgqrwXJq5QBFKPFTOHU4n2X+Dwr5jMau6BgBLaMdujtqV7KYmcLlIEnUDmXPi/Sz WQa8dW1Ohm5Ac94BIDUiGmugunLTyjvguhxPjAOJ+ZcBi0kr/dJpAdfdXRDKO5LD VWnitMfxwoJroqH1HamBCz3wb03gdG4PaMdIwHs0THc7cN1pKZ1TdT5oJH7/GmLp /T+N1YD3L/IZKLF6BDOLoIb7blhqYruPdJK/z7724d5PsCUVYz44Jd3V0rwks5XI gafKIhpsdAzTei2MUC8KUhtBAEfznCw= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, FREEMAIL_FROM=0.001] autolearn=ham autolearn_force=no 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 M5xZ-zllXOi2; Thu, 26 Apr 2018 12:54:50 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 20BF7447B2; Thu, 26 Apr 2018 12:54:50 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id F2DE46CFB; Thu, 26 Apr 2018 12:54:49 +0200 (CEST) Date: Thu, 26 Apr 2018 12:54:40 +0200 From: Rutger Helling To: Marius Bakke Subject: Re: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v3 Message-ID: <20180426125440.6dcbe16a@mykolab.com> In-Reply-To: <87efj28dxd.fsf@fastmail.com> References: <20180425083346.29a434e9@mykolab.com> <87lgdb8rf2.fsf@fastmail.com> <20180425152642.2a361ae5@mykolab.com> <87in8f8kvh.fsf@fastmail.com> <20180426083006.6a942577@mykolab.com> <87efj28dxd.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/QZGl7qzyWSef61+0WgmG_LJ"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31254-done Cc: 31254-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/QZGl7qzyWSef61+0WgmG_LJ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable I pushed the patches. Thanks again for the help! On Thu, 26 Apr 2018 12:22:54 +0200 Marius Bakke wrote: > Rutger Helling writes: >=20 > > Thanks again! I've made the changes, so here's another set of > > patches. Note that the second patch is unchanged, just rebased. =20 >=20 > Excellent. Both patches LGTM. Thanks! --Sig_/QZGl7qzyWSef61+0WgmG_LJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlrhr/AACgkQ86cn20T8 yjZ4UAf/TSuNQtkRNysV9VEFkGYTjE9XvciIgwru0yogJGW1IPyuEUPCrPSjI+Tv rmeeIXB/DA8j5CekPV8uy0ttzrePkNIAUR7l0kadX4QM4zAa9+ZYxGKStI25SRCI kgMAF4SNaa4Bz+13iRegv3QpDhS886o0b+IWrWWwuxmdsG9UbeJBl+Hm03p9hfEW av/GDuknV4fEjTUKD64Ez4CI7X8mahVzZ5NK3WzUGJns5fvjnzhX3wkbyd8f52/K emMhZXLSp1O76OJcKsc1Mj2J2sq7k/VTL5h+rmblW5ae6ke1o+IS6fjl3AfZMEty ASVQi0CKZBZcya+43LSwPpL6Mewhhw== =a5Aa -----END PGP SIGNATURE----- --Sig_/QZGl7qzyWSef61+0WgmG_LJ-- ------------=_1524740103-16017-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Apr 2018 06:34:26 +0000 Received: from localhost ([127.0.0.1]:38684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBE0S-0007Mk-Js for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBE0Q-0007MV-M7 for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBE0J-0004k1-Rz for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:44100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBE0J-0004jr-Mi for submit@debbugs.gnu.org; Wed, 25 Apr 2018 02:34:11 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1524638037; x=1526452438; bh=JoE7wIo5sKknOC0NlIB xSkWSULKFbwJPB+I23qSthf0=; b=vP3j6eaMhzfXx8cVhiXdIhs87JlxOomTLnD PQx66ftm0+995CCGSFbR2+Ayr4AKIj9Br9LMiYrwfdw4XZe5BicZFs5LbTuvJYRI lBSw+l5WS30HGRWJUC9neKpm2C3XpHfiZd0AJipH7IAbQZZvktj2QdpkVgaK15ct RP9Bg1MWXX/EzZYxwbxRuKtsmc9xq76zc6YsYIOwqNti5T4bXv623T/lmYNGzGYF qW+PrmgURX+/wyBzf4wm8SZ103xPE2Pzc3GAdXRz+X/iRX52F+/o99FWQ2hVK2W4 vvuzaadQFmUVqfZQKl2aEfuB66St9yVC8oPBG3U8MDpAnZe2X0PfXstyHCORw/aY setcSRVGm/LWPwB0jQz5ONMXELOBRI7Rr/EXZHOXWs9KhpKfprrh/S6fgxXW6wMf 4+/33K9qOlnM/32TrA66GZq32K9aUAIPrsc9jdH4QwsI+642UgkzhsGQIA/wdKDK zlUKoeJclMd4Y7V+ieY+n/oza2GWBwUha/VxPEcubZys425YOcODkb93GRro9gt6 8apF7AO1gsbJMXwIpbmaeQRlxfz9k0zW1UjEsz5X91oSuBFz5s+1j9NkGr3M1rpz TgPryBg6Bdd0DUutDCigHX79J4UCpyrpAaf0Q79NtRMy+mlx401qBvwGtlLbceI9 P++9LNl4= X-Virus-Scanned: amavisd-new at mykolab.com 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 To: guix-patches@gnu.org Subject: gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) 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" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --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-- ------------=_1524740103-16017-1--