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 iGRZI9ljYGc8RQEAqHPOHw:P1 (envelope-from ) for ; Mon, 16 Dec 2024 17:31:05 +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 iGRZI9ljYGc8RQEAqHPOHw (envelope-from ) for ; Mon, 16 Dec 2024 18:31:05 +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=FqRoENfu; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=gp9i0OJV; 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=1734370265; 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=1LRTpsnEjbxWhJgkweUq9QRwqVNZe2/R3tW0YJ0mmO4=; b=f4Gh3M2p3QfQ9tRUB0i48zUz85lguYzhdrxXKaM86uTD2/6uLfOoXpzW0mTGtIvrZsT0wx ZEjKRhIY3JlHCs78sQh4LZBAz6zuKDCgepyUyDgkKjt7vnrn6+sbg6F7XYNfqMwj1qinUF 1YFzMCHCjolfF7d211voFzD2142LUrPvTituqdPj0gp/7yc6CML5hJdvDXHFrMRU2m6KsY Ju9k2GSCXMzyhzrsqvyh06G9fs9L3ePK8DH7CpnbsQjZbKycHsRZs2PXlIeMxplkQ0E7ov qqjFgSSYFpICYdNAPgWMm2WCKTVCZs9Fjjt5iQtIJR81MzRouL9daixlkeDR/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=FqRoENfu; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=gp9i0OJV; 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=1734370265; a=rsa-sha256; cv=none; b=twAlbIh/CafnPRNAuyO2GzGYSJA9wJIaFU7u8Q2EGcIYfQy+9TrEuNRIExGqf/mvU5yxGc AXBPYEqzi9R5L7jRdYzcekVbqvaTcAFPjFOOQ+OGOyKK3iNbcDjHjfPq4wdKNpS/PF/pRs WdBA1siu1KICAS/yzyrnQjN0DiqYiVTDMPi62dkjgKaSVUFWaa1b6Ggp0d2uTYyYYHfUOi 611Zm1/ropFsRbMg5s8YfwZ8hxWrwPoQE+T+5SzFa+rnf1Ruu6qX0ZJTJjVqHLnPjsWO98 ibKtbm6oRmkkXXX1VQY8oMvYzbxqw06xXI+jGaE62rnI8iT8BBsWs36HgU4MtA== 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 2838E5C5AC for ; Mon, 16 Dec 2024 18:31:05 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNEvs-000204-2A; Mon, 16 Dec 2024 12:31:00 -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 1tNEu5-0000IH-Hy for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:11 -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 1tNEu5-0001vv-9b for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:09 -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=1LRTpsnEjbxWhJgkweUq9QRwqVNZe2/R3tW0YJ0mmO4=; b=FqRoENfucgnrhig/QCNi1VSFowh8sqde2sAWiE7/+9PnjEYwuKnrjAS/SsPPGIK/7dAlvJEMj6sC5N55VkbowsHwERAHYoDxl8KHoyZCsB68PaT5weq/WxOPbZ5Wwkjkt9aY7UPqVXOIqmSQrPtF/XS/oF1N6AtT+YkGE2zs2x7KC5Vh37WreZIIg2we8dWmYxXsBJo0UkGWLr6AtsPKHq6dUgWkCyMyUvdqlQBRQ58KFjPXc3I+wjkqTNtcllhuKyXrOqVx0KhJa/gz876UeOXosVYIJ/K6TtZ2RUTQsLAwyJcna54OwK6XtNBmMyYVpr+1aB3W0mP2LCLyovGBzA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNEu5-0006L3-4f for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74609] [PATCH 06/21] gnu: Add mono-2.4.2. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Dec 2024 17:29:09 +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.173437011424084 (code B ref 74609); Mon, 16 Dec 2024 17:29:09 +0000 Received: (at 74609) by debbugs.gnu.org; 16 Dec 2024 17:28:34 +0000 Received: from localhost ([127.0.0.1]:55848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtU-0006G7-Rt for submit@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:34 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:45187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtO-0006Eu-Ig for 74609@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:27 -0500 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-435f8f29f8aso31616595e9.2 for <74609@debbugs.gnu.org>; Mon, 16 Dec 2024 09:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734370041; x=1734974841; 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=1LRTpsnEjbxWhJgkweUq9QRwqVNZe2/R3tW0YJ0mmO4=; b=gp9i0OJVNq8FCAeKyGOjUAEI67q+Ca3u/p8AwXUUJ4Enz8cAtYN3F5iJ9sr0Idzvi8 KFRarM1qLvWf32vEhy2NJ180Q/4SIL5C/74E/ZZ9MHHdKuQMmeb7gkX1MvRYizoYmvTS LLqQBwWSMX/P5Ix9+ewkEQFMzGRBzMMkpg6wg8CSAllWCGGa3DnwtwmkjXrIKCcFfn9t NFM73TjHDfwNk0AmQJ7+cSRJUJAlUVpvvGMMaVxZIEJ25HRhX0FOb4snwWU5VJ6I/q2A SxQwTlH0Cl1+LHX7K4qcUXb4USII/BHHNUebaRuTAg7xGOPFZRT6harkwfretOFW7r5w +VQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734370041; x=1734974841; 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=1LRTpsnEjbxWhJgkweUq9QRwqVNZe2/R3tW0YJ0mmO4=; b=VAadv56EuhhIY9eGeGn37gDX8sZrBbyhyshE6bqvKeTNJwVpzPUuE9O3OoqszrS2iD r97MwB+OD3FMXHdhhqR131+uSdVuEWMJcQfNrzQiu8In6U/5+sglfJLfk6Qc5zhdBoHe MjezZHxlftaDtrAr5VcHIi/uSB0+o1owgMFOmOez0jQcxPOUdOZxXreFBQ5kD+shd1tv Q7JVzdoDyYb01/K1TXeBkUTfHwCnbgumPrgnJ0MH2OpvROxXlUaRmNItxaiNElrKVIBn CSl7KRXOuFAIQftweq6c/lGYPIqyTrpe99NkYY6dcLTkw9Hajv26ZKyjoUzaVehIXYZf LqpQ== X-Gm-Message-State: AOJu0YwLg2J14niyTi6peNKF8/MrUxP0fagCJ92/bKicO9LEv5Fu3Q3N /kv+zFg20uggkBNMvQWtv07Br1XglnGRslDd0J0Lu513er8wQEAO4JZ+SMUt X-Gm-Gg: ASbGncuTBd332ao418WMEA+LoZJ16grdyRFFs8Y1CDTYyM+ljQwIYCJfUXi234GacHP KxBARO4Jbalub6v8pb1AFWzPmZ6+cMsgwhXaVTOCLt5cLRtz31AiR0i6hXX1784N0z3Byg3YDAZ hOGRhXAi+eVQVaP7kzOL1gFi0+C91dLN7KHPycEt08cHZz4sw7m85hIerOGx8fXYvmCSvYxjZFY x5iWUNMuWyqLqcHJ3nRRX6kpHPdgC1Y27ctCy4p5aDLVzpahvPv8SG8X+g7oQ== X-Google-Smtp-Source: AGHT+IHAaMAQhy3SKnojaO49AiHPmR6xjl5peHuP2fdKPeL573/Nt/bIYUudywSCwxwyKP50QOqCsg== X-Received: by 2002:a5d:598c:0:b0:386:4a60:6650 with SMTP id ffacd0b85a97d-388da5add16mr311167f8f.42.1734370040724; Mon, 16 Dec 2024 09:27:20 -0800 (PST) Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c8012081sm8678600f8f.19.2024.12.16.09.27.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 09:27:20 -0800 (PST) From: Efraim Flashner Date: Mon, 16 Dec 2024 19:26:29 +0200 Message-ID: <8a4501f8b0ab760662cac843d78c9975b8040b82.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: 2838E5C5AC X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.08 X-Spam-Score: -7.08 X-TUID: 7RvvwxWvf45r From: unmush * gnu/packages/dotnet.scm (mono-2.4.2): New variable. * gnu/packages/patches/mono-2.4.2.3-fixes.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I14ff01d5fb3c3f23c83f8518990a79329490d3b9 --- gnu/local.mk | 1 + gnu/packages/dotnet.scm | 53 +++++++++++++++++ gnu/packages/patches/mono-2.4.2.3-fixes.patch | 59 +++++++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 gnu/packages/patches/mono-2.4.2.3-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 38e98386d20..a46dd1d1999 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1821,6 +1821,7 @@ dist_patch_DATA = \ %D%/packages/patches/mono-1.2.6-bootstrap.patch \ %D%/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch \ %D%/packages/patches/mono-1.9.1-fixes.patch \ + %D%/packages/patches/mono-2.4.2.3-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 3a3bcb3c940..ab91f590992 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -421,3 +421,56 @@ (define-public mono-1.9.1 (patch-shebang "mono/tests/test-driver"))))) ((#:tests? _ #f) #f) ((#:parallel-tests? _ #f) #f))))) + +(define-public mono-2.4.2 + (package + (inherit mono-1.9.1) + (version "2.4.2.3") + (name "mono") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.winehq.org/mono/mono.git") + (commit (string-append "mono-" "2-4-2-3")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mnrk17rd9c5rh30dh82a39c9ak1ns998b41ivprvy7m068skpda")) + (modules '((guix build utils) + (ice-9 string-fun))) + (snippet prepare-mono-source) + (patches + (search-patches "mono-2.4.2.3-fixes.patch")))) + (native-inputs (modify-inputs (package-native-inputs mono-1.9.1) + (replace "mono" mono-1.9.1))) + (inputs (modify-inputs (package-inputs mono-1.9.1) + (append gettext-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments mono-1.9.1) + ((#:tests? _ #f) + ;; When it tries building iltests.il in mono/mini, it gets: error + ;; CS0006: cannot find metadata file `TestDriver.dll'. It builds fine + ;; outside of the build environment, but later tests fail, and I can't + ;; be bothered to figure out what's causing ilasm to not find + ;; TestDriver.dll. + #f) + ((#:parallel-build? _) #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'bootstrap 'patch-sub-autogen.sh-shebang + (lambda _ + (patch-shebang "./eglib/autogen.sh"))))))) + (license (list + ;; most of mcs/tools, mono/man, most of mcs/class, tests by + ;; default, mono/eglib + ;; 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)))) diff --git a/gnu/packages/patches/mono-2.4.2.3-fixes.patch b/gnu/packages/patches/mono-2.4.2.3-fixes.patch new file mode 100644 index 00000000000..13cff774506 --- /dev/null +++ b/gnu/packages/patches/mono-2.4.2.3-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/data/mono.pc.in b/data/mono.pc.in +index 6da0960db2d..d43bb187218 100644 +--- a/data/mono.pc.in ++++ b/data/mono.pc.in +@@ -7,6 +7,6 @@ sysconfdir=@sysconfdir@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-Requires: glib-2.0 gthread-2.0 ++Requires: glib-2.0 gthread-2.0 bdw-gc + Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@ + Cflags: -I${includedir} @libmono_cflags@ +diff --git a/mono-uninstalled.pc.in b/mono-uninstalled.pc.in +index 7fa3f12dc91..2a0734362fd 100644 +--- a/mono-uninstalled.pc.in ++++ b/mono-uninstalled.pc.in +@@ -1,6 +1,6 @@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-Requires: glib-2.0 gthread-2.0 ++Requires: glib-2.0 gthread-2.0 bdw-gc + Libs: -L@mono_build_root@/mono/mini/.libs @export_ldflags@ -lmono @libmono_ldflags@ + Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/mono @libmono_cflags@ +diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am +index 83f8532369b..3fca7fc13b9 100644 +--- a/mono/metadata/Makefile.am ++++ b/mono/metadata/Makefile.am +@@ -171,7 +171,6 @@ libmonoruntimeinclude_HEADERS = \ + object.h \ + exception.h \ + profiler.h \ +- appdomain.h \ + mono-config.h \ + debug-helpers.h \ + mempool.h +diff --git a/mono/mini/driver.c b/mono/mini/driver.c +index 48ca2d96899..9fb3512200b 100644 +--- a/mono/mini/driver.c ++++ b/mono/mini/driver.c +@@ -1236,6 +1236,7 @@ mono_main (int argc, char* argv[]) + #endif + if (!g_thread_supported ()) + g_thread_init (NULL); ++ GC_allow_register_threads(); + + if (mono_running_on_valgrind () && getenv ("MONO_VALGRIND_LEAK_CHECK")) { + GMemVTable mem_vtable; +diff --git a/runtime/Makefile.am b/runtime/Makefile.am +index 0e876e2a491..b9cd0a99d9e 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