From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id KLPCL7djYGfyxQAAqHPOHw:P1 (envelope-from ) for ; Mon, 16 Dec 2024 17:30:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id KLPCL7djYGfyxQAAqHPOHw (envelope-from ) for ; Mon, 16 Dec 2024 18:30:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Lkt2CAvU; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eHL91NMA; spf=pass (aspmx1.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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734370231; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=cm6aI9utkAyZOfPTZ/tCyh4LO6jyZLCG9w0GxUCiN+k=; b=MMGQIpp1v5DqLN1H5oiKXBjcnBHREtrpDX9i5v2+XBTXfZciHJ21B/NAtnANGwYUQCedNB 5EmB9GIwJQLVkJNz9nvVauFeE6RgwZu+Bc6LRmnR0pxykdozw7gdkSlrjjmNA2UJROO0dT NJKY/TxK4WwYRk+Gr5MpY/f9y7ETD3dKbRc29GQ0zBSjTiIi+LoqEYoBhSgnM2QByo61n4 0QlKd9829JBVsKbqz8jC7vd2/EFQUmU8abYAvxOa/UklGCEbTr0m2RlEtl5MZIv0LlT4ug zd2Ddp34ZO20lkxZsjrLqA6OGvq3PxAFMToSAbpyWVsonyBlERjUuRN/80jUzQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Lkt2CAvU; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eHL91NMA; spf=pass (aspmx1.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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734370231; a=rsa-sha256; cv=none; b=fWojwTW6cuvNZHRFVDktLI28yXEGCfh+Iq39jSVIAAaD7F7HvR4NRZgY50AaTajmq26pm8 QfnFQpMjv8TVJuoKgHKWYoOt5jKa2FJagseUqUhxauK4sMjFBA33hAJRzQGs5Pja34VtIS 1Eb0WA5XBNpumOJNds9ldKTUBuJzn+L+dI9onbTKpFJDZA+yjlTBZiBC3PlhLYYK6MheG+ lEZb8lYQkOb6ALThH3Q4jNDe5fvcNd9htTRkCLCnbp5xUzRQip80ujkKDHTuTSOdR1XBy1 Cv6IaKSCIGBXoY1pwkOYjerjh5YjzjLIhk1/uwKzMrqCCmm+Bd2lCxHWPjqS3w== 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 aspmx1.migadu.com (Postfix) with ESMTPS id 80F095C705 for ; Mon, 16 Dec 2024 18:30:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNEuT-0000Vn-7C; Mon, 16 Dec 2024 12:29:34 -0500 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 1tNEu7-0000Ia-5x for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:13 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNEu6-0001wX-RK for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=cm6aI9utkAyZOfPTZ/tCyh4LO6jyZLCG9w0GxUCiN+k=; b=Lkt2CAvUdrscEh7DA6w+5g8HEDglA88ATtX1I8juvYLS5I2FLykdN9PYPQetrWPXUACYE7m0IExENsqFg7wcbMqxP/e+dzkJQqUkkuwTrqZdeLS3etaM41HwyBD3QCVoUQGNm8cyzAd3f26hMLQMHRAsQ7a687zfTO4wsPP5KzP8ThowHCIAT5eSUdTUQH2W+pcuZXw0GWxWIPzmK060fm6zWysA3e7fW0OgIA8n5WFQKfDo0VWvQzf1CxM9GFrEjZW8CjYoOmrIp2oPG8FKOlO+jTFpxJaAf49ytTCPfd57qS6JXXOXP0OmcBwsSe162ygJkFE2IfW7W1D2+4IgyQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNEu6-0006LR-Jd for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74609] [PATCH 08/21] gnu: Add mono-2.11.4. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Dec 2024 17:29:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74609 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74609@debbugs.gnu.org Cc: aaron.covrig.us@ieee.org, ludo@gnu.org, unmush , richard@freakingpenguin.com, unmush@proton.me, janneke@gnu.org Received: via spool by 74609-submit@debbugs.gnu.org id=B74609.173437012124120 (code B ref 74609); Mon, 16 Dec 2024 17:29:10 +0000 Received: (at 74609) by debbugs.gnu.org; 16 Dec 2024 17:28:41 +0000 Received: from localhost ([127.0.0.1]:55856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtc-0006Gq-CC for submit@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:41 -0500 Received: from mail-wr1-f41.google.com ([209.85.221.41]:44492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtS-0006FH-M4 for 74609@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:32 -0500 Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-385d7f19f20so2223409f8f.1 for <74609@debbugs.gnu.org>; Mon, 16 Dec 2024 09:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734370045; x=1734974845; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=cm6aI9utkAyZOfPTZ/tCyh4LO6jyZLCG9w0GxUCiN+k=; b=eHL91NMAMUpXmrUh+qFTam1G4f8gXOrqbk8fSkvloHIDV/3nMr3cUgfnSW8ajCrkgq qxDOlBMwuu6mdC/WgD1+xRrC/04Cnj3pXddIBrKOxhCT5fZfZZV3VDaEMAHdSwrWC+RD 74Dv/PRIlyBR0CJCpUJ3jvP63oyd1XqcZds689UfLH6ZIxHUUe8p/yzTQyBSJ5a1SnSs GWADxoy67FpBztJMxZyT/dVmxWdgZ6USBHwf5m8dihQRsEb569D5ZCifPsE/9rzl2g3F VYygw2ambkiNw46oDbYQu7PNpoBbei4MmES+ItTAfyMxsJu5NSLQBH7t7AvWZi6qvFTP 6VWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734370045; x=1734974845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cm6aI9utkAyZOfPTZ/tCyh4LO6jyZLCG9w0GxUCiN+k=; b=FuR2T67JRY4nIPskMnQ+26JrKfJbpEqmL4mk0zMDD1MWUx2arynbvueZ/v3hq19k+j hqlZBPzDHvFNbSwvswTB6X86QuA9sqOK8CEwuTAKSTMvIgNj7p/KsjmMaHW1iS8vsmN9 oxhjlUfgW3UzAU5YIhd6+yLK2Pa0AUKz70OkplRKP9vZZljmCSSJu0Ke2rVD3EFKnAFf f/+RfAk5T+1Wx0MQZEOw0yotxXzJxB6JPg2FjspNGplK8Jm06eXhjJXCvVvx2SgqlvCb ReBaKOtgIC8dFuGwfwG3ewWaSmqN1Gliyod+/CQoQ3VsZaKfY2XQSOIcYu/2epg8zhlN aRgQ== X-Gm-Message-State: AOJu0YwxrnVPgwRBiTJZgPGXVU6KSb5z95HijKim5nZGhGI2MLhvxxDf OynAxHu6ezS75iH7/8WxCA5gOUOadNBPdPRm3+p4hZRN0BJPPBk5VmHU9jK+ X-Gm-Gg: ASbGncv6dX5cygDeQW+dkC5zdlbUgT6iBPfb8g0S/ZnHquXwC37oOonbFWiXtHNbQxo mrdztnCs8YMhgXLZLSioRHAKvqL7HQEZ4XBZ2+ofq2lkcYbjMezzWuYGwS70xp2bL0TxiHKz9Al Mld5soosWU0J144MGFJRDBAwgsloa5IvkIgQKDsm+KA5EcRvTEhhdrZTLK5sQ9HJcBpXMxgRvns eT10XPbCzjCE6QaFymZlTFza9i0W7RR0kBDRhmg+/ZFoouzVPIpyKqkdJsC+A== X-Google-Smtp-Source: AGHT+IFGrgEMoJOmTPBO4AQWxDL6cT2CedCN/lQta45CSSmYEnTL/LGVtdVQiVqlC/n+HN5eOwVjQQ== X-Received: by 2002:a5d:64ac:0:b0:388:c61d:4400 with SMTP id ffacd0b85a97d-388da3a1314mr386620f8f.26.1734370044920; Mon, 16 Dec 2024 09:27:24 -0800 (PST) Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c8016bdfsm8794685f8f.43.2024.12.16.09.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 09:27:24 -0800 (PST) From: Efraim Flashner Date: Mon, 16 Dec 2024 19:26:31 +0200 Message-ID: <1ef3a73521e6f4b2eb400d6f5a4801cde1e203c9.1734369314.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 80F095C705 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.08 X-Spam-Score: -7.08 X-TUID: hYid7XmUr5+b From: unmush * gnu/packages/dotnet.scm (mono-2.11.4-external-repo-specs, mono-2.11.4): New variables. (add-external-repos): New procedure. * gnu/packages/patches/mono-2.11.4-fixes.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I7cb96af8b05a625cfe9ca9ab0f1132608c02ed31 --- gnu/local.mk | 1 + gnu/packages/dotnet.scm | 95 ++++++++++++++++++++ gnu/packages/patches/mono-2.11.4-fixes.patch | 36 ++++++++ 3 files changed, 132 insertions(+) create mode 100644 gnu/packages/patches/mono-2.11.4-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43ccab199dc..8007ff19a7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1823,6 +1823,7 @@ dist_patch_DATA = \ %D%/packages/patches/mono-1.9.1-fixes.patch \ %D%/packages/patches/mono-2.4.2.3-fixes.patch \ %D%/packages/patches/mono-2.6.4-fixes.patch \ + %D%/packages/patches/mono-2.11.4-fixes.patch \ %D%/packages/patches/mosaicatcher-unbundle-htslib.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ diff --git a/gnu/packages/dotnet.scm b/gnu/packages/dotnet.scm index 6304a38bb74..b7940d24706 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -497,3 +497,98 @@ (define-public mono-2.6.4 (search-patches "mono-2.6.4-fixes.patch")))) (native-inputs (modify-inputs (package-native-inputs mono-2.4.2) (replace "mono" mono-2.4.2))))) + +;; submodule checkouts use git://, which isn't supported by github anymore, so +;; we need to manually provide them instead of being able to use (recursive? +;; #t). Also try not to think too hard about the fact that some of these +;; submodules in later versions contain binary compiler blobs which mono +;; maintainers presumably used when creating the bootstrap binaries they +;; published. All fetched and updated over unauthenticated git://. + +(define mono-2.11.4-external-repo-specs + ;; format: ({reponame OR (reponame dir-name)} commit-hash origin-sha256) ... + ;; if reponame starts with https:// it is treated as the repository url, + ;; otherwise the name of a repository under https://github.com/mono/ + '(("aspnetwebstack" "1836deff6a2683b8a5b7dd78f2b591a10b47573e" + "0vqq45i8k6jylljarr09hqqiwjs8wn0lgjrl6bz72vxqpp0j344k") + ("cecil" "54e0a50464edbc254b39ea3c885ee91ada730705" + "007szbf5a14q838695lwdp7ap6rwzz3kzllgjfnibzlqipw3x2yk") + ("entityframework" "9baca562ee3a747a41870f45e749e4436b6aca26" + "0l8k04bykbrbk5q2pz8hzh8xy8y4ayz7j97fw0kyk3lrai89v5da") + ("Newtonsoft.Json" "471c3e0803a9f40a0acc8aeceb31de6ff93a52c4" + "0dgngd5hqk6yhlg40kabn6qdnknm32zcx9q6bm2w31csnsk5978s"))) + +(define (add-external-repos specs) + (define (reponame->url reponame) + (if (string-prefix? "https://" reponame) + reponame + (string-append "https://github.com/mono/" reponame))) + + (define* (external-repo-gexp reponame commit hash + #:key recursive? (patches '())) + (let ((short-commit (string-take commit 6)) + (reponame (if (pair? reponame) (car reponame) + reponame)) + (dir-name (if (pair? reponame) (cadr reponame) + reponame))) + #~(copy-recursively #+(origin + (method git-fetch) + (uri (git-reference + (url (reponame->url reponame)) + (commit commit) + (recursive? recursive?))) + (file-name + (git-file-name dir-name + short-commit)) + (sha256 (base32 hash)) + (patches (map search-patch patches))) + #$(string-append "./external/" dir-name)))) + + (define (spec->gexp spec) + (apply external-repo-gexp spec)) + + #~(begin + #+@(map spec->gexp specs))) + +(define-public mono-2.11.4 + (package + (inherit mono-2.6.4) + (version "2.11.4") + (name "mono") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.winehq.org/mono/mono.git") + (commit (string-append "mono-" "2.11.4")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y2bifi2avbjmfp80hjga2dyqip4b46zkvx6yfr9pa2hhm940rpx")) + (modules '((guix build utils) + (ice-9 string-fun))) + (snippet #~(begin + #$(add-external-repos + mono-2.11.4-external-repo-specs) + #$prepare-mono-source)) + (patches + (search-patches "mono-2.11.4-fixes.patch")))) + (build-system gnu-build-system) + (native-inputs (modify-inputs (package-native-inputs mono-2.6.4) + (replace "mono" mono-2.6.4))) + (license (list + ;; most of mcs/tools, mono/man, most of mcs/class, tests by + ;; default, mono/eglib, mono/metadata/sgen*, + ;; mono/arch/*/XXX-codegen.h + ;; mcs/mcs, mcs/gmcs (dual-licensed GPL) + ;; samples + license:x11 + ;; mcs/mcs, mcs/gmcs (dual-licensed X11) + ;; some of mcs/tools + license:gpl1+ ;; note: ./mcs/LICENSE.GPL specifies no version + ;; mono/mono (the mono VM, I think they meant mono/mini) + license:lgpl2.0+ ;; note: ./mcs/LICENSE.LGPL specifies no version + ;; mcs/jay + license:bsd-4 + ;; mcs/class/System.Core/System/TimeZoneInfo.Android.cs + license:asl2.0)))) diff --git a/gnu/packages/patches/mono-2.11.4-fixes.patch b/gnu/packages/patches/mono-2.11.4-fixes.patch new file mode 100644 index 00000000000..02a05f7977a --- /dev/null +++ b/gnu/packages/patches/mono-2.11.4-fixes.patch @@ -0,0 +1,36 @@ +diff --git a/configure.in b/configure.in +index 38cc6dc2925..4c608eb150f 100644 +--- a/configure.in ++++ b/configure.in +@@ -470,7 +470,7 @@ AC_CHECK_HEADERS(wchar.h) + AC_CHECK_HEADERS(ieeefp.h) + AC_MSG_CHECKING(for isinf) + AC_TRY_LINK([#include ], [ +- int f = isinf (1); ++ int f = isinf (1.0); + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_ISINF, 1, [isinf available]) +diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c +index 586b54715db..d27857aa092 100644 +--- a/mono/io-layer/processes.c ++++ b/mono/io-layer/processes.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/runtime/Makefile.am b/runtime/Makefile.am +index 6957a287d38..2d071230a84 100644 +--- a/runtime/Makefile.am ++++ b/runtime/Makefile.am +@@ -1,6 +1,3 @@ +-# hack to prevent 'check' from depending on 'all' +-AUTOMAKE_OPTIONS = cygnus +- + tmpinst = _tmpinst + + noinst_SCRIPTS = mono-wrapper monodis-wrapper -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted