From nobody Fri Sep 09 16:09:43 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MPLY40Nl1z4bl3b; Fri, 9 Sep 2022 16:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MPLY3702nz3wjv; Fri, 9 Sep 2022 16:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662739784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IevHXvYoSmcxIYMQlQpERW6mBfwvkrk5tJ1qP6iiqV8=; b=BgGvp+cvyqdMm3B9biJnLUzEbAQx+Wlhibg76O48JAW0YaxCuPKAquYM1QepuXalC8EKqK E4vwp4TYcdHXhNgIAepz5KJyyLJEYuSwZ96OGh0x5gryWjXgG5r3+HkFV0jfj6OT+TRaYU JlDmUoSZ287yMaLcPzyeRjwOBGhDCClptLapsyl6UZB77UNvJc4DyYPqxnbOBhlIK1PG2I xdS7IzKQIAn51qmw+NctE38InEHZz6w7cBIBD+pGRGm04ndLGwc5ESu5+8tMGolsRNVB3n dRnvZLrNJbsjTnstWJoAUU5SIQaKoIiPBh8nm2xQXSKRljhOsnFHTTHzWh9AsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MPLY35x0Xz1Ft5; Fri, 9 Sep 2022 16:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 289G9hM3059012; Fri, 9 Sep 2022 16:09:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289G9hT6059011; Fri, 9 Sep 2022 16:09:43 GMT (envelope-from git) Date: Fri, 9 Sep 2022 16:09:43 GMT Message-Id: <202209091609.289G9hT6059011@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: bd81f4162478 - main - emulators/qemu: Update version 7.0.0=>7.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd81f4162478a2a965e597f6a375eece962fe7b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662739784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IevHXvYoSmcxIYMQlQpERW6mBfwvkrk5tJ1qP6iiqV8=; b=ESYniVDdE2k7PIEfPedXIhr2C9ic4MgHWvG932/djcAcGAPKBy3QKFqBA2Q9Rja69rCcyO oZEoncYkXV/Ah7y6LJNZ4nQqzW0uZazI9Dgl9FhKsrXTuGDFEi9faO/5H4e+IekgvbIyrb b3lfRWLHDRHGvf8KrMOJb7YpJObalUVpH4p9Utu6BVVUt4ElrBzXgAUVs+RZBtcnJLPbVb 1Es70ojJ54XxwWE35sNBz7wjxkimWAfnWy2WQtN12jf58zOGzrR32VcR8rfQxmU9br+nQN u/YC7ep8tAOoKizTREXn6EaypDI7RZUoDjINIlFcPHF62GGE+6TcuNmN8rq+bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662739784; a=rsa-sha256; cv=none; b=ut3TE5Au5QyjIta0k6rnY3nUtR7a2mW2dk6PDnlGWvk9MmW9wHwPPNow+LJltOkp/YXspw +9Y41vh87n1KpF4Vk2NvIkIEcbWhP2lK/MJ2ixc+qYBnYRGzr/zWdT3Ys30sKrsx10NXG4 8wWahpFMcs0PhjHXKvluohuFvBoDF+njdgwqJiZV98dslytsO076MNETTiiUSuwTK9qBvp 1LCOynROOMVsRNn0CtLasXuZoYrKuLAEuUTeZRade3MbOANhYb9oVdepbRhdd4eXY0Li1z Oh6W4mHm9ERCaenjx+sAVxEu8vL3G9A0JP/l1GRF/NmrazqdIau1OFTzH57rdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd81f4162478a2a965e597f6a375eece962fe7b6 commit bd81f4162478a2a965e597f6a375eece962fe7b6 Author: Muhammad Moinur Rahman AuthorDate: 2022-09-09 16:06:31 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-09-09 16:09:30 +0000 emulators/qemu: Update version 7.0.0=>7.1.0 - Unbreak on latest HEAD [1] Users who want to stick with 7.0.X branch please check UPDATING or use qemu6. As previous qemu comes with three flavors: the default with X11 support, -nox11 without X11 support and -tools which installs only a subset of entire qemu. Reported by: jhb [1] Relnotes: https://wiki.qemu.org/ChangeLog/7.1 --- UPDATING | 14 ++++++++++++++ emulators/qemu/Makefile | 15 +++++++-------- emulators/qemu/distinfo | 6 +++--- .../qemu/files/patch-bsd-user_host_i386_host-signal.h | 12 ++++++++++++ .../qemu/files/patch-bsd-user_host_x86__64_host-signal.h | 12 ++++++++++++ emulators/qemu/pkg-plist | 2 ++ 6 files changed, 50 insertions(+), 11 deletions(-) diff --git a/UPDATING b/UPDATING index 639895fd020c..b7e65ad51109 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220909: + AFFECTS: users of emulators/qemu + AUTHOR: bofh@FreeBSD.org + + emulators/qemu has been updated to 7.1.0. Previous 7.0.X branch has + been repocopied to emulators/qemu70. If someone wants to stick with 7.0.X + branch please use one of the following command: + + # pkg install qemu70/qemu70-nox11(based on flavor used) + or + # portmaster -o emulators/qemu70 emulators/qemu + or + # portupgrade -o emulators/qemu70 emulators/qemu + 20220903: AFFECTS: users of editors/vim AUTHOR: adamw@FreeBSD.org diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index c6aa4f75fb65..9c8f7d367552 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,6 +1,5 @@ PORTNAME= qemu -PORTVERSION= 7.0.0 -PORTREVISION= 1 +PORTVERSION= 7.1.0 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -29,14 +28,14 @@ LIB_DEPENDS+= libepoxy.so:graphics/libepoxy FLAVORS= default nox11 tools FLAVOR?= ${FLAVORS:[1]} default_CONFLICTS_INSTALL= qemu-devel qemu-nox11 qemu-tools qemu-utils \ - qemu5* qemu6* + qemu6* qemu70* nox11_PKGNAMESUFFIX= -nox11 -nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu5* qemu6* +nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu6* qemu70* nox11_COMMENT= (without X11) tools_PKGNAMESUFFIX= -tools tools_COMMENT= (tools only) -tools_CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu-utils qemu5* \ - qemu6* +tools_CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu-utils qemu6* \ + qemu70* tools_DESCR= ${.CURDIR}/pkg-descr-tools tools_PLIST= ${.CURDIR}/pkg-plist-tools @@ -168,7 +167,7 @@ OPENGL_USES= gl OPENGL_USE= GL=gbm,gl OPENGL_CONFIGURE_OFF= --disable-opengl PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CONFIGURE_OFF= --disable-vnc-png +PNG_CONFIGURE_OFF= --disable-png SAMBA_USES= samba:run # smbd SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -237,8 +236,8 @@ post-install: .if ${FLAVOR:U} != tools ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* .endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index e40467f0d5ce..9198e302707a 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650583782 -SHA256 (qemu/7.0.0/qemu-7.0.0.tar.xz) = f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839 -SIZE (qemu/7.0.0/qemu-7.0.0.tar.xz) = 125117636 +TIMESTAMP = 1662663519 +SHA256 (qemu/7.1.0/qemu-7.1.0.tar.xz) = a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 +SIZE (qemu/7.1.0/qemu-7.1.0.tar.xz) = 121833004 diff --git a/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h b/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h new file mode 100644 index 000000000000..06a07c0f9425 --- /dev/null +++ b/emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h @@ -0,0 +1,12 @@ +--- bsd-user/host/i386/host-signal.h.orig 2022-09-08 16:00:45 UTC ++++ bsd-user/host/i386/host-signal.h +@@ -9,6 +9,9 @@ + #ifndef I386_HOST_SIGNAL_H + #define I386_HOST_SIGNAL_H + ++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#include ++#endif + #include + #include + #include diff --git a/emulators/qemu/files/patch-bsd-user_host_x86__64_host-signal.h b/emulators/qemu/files/patch-bsd-user_host_x86__64_host-signal.h new file mode 100644 index 000000000000..1864eb788f03 --- /dev/null +++ b/emulators/qemu/files/patch-bsd-user_host_x86__64_host-signal.h @@ -0,0 +1,12 @@ +--- bsd-user/host/x86_64/host-signal.h.orig 2022-04-19 19:10:27 UTC ++++ bsd-user/host/x86_64/host-signal.h +@@ -9,6 +9,9 @@ + #ifndef X86_64_HOST_SIGNAL_H + #define X86_64_HOST_SIGNAL_H + ++#if defined(__FreeBSD__) ++#include ++#endif + #include + #include + #include diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist index 00d0673675ba..3945e88c4478 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -14,6 +14,7 @@ bin/qemu-storage-daemon %%NO_X86_TARGETS%%bin/qemu-system-cris %%NO_X86_TARGETS%%bin/qemu-system-hppa bin/qemu-system-i386 +%%NO_X86_TARGETS%%bin/qemu-system-loongarch64 %%NO_X86_TARGETS%%bin/qemu-system-m68k %%NO_X86_TARGETS%%bin/qemu-system-microblaze %%NO_X86_TARGETS%%bin/qemu-system-microblazeel @@ -176,4 +177,5 @@ share/applications/qemu.desktop %%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/sv/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo +%%GTK3%%share/locale/uk/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo