From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0GvtMFbaGGTLNAEASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:38 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CC3vMFbaGGRYggEA9RJhRA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:38 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 3128239363 for ; Mon, 20 Mar 2023 23:12:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjg-0003tm-R3; Mon, 20 Mar 2023 18:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNjZ-0003ly-C2 for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNjZ-0003Gv-2n for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNjY-0007NZ-Uj for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 08/15] gnumach: Update to 1.8+git20220827. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org, Josselin Poiret Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.167935027528200 (code B ref 62307); Mon, 20 Mar 2023 22:12:04 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:15 +0000 Received: from localhost ([127.0.0.1]:57019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNik-0007KU-4u for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:14 -0400 Received: from jpoiret.xyz ([206.189.101.64]:47030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNie-0007J7-20 for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:08 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 0B35D185328; Mon, 20 Mar 2023 22:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/z5PortZCTuUkwNyc67cTnV2ETYFHEL3sCgK46tgAWM=; b=ZglX5E1kcl/NQqkDJZZ/zKErnJVq2nyRZ6LHA+Fh2jytxYsv0MYgQkOv7+TWnpjh3H4nLY 5C1qZD6wroYP/EYJ0bRyUVgi5UyvXEOYlEO9aKl71ANRFaGX7YyLeXpKubusNNhzMxWnO5 CeJPe6wcAgU3blrdYdJC8WDc4acKWZw7Nuhc8j9kdU/lk1X5ni+0q1/PW9LqM97Xuj6wOq HAuLhFPz+q+7v1n0HvsyvvXB40wDXTvfBwHphamkowTqAiBhyknSNXnct5pTxRmACGpnKQ 705ZuiY9bWK2wcohjfhtDyDh4RH8/RLPk5np41/tm3YC3G1GYnKYLEXj37HUhA== Date: Mon, 20 Mar 2023 23:10:43 +0100 Message-Id: <96301ae81e0c67b596b911307c4b448806f70d48.1679349992.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679350358; a=rsa-sha256; cv=none; b=ItrXq6vkXi8V5i+ccQkBQExnF2yWtsHxSUXW36Vay8XPtjnGrAP9AEEqykTbf1F+5UksrU p0tGt0Wo5tvN4Y083I8DEj2e4+Wr5TsjCBsrPQFgKw/9B1Du0rt18tBoUSYUPlCHi4rn82 aqs9GHGoSWo+2/awegR2mB6OvINlWYyp85ZViboOoty9hue182Svm+1+Wj3yxufDi2hdDN K+/Fz3jvlETX7RULcBIpRkmsnzfgSrG8KoPWz8nYR4hLVds/ZZrr5s2Ep76w8CtfGVsW10 rMEEHaZEMCAlf4T9HeOvZdc26Ahbw/zs9Mefnuv6KQ3mkweLoX2bltUwPnhT6w== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=ZglX5E1k; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679350358; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/z5PortZCTuUkwNyc67cTnV2ETYFHEL3sCgK46tgAWM=; b=lzyPoWutHSLnjbcVPdFGyA46SDSpMqg3/Oe87QS0XE/7HWP9QFnaE6GClPCHSdw0Iualy9 9PH/Ac0LuE6lgcoRVFW/4ANE0XCTC3nTfjM91aJfFIuz/m+7Y4qN28v3GNZ9KN7PwOIy7B ZacBjUMus9XyzGgnKbNfgnGDS0uaUhZgCPO6wMptExLCSzyaS3hXGYeHWu8txuPv7aMjsM jPQIJx06nT0va12NJg6jpP2MOVkwmifT3g+2uuh/se9WyOxYP6aD4/WrG5QZi9DEhUxEaB bkf4cKYvF5wMmhlNhi/YMQtX9U6I0N9+tMrHMIN559iEiyITfrk3rdGe2ABUpg== X-Migadu-Spam-Score: -3.25 X-Spam-Score: -3.25 X-Migadu-Queue-Id: 3128239363 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=ZglX5E1k; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: v8OkXBRFHUxd * gnu/packages/hurd.scm (gnumach-headers): Do it. * gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 77 +++++++++---------- ...ng-const_mach_port_name_array_t-type.patch | 32 ++++++++ 3 files changed, 71 insertions(+), 39 deletions(-) create mode 100644 gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43537d1d36..c24649935d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1253,6 +1253,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ + %D%/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 8c33087dc5..89d92afcf8 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -66,47 +66,46 @@ (define (hurd-source-url version) version ".tar.gz")) (define-public gnumach-headers - (let ((commit "097f9cf735ffa1212b828682ad92f0f6c5f1c552") - (revision "1")) - (package - (name "gnumach-headers") - (version (git-version "1.8" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/hurd/gnumach.git") - (commit commit))) - (file-name (git-file-name "gnumach" version)) - (sha256 - (base32 - "0q36z7k02bykrld90zaxbhyzxlmwlqqs4divgir6ix38zsp6icqk")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'install - (lambda _ - (invoke "make" "install-data"))) - (delete 'build)) + (package + (name "gnumach-headers") + (version "1.8+git20220827") ;; This is an upstream tag + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/gnumach.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "gnumach" version)) + (sha256 + (base32 + "07qlaf8vw029y7xdnhjyiiyn788zjzwmyzj79inz7idpswqsnyhf")) + (patches (search-patches "gnumach-add-missing-const_mach_port_name_array_t-type.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda _ + (invoke "make" "install-data"))) + (delete 'build)) - ;; GNU Mach supports only IA32 currently, so cheat so that we can at - ;; least install its headers. - ,@(if (%current-target-system) - '() - ;; See - ;; - '(#:configure-flags '("--build=i586-pc-gnu" - "--host=i686-linux-gnu"))) + ;; GNU Mach supports only IA32 currently, so cheat so that we can at + ;; least install its headers. + ,@(if (%current-target-system) + '() + ;; See + ;; + '(#:configure-flags '("--build=i586-pc-gnu" + "--host=i686-linux-gnu"))) - #:tests? #f)) - (native-inputs - (list autoconf automake texinfo-4)) - (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html") - (synopsis "GNU Mach kernel headers") - (description - "Headers of the GNU Mach kernel.") - (license gpl2+)))) + #:tests? #f)) + (native-inputs + (list autoconf automake texinfo-4)) + (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html") + (synopsis "GNU Mach kernel headers") + (description + "Headers of the GNU Mach kernel.") + (license gpl2+))) (define-public mig (package diff --git a/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch b/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch new file mode 100644 index 0000000000..73c99ade23 --- /dev/null +++ b/gnu/packages/patches/gnumach-add-missing-const_mach_port_name_array_t-type.patch @@ -0,0 +1,32 @@ +From 17335d49a3c9e866a81abc051420d73a59d669bf Mon Sep 17 00:00:00 2001 +Message-Id: <17335d49a3c9e866a81abc051420d73a59d669bf.1678745341.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sun, 28 Aug 2022 01:17:34 +0200 +Subject: [PATCH] Add missing const_mach_port_name_array_t type + +From: Samuel Thibault + +--- + include/mach/port.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/mach/port.h b/include/mach/port.h +index 3c226f6c..d25eb0b4 100644 +--- a/include/mach/port.h ++++ b/include/mach/port.h +@@ -43,6 +43,7 @@ + */ + typedef unsigned int mach_port_name_t; + typedef mach_port_name_t *mach_port_name_array_t; ++typedef const mach_port_name_t *const_mach_port_name_array_t; + + /* + * A port is represented + +base-commit: 3e1702a65fb3caf50c8d09a1b383b0056a5efc82 +prerequisite-patch-id: 4688654277aef235ccd1797a72dce27d52b04616 +prerequisite-patch-id: 8f1e7dd6429c15cc8ed1d411dba0a75b6e745236 +prerequisite-patch-id: 605553ee086473ad9bc24e59c91d49a12dbf8631 +-- +2.39.1 + -- 2.39.2