<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dff771721e24e89fcd274724295b68fb9362d647">https://github.com/macports/macports-ports/commit/dff771721e24e89fcd274724295b68fb9362d647</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dff771721e2 qemu: update to 8.2.0
</span>dff771721e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dff771721e24e89fcd274724295b68fb9362d647
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Fri Jan 19 06:39:51 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> qemu: update to 8.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68625
</span>---
emulators/qemu/Portfile | 34 ++++++++++++--------------
emulators/qemu/files/patch-qemu-configure.diff | 18 --------------
2 files changed, 16 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/Portfile b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 159946066c2..d0d4a06683f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,19 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
# clock_gettime
legacysupport.newest_darwin_requires_legacy 16
name qemu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.0.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.2.0
</span> revision 0
categories emulators
license GPL-2+
maintainers {raimue @raimue} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {gmail.com:herby.gillot @herbygillot} \
</span> openmaintainer
description Emulator for various architectures
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,20 +26,21 @@ homepage https://www.qemu.org
</span> master_sites https://download.qemu.org/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3673ec927f33f470081a467444eca30aa75742a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 91d3024d51e441c235dcb1b0c87cb3aab302283166e8d3d5f8282aa06c346be1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 126175064
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b4e45c7aa7853cffbadba769c5027d126cae2da8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf00d2fa12010df8b0ade93371def58e632cb32a6bfdc5f5a0ff8e6a1fb1bf32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 130008888
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_version 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_version 312
</span> set py_branch \
[string index ${py_version} 0].[string range ${py_version} 1 end]
depends_build-append port:texinfo \
port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:meson \
</span> port:ninja \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${py_version}-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_version}-meson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_version}-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_version}-sphinx_rtd_theme
</span>
# perl5 is only used for build scripts, no linking
depends_build-append port:perl5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,9 +58,6 @@ depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This patch sets the python interpreter from meson's shebang line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qemu-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # "error: unknown type name 'fpunchhole_t'" pre-10.12.4
patchfiles-append patch-qemu-punchhole.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,15 +86,14 @@ if {"${configure.build_arch}" eq "arm64"} {
</span> configure.args --cpu=${host_cpu} \
--cc=${configure.cc} \
--objcc=${configure.objc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --host-cc=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sphinx-build=${prefix}/bin/sphinx-build-${py_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use MacPorts meson, which includes platform-specific fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --meson=${prefix}/bin/meson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --host-cc=${configure.cc}
</span>
# Do not use iasl, even if it is installed, #43911
configure.args-append --iasl=/usr/bin/false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use MacPorts Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --python=${prefix}/bin/python${py_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Select features
configure.args-append --disable-cocoa \
--disable-curses \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-configure.diff b/emulators/qemu/files/patch-qemu-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9d1301a5ed..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use the same Python interpreter that the passed-in Meson does.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1479,6 +1479,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove old dependency files to make sure that they get properly regenerated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f */config-devices.mak.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# If --meson is supplied but --python is not, extract the Python interpreter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# from the Meson script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$explicit_python" = no && ! test -z "$meson" && test "$meson" != "git" && test "$meson" != "internal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ python=$(sed -n '1s/^#!//p' $(command -v "$meson"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error_exit "Python not found. Use --python=/path/to/python"
</span></pre><pre style='margin:0'>
</pre>