From 82e0b0d80da0597b5f994ce2e6422e32a3fa8531 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 28 Jul 2020 17:15:16 +0300 Subject: [PATCH] qemu: update to 4.2.1 --- .../0013-more-python3-compatibility.patch | 18 ------------------ packages/qemu-system-x86_64-headless/build.sh | 5 ++--- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 packages/qemu-system-x86_64-headless/0013-more-python3-compatibility.patch diff --git a/packages/qemu-system-x86_64-headless/0013-more-python3-compatibility.patch b/packages/qemu-system-x86_64-headless/0013-more-python3-compatibility.patch deleted file mode 100644 index 038df80e8..000000000 --- a/packages/qemu-system-x86_64-headless/0013-more-python3-compatibility.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uNr qemu-4.1.1/scripts/tracetool/__init__.py qemu-4.1.1.mod/scripts/tracetool/__init__.py ---- qemu-4.1.1/scripts/tracetool/__init__.py 2019-11-14 20:06:21.000000000 +0200 -+++ qemu-4.1.1.mod/scripts/tracetool/__init__.py 2020-05-06 15:01:10.683357477 +0300 -@@ -453,12 +453,12 @@ - import tracetool - - format = str(format) -- if len(format) is 0: -+ if len(format) == 0: - raise TracetoolError("format not set") - if not tracetool.format.exists(format): - raise TracetoolError("unknown format: %s" % format) - -- if len(backends) is 0: -+ if len(backends) == 0: - raise TracetoolError("no backends specified") - for backend in backends: - if not tracetool.backend.exists(backend): diff --git a/packages/qemu-system-x86_64-headless/build.sh b/packages/qemu-system-x86_64-headless/build.sh index ca1f4c01c..15528b071 100644 --- a/packages/qemu-system-x86_64-headless/build.sh +++ b/packages/qemu-system-x86_64-headless/build.sh @@ -3,11 +3,10 @@ TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualiz TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Leonid Pliushch " # Do not update version unless you verified that it works properly. -_PACKAGE_VERSION=4.1.1 +_PACKAGE_VERSION=4.2.1 TERMUX_PKG_VERSION=1:${_PACKAGE_VERSION} -TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${_PACKAGE_VERSION}.tar.xz -TERMUX_PKG_SHA256="ed6fdbbdd272611446ff8036991e9b9f04a2ab2e3ffa9e79f3bab0eb9a95a1d2" +TERMUX_PKG_SHA256="7e331163b72e7bcf63bd35cb85cba87b48d12fab3f264b94c23f7d3991094207" TERMUX_PKG_DEPENDS="attr, glib, libbz2, libc++, libcap, libcurl, libandroid-shmem, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libxml2, ncurses, qemu-common, resolv-conf, zlib" TERMUX_PKG_BUILD_IN_SRC=true