diff options
| -rw-r--r-- | UPDATING | 14 | ||||
| -rw-r--r-- | emulators/qemu/Makefile | 15 | ||||
| -rw-r--r-- | emulators/qemu/distinfo | 6 | ||||
| -rw-r--r-- | emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h | 12 | ||||
| -rw-r--r-- | emulators/qemu/files/patch-bsd-user_host_x86__64_host-signal.h | 12 | ||||
| -rw-r--r-- | emulators/qemu/pkg-plist | 2 |
6 files changed, 50 insertions, 11 deletions
@@ -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 <sys/param.h> ++#endif + #include <sys/ucontext.h> + #include <machine/trap.h> + #include <vm/pmap.h> 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 <sys/param.h> ++#endif + #include <sys/ucontext.h> + #include <machine/trap.h> + #include <vm/pmap.h> 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 |