From nobody Fri Feb 04 19:29:12 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 0CB8719AF753; Fri, 4 Feb 2022 19:29:13 +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 4Jr5FN6vD8z3rG9; Fri, 4 Feb 2022 19:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644002953; 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=s5iAEM+CIoByXs/zAzaFKXX6SlxfiyNUDZTEkXEDp0k=; b=cPOx22R0uX+HQe3qav3ob6OtGZk/AkwjIiSOIdgC5Uw7yAuS6l3iK0KsUX411aVN4nEni/ gAJc9GRCdoptqdFq4E7wimb60G6yRk6hrtJfN/kc/T4Et6eVJGFf9TzUIxVHGRjg4z0csX 5i6BTGXHjmHPJ89OE+jWxJcS+xNiNwIdxHSakILQhiJmm48dHT0ylP0CVoW+2LNwR7+vUU VV+EsKJzNVJqN5rXgVaJmc/doQ5jaUQadqJ17DkRPrM3jrp2JeiFqjK9DjjhqL9wxs4jsO +yVdX+gzhL+HT0bEpQt7b7PJ6QMQvSFB4QCa9z55GTJYE3cz3qEjIpzf1E9Tww== 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 BE23A11824; Fri, 4 Feb 2022 19:29:12 +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 214JTCB4053327; Fri, 4 Feb 2022 19:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214JTCGn053326; Fri, 4 Feb 2022 19:29:12 GMT (envelope-from git) Date: Fri, 4 Feb 2022 19:29:12 GMT Message-Id: <202202041929.214JTCGn053326@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Warner Losh Subject: git: 96f234ff60fa - main - emulators/qemu-user-static-devel: Fix build on 12 and 13 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: imp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96f234ff60fa5f29a79d3dcaf14d46a77e97a99b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644002953; 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=s5iAEM+CIoByXs/zAzaFKXX6SlxfiyNUDZTEkXEDp0k=; b=TKIPqocB1B6OE2Rc8OO6EyhCAoNiHXhHyl8/D/YupEX2TIl3CeDwdNSBulR1b2lMlmPPwO ekGsTiq/fdITJa/wPxUbK/ekzVNevjlnjY9SzY44IVptv1EGcgkuYFWE+Nnlh1M9JRfbI3 cIp/N9xM4xs6VGJMVg111ifuF2/aGUYaTIAO1X3SmW/OMxa1S6e6Git3YrDy2bVPdE9bAI 8U62XaPMFvWPd0HHqGGa86yS6bsW/txDZoeLFp7lbwta2QEicluf1klz/j+wQpdWUvQFVo bJtJqiS21cWrzO/trKHtU6n085oUpap1AKTQkbYaMPDFs/wUpT9oOsVHwCluhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644002953; a=rsa-sha256; cv=none; b=NSdBiVH49rM7hKVeLc67VQ6M5rEY29hZ/kYarTHBfdyRveHxzq3CJqP7JOyawkJqwkqIt6 reW49W8My6mJtuU8i1aOd0/CadIF+igcb7MEhUSpmYxOGK8Py+CXhvrJQerQRjXXSsITUf zuwFJHVxt8F1mIAVdTOYGF50mzqBUsIU33Ow4O6DitODNnKUNCHXNfrvTUe7HT62v2yXmC Ore/epYfg6E/1hPXxc4sUfQv0aYVALj1/Xn5xLeVOMk+7RRCWg3uo19W/phKk88VQnFlRZ oNAIQMZjqgoW3loWl5aEYpVjUnNIeBXNYDHucq9aUhogMntkGdEO5fkqD/SRWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/ports/commit/?id=96f234ff60fa5f29a79d3dcaf14d46a77e97a99b commit 96f234ff60fa5f29a79d3dcaf14d46a77e97a99b Author: Warner Losh AuthorDate: 2022-02-04 18:55:44 +0000 Commit: Warner Losh CommitDate: 2022-02-04 19:28:58 +0000 emulators/qemu-user-static-devel: Fix build on 12 and 13 The last update broke the build on FreeBSD 12 and 13. This fixes that with the upstreamed fix. It also moves to a slightly newer upstream version and resolves a number of accumulated conflicts. --- emulators/qemu-user-static-devel/Makefile | 4 ++-- emulators/qemu-user-static-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/qemu-user-static-devel/Makefile b/emulators/qemu-user-static-devel/Makefile index de3918e73a96..9c02b6dc9f2c 100644 --- a/emulators/qemu-user-static-devel/Makefile +++ b/emulators/qemu-user-static-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= qemu PORTVERSION= 6.2.50 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators PKGNAMESUFFIX= -user-static-devel DIST_SUBDIR= qemu/${PORTVERSION} @@ -23,7 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libglib-2.0.a:devel/glib20 \ USES= bison compiler:c11 cpe gmake ninja:build perl5 pkgconfig python:build USE_GITHUB= yes -GH_TUPLE= qemu-bsd-user:qemu-bsd-user:93dc565013e \ +GH_TUPLE= qemu-bsd-user:qemu-bsd-user:64ff0f053df \ qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb HAS_CONFIGURE= yes diff --git a/emulators/qemu-user-static-devel/distinfo b/emulators/qemu-user-static-devel/distinfo index c2cd566664a8..0df9b90945cb 100644 --- a/emulators/qemu-user-static-devel/distinfo +++ b/emulators/qemu-user-static-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1643407242 -SHA256 (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-93dc565013e_GH0.tar.gz) = 12bf8adc994e0d1e1683b673f035816316a9ef20d75af549b33fc9203aa731a3 -SIZE (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-93dc565013e_GH0.tar.gz) = 32163915 +TIMESTAMP = 1643999565 +SHA256 (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-64ff0f053df_GH0.tar.gz) = 5671ea6e1cbf7fd81a0a256d4c93271cfb7b96805910af1f4a249802df290dcb +SIZE (qemu/6.2.50/qemu-bsd-user-qemu-bsd-user-6.2.50-64ff0f053df_GH0.tar.gz) = 31606163 SHA256 (qemu/6.2.50/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a SIZE (qemu/6.2.50/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895