qemu: update to 6.2.0, enable GTK frontend (#7607)

* qemu: enable GTK frontend

* qemu: update to 6.2.0

* qemu-6.2.0: fix PROVIDES for secondary architecture

app-emulation/qemu/patches/qemu-6.2.0.patchset

@@ -1,20 +1,11 @@
-From e2fc63ba3e0f33018a2b0623e50feca92d234556 Mon Sep 17 00:00:00 2001
+From e4399a97f16a6a8b23ce95bafdec4df0d9c70ef9 Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Tue, 18 May 2021 16:49:20 -0500
-Subject: [PATCH] haiku: fixes and patches, rebased from qemu 3.x
+Subject: haiku: fixes and patches, rebased from qemu 3.x
 
----
- disas/nanomips.h         |  4 ++++
- os-posix.c               | 10 ++++++++++
- slirp/src/tftp.c         |  5 +++++
- target/mips/mips-semi.c  |  4 ++++
- util/main-loop.c         |  2 ++
- util/notify.c            |  4 ++++
- util/qemu-thread-posix.c |  4 ++++
- 7 files changed, 33 insertions(+)
 
 diff --git a/disas/nanomips.h b/disas/nanomips.h
-index a0a222530..8b8add814 100644
+index a0a2225..8b8add8 100644
 --- a/disas/nanomips.h
 +++ b/disas/nanomips.h
 @@ -25,10 +25,14 @@
@@ -33,7 +24,7 @@ index a0a222530..8b8add814 100644
  namespace img
  {
 diff --git a/os-posix.c b/os-posix.c
-index a6846f51c..cc0c80e8c 100644
+index ae6c9f2..c778f5c 100644
 --- a/os-posix.c
 +++ b/os-posix.c
 @@ -42,6 +42,16 @@
@@ -54,7 +45,7 @@ index a6846f51c..cc0c80e8c 100644
   * Must set all three of these at once.
   * Legal combinations are              unset   by name   by uid
 diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c
-index c6950ee10..5e1cad3ec 100644
+index a19c889..7b868f5 100644
 --- a/slirp/src/tftp.c
 +++ b/slirp/src/tftp.c
 @@ -29,6 +29,11 @@
@@ -69,30 +60,8 @@ index c6950ee10..5e1cad3ec 100644
  static inline int tftp_session_in_use(struct tftp_session *spt)
  {
      return (spt->slirp != NULL);
-diff --git a/target/mips/mips-semi.c b/target/mips/mips-semi.c
-index 6de60fa6d..717a24787 100644
---- a/target/mips/mips-semi.c
-+++ b/target/mips/mips-semi.c
-@@ -76,6 +76,7 @@ enum UHIOpenFlags {
- 
- /* Errno values taken from asm-mips/errno.h */
- static uint16_t host_to_mips_errno[] = {
-+#ifndef __HAIKU__
-     [ENAMETOOLONG] = 78,
- #ifdef EOVERFLOW
-     [EOVERFLOW]    = 79,
-@@ -83,6 +84,9 @@ static uint16_t host_to_mips_errno[] = {
- #ifdef ELOOP
-     [ELOOP]        = 90,
- #endif
-+#else
-+    NULL
-+#endif
- };
- 
- static int errno_mips(int err)
 diff --git a/util/main-loop.c b/util/main-loop.c
-index 5188ff654..62cdbf6dd 100644
+index 06b18b1..1d6f79e 100644
 --- a/util/main-loop.c
 +++ b/util/main-loop.c
 @@ -97,7 +97,9 @@ static int qemu_signal_init(Error **errp)
@@ -106,7 +75,7 @@ index 5188ff654..62cdbf6dd 100644
      sigaddset(&set, SIGBUS);
      /* SIGINT cannot be handled via signalfd, so that ^C can be used
 diff --git a/util/notify.c b/util/notify.c
-index 76bab212a..7c1ea8405 100644
+index 76bab21..7c1ea84 100644
 --- a/util/notify.c
 +++ b/util/notify.c
 @@ -67,6 +67,10 @@ int notifier_with_return_list_notify(NotifierWithReturnList *list, void *data)
@@ -121,10 +90,10 @@ index 76bab212a..7c1ea8405 100644
          if (ret != 0) {
              break;
 diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c
-index dcff5e7c5..2e8271be5 100644
+index e1225b6..46925cd 100644
 --- a/util/qemu-thread-posix.c
 +++ b/util/qemu-thread-posix.c
-@@ -311,7 +311,11 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
+@@ -332,7 +332,11 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
          }
      }
      if (rc < 0) {
@@ -137,5 +106,5 @@ index dcff5e7c5..2e8271be5 100644
      return 0;
  #endif
 -- 
-2.30.2
+2.37.3
 

app-emulation/qemu/qemu-6.2.0.recipe

@@ -5,11 +5,11 @@ QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
 different machine (e.g. your own PC). By using dynamic translation, it \
 achieves very good performance."
 HOMEPAGE="https://www.qemu.org/"
-COPYRIGHT="2003-2018 Fabrice Bellard"
+COPYRIGHT="2003-2021 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://download.qemu.org/qemu-$portVersion.tar.xz"
-CHECKSUM_SHA256="87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9"
+CHECKSUM_SHA256="68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45"
 SOURCE_DIR="qemu-$portVersion"
 PATCHES="qemu-$portVersion.patchset"
 ADDITIONAL_FILES="qemu.rdef.in"
@@ -35,9 +35,13 @@ archList_riscv="riscv32 riscv64"
 
 PROVIDES="
 	qemu$secondaryArchSuffix = $portVersion
+	cmd:elf2dmp$commandSuffix = $portVersion
 	cmd:qemu_edid$commandSuffix = $portVersion
+	cmd:qemu_keymap$commandSuffix = $portVersion
 	cmd:qemu_img$commandSuffix = $portVersion
 	cmd:qemu_io$commandSuffix = $portVersion
+	cmd:qemu_nbd$commandSuffix = $portVersion
+	cmd:qemu_storage_daemon$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -64,12 +68,13 @@ REQUIRES="
 	lib:libssp$secondaryArchSuffix
 	lib:libtasn1$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
+	lib:libxkbcommon$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_x86="
-	qemu_x86$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_x86 = $portVersion
 	cmd:qemu$commandSuffix = $portVersion
 	cmd:qemu_system_i386$commandSuffix = $portVersion
 	cmd:qemu_system_x86_64$commandSuffix = $portVersion
@@ -77,20 +82,25 @@ PROVIDES_x86="
 REQUIRES_x86="
 	$REQUIRES
 	qemu$secondaryArchSuffix
+	lib:libcairo$secondaryArchSuffix
+	lib:libepoxy$secondaryArchSuffix
+	lib:libgdk_pixbuf_2.0$secondaryArchSuffix
+	lib:libgtk_3$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 SUPPLEMENTS_x86="
 	qemu$secondaryArchSuffix
 	"
 
 PROVIDES_arm="
-	qemu_arm$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_arm = $portVersion
 	cmd:qemu_system_aarch64$commandSuffix = $portVersion
 	cmd:qemu_system_arm$commandSuffix = $portVersion
 	"
 REQUIRES_arm=$REQUIRES_x86
 
 PROVIDES_mips="
-	qemu_mips$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_mips = $portVersion
 	cmd:qemu_system_mips$commandSuffix = $portVersion
 	cmd:qemu_system_mips64$commandSuffix = $portVersion
 	cmd:qemu_system_mips64el$commandSuffix = $portVersion
@@ -99,27 +109,27 @@ PROVIDES_mips="
 REQUIRES_mips=$REQUIRES_x86
 
 PROVIDES_ppc="
-	qemu_ppc$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_ppc = $portVersion
 	cmd:qemu_system_ppc$commandSuffix = $portVersion
 	cmd:qemu_system_ppc64$commandSuffix = $portVersion
 	"
 REQUIRES_ppc=$REQUIRES_x86
 
 PROVIDES_sparc="
-	qemu_sparc$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_sparc = $portVersion
 	cmd:qemu_system_sparc$commandSuffix = $portVersion
 	cmd:qemu_system_sparc64$commandSuffix = $portVersion
 	"
 REQUIRES_sparc=$REQUIRES_x86
 
 PROVIDES_m68k="
-	qemu_m68k$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_m68k = $portVersion
 	cmd:qemu_system_m68k$commandSuffix = $portVersion
 	"
 REQUIRES_m68k=$REQUIRES_x86
 
 PROVIDES_riscv="
-	qemu_riscv$secondaryArchSuffix = $portVersion
+	qemu${secondaryArchSuffix}_riscv = $portVersion
 	cmd:qemu_system_riscv32$commandSuffix = $portVersion
 	cmd:qemu_system_riscv64$commandSuffix = $portVersion
 	"
@@ -134,8 +144,9 @@ BUILD_REQUIRES="
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libgnutls$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
+	devel:libgtk_3${secondaryArchSuffix}
 	devel:libintl$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix >= 9
+	devel:libjpeg$secondaryArchSuffix
 	devel:liblzo2$secondaryArchSuffix
 	devel:libncursesw$secondaryArchSuffix
 	devel:libnettle$secondaryArchSuffix