From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cP6IF5ZjYGd0cAEAqHPOHw:P1 (envelope-from ) for ; Mon, 16 Dec 2024 17:29:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cP6IF5ZjYGd0cAEAqHPOHw (envelope-from ) for ; Mon, 16 Dec 2024 18:29:58 +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=VGToU0O7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=bwZlvPLN; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734370198; a=rsa-sha256; cv=none; b=hclgPiV9qhuoOEQaZ7v0JawDo08uunFpXFOzr9um3rOOHy09zCeT4PjMuQdcXCETbZpD0Q 0ZwZfFdIeEmUxjgmmeFGIEPAEyKwGpQkq16QHL/468Jh4at8UiKz4V+30QarCMA9QmFozB HsP5GX/expGurE29qrdqPT8+ja/2tjdVAXeo80uF8B/Fu+a4ymbYRcsueq2jobOzB5jJQm p+/yUzyHZbHq0YgZoEpX8V0JV8dLCiAxHlAO4sQ0nVxThj7RxkEz99/msmJWX8w1o1JREJ jHfxO00IIWGZn1oqTNf+bqmaHAKZJloWACFzG1YTLNKwJNfOK4k2JxKPspaXWg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=VGToU0O7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=bwZlvPLN; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734370198; 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=Lyj804Kumg89zKoNnoPL6M7hyzm3jGfIRXvwYAekaKY=; b=eI0AI6NBk2GIyzalXNZlVjciXZP2Cju6F+XN6UTHmvFOtn6AgxVep7/7RYaXjFRwFzA0iB iRLSuJpLO2EMt024AsKvat/B5FL27LIurD/w2tOUPoJP+nqsMHN4zsagXSQHyN1Z1XCEhL fi2+PZa5CMBaUIJkEtJ8lpS2FlD9fHQKHqC16doJNJbVYymMcgrEv9TNnjezJQOLyX4uNR 8HWt/A8VFFsubUsnSlUy+oYoCmG7trUV5QhANptFQyh3CNTcO3b+2IN7Hf+AyNgjScgQCQ xQa6nCJQylFG7j2Lw6s8OranVpoly88OIbLwzX1AFmtbP9u62W93ybche1ZF2Q== 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 D3A7F181FE for ; Mon, 16 Dec 2024 18:29:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNEuO-0000Uu-Qh; Mon, 16 Dec 2024 12:29:29 -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 1tNEu6-0000IN-7Y for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:12 -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-0001wD-OX 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=Lyj804Kumg89zKoNnoPL6M7hyzm3jGfIRXvwYAekaKY=; b=VGToU0O7mzvsivXvGAMJ2e0zK0a312t8JtcWY0uV/UEMTeLwFCfH3QM2xQ94gTj4FLPdAtikwhf/yPSOh8WXTF0HVqKGe2QZnPUZ/w/BMkBGhiDmWCOYSKvTAhLIfgw2//1wVbQb28CGJdIE4XmfFa8GRNE5in7abEAgD+DklP8D1oZbLT/k3IctSJYdVy/fABXfbLWJx6dZCRJ2bIGAKTsvdi9SjV2zKZt4ib9IQ5kBwQsaxkH33TRC2bC6NJY7X0/xr2X50GohE9JIlqhFPDGAYB7kCESxgUBa6Bof9sAG6WjQZfYOwV7KvGWARuD0i2gVBdXR18tAqIBYbtPTuw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNEu5-0006LB-Jz for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74609] [PATCH 07/21] gnu: Add mono-2.6.4. 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.173437011524097 (code B ref 74609); Mon, 16 Dec 2024 17:29:09 +0000 Received: (at 74609) by debbugs.gnu.org; 16 Dec 2024 17:28:35 +0000 Received: from localhost ([127.0.0.1]:55852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtW-0006GU-Ih for submit@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:35 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:53331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtQ-0006F9-Jl for 74609@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:29 -0500 Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-38633b5dbcfso4816346f8f.2 for <74609@debbugs.gnu.org>; Mon, 16 Dec 2024 09:28:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734370043; x=1734974843; 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=Lyj804Kumg89zKoNnoPL6M7hyzm3jGfIRXvwYAekaKY=; b=bwZlvPLNa7iWew2OHmI1hqthue1ZrB6VxgXdAWTEntGCP2Kzf+HA1qt3wnsNHtdkIM X4rAO2iYSyrvfJZeQpNK31QNTVQLEXEDdr1RcVlIrsTMrlYNX6OylJA+4RtcK2VHJ57b Q7KZzCrfb5SMp8W8aHDsNcSkyWTbsLTkHsJvZvyFhdCm+AyQiffpqG4BGcJ/0berZrCy +yN2GZ9a9fU6/fOufJSfvtlf1aWaYEUYqdioYBRBnlkRv/fVH76/Ig7tg4iHW8rR6AOv AfYnwj+jgUVJTQcaGgtXF/jXwXIyn+BHtJjtQR5SrWzKRN2lGlb3rqInv15tNA1LwDw+ VauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734370043; x=1734974843; 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=Lyj804Kumg89zKoNnoPL6M7hyzm3jGfIRXvwYAekaKY=; b=L7Stn8wdsvKehINWIy7vZxcLju9uyt1RkfEb2SqjvBU60uyYE4uwD7kCdfpLGJNZZ+ vE8Ivn3iWWiLNMG7u4e7vLs4PYH4dy9zy0Ux57aUUyHCO1vmqc0HJhICN4i/7k0vajBK Wes2iv0xWmc81DyEFFXc7B330VApuok4Mp1v2x6Djd3GwFGMR6LwZTEuy6xCUyARvYBF d+PVEv6e4NVj/AlwTX83EoKr28hrhrrmO0yc3UX7YsEeeQvlPqzhs1fnyJBaYdFRV+yD opnwx+9uaDGt8FYKuUIzNvBYKSvNkNU1ALym4UrXdONuzTS4oauXN2y3K+5rd3Wb5LeI geRQ== X-Gm-Message-State: AOJu0YxrL5yK/Acm97Su+gSrovGjLIJpFbypLf/uWB4nj7HnRUPjQ0+L TNI0bus+PBKlCTHbhXoWXg1qQc5nsqQDxLbMRDjay35LQ1tmd4XRsirZRbNa X-Gm-Gg: ASbGnctT2qXF56szPrqqg7C2zYucYGMV34mhgNiYxn4QLOrPnRSy5VAvdAyJTDgAHnv WCBghwlVSwxi/xNIcubYWzPQ7MEvt2bykOOeGZuZf9iV/QCsZ0PgO00q+5WqaRJ0iUCX1V2FxHH fIGIjmorZ46KrPaQE5Zf1AucI2aKnVu2Gzifn2bM+HNaECyTjW7LYctImf6MF9YOd0qOJB0LZPA ir3arCELU79nUba73HfND2RzdtaA6xdZOlw5JHg9TLLj6g3o5b1ZkanB6cVZw== X-Google-Smtp-Source: AGHT+IEvmxmHcbSmXAX4nzZRq0zWqp8G8cABgBTvzoKp3EPZUV4coBfIaLtPbCwzcNChacixJ8Kuwg== X-Received: by 2002:a5d:5f50:0:b0:382:3959:f429 with SMTP id ffacd0b85a97d-38880ac5f31mr12786548f8f.5.1734370042867; Mon, 16 Dec 2024 09:27:22 -0800 (PST) Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c805d489sm8791902f8f.88.2024.12.16.09.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 09:27:22 -0800 (PST) From: Efraim Flashner Date: Mon, 16 Dec 2024 19:26:30 +0200 Message-ID: <1c712f7b2f262a06526dedffec28dbb2362c31de.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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -7.65 X-Spam-Score: -7.65 X-Migadu-Queue-Id: D3A7F181FE X-Migadu-Scanner: mx10.migadu.com X-TUID: ay+jxPDoRwNu From: unmush * gnu/dotnet.scm (mono-2.6.4): New variable. * gnu/packages/patches/mono-2.6.4-fixes.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I66e9bb2e12ca6f47b4cd827822db5bee93b64dfe --- gnu/local.mk | 1 + gnu/packages/dotnet.scm | 23 ++++++++++ gnu/packages/patches/mono-2.6.4-fixes.patch | 49 +++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 gnu/packages/patches/mono-2.6.4-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index a46dd1d1999..43ccab199dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1822,6 +1822,7 @@ dist_patch_DATA = \ %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/mono-2.6.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 ab91f590992..6304a38bb74 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -474,3 +474,26 @@ (define-public mono-2.4.2 license:lgpl2.0+ ;; note: ./mcs/LICENSE.LGPL specifies no version ;; mcs/jay license:bsd-4)))) + +(define-public mono-2.6.4 + (package + (inherit mono-2.4.2) + (version "2.6.4") + (name "mono") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.winehq.org/mono/mono.git") + (commit (string-append "mono-" "2.6.4")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17977w45qh8jmfsl4bhi83si4fxd8s3x8b0pxnwdzjv3bqr54c85")) + (modules '((guix build utils) + (ice-9 string-fun))) + (snippet prepare-mono-source) + (patches + (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))))) diff --git a/gnu/packages/patches/mono-2.6.4-fixes.patch b/gnu/packages/patches/mono-2.6.4-fixes.patch new file mode 100644 index 00000000000..e802c8bb7e4 --- /dev/null +++ b/gnu/packages/patches/mono-2.6.4-fixes.patch @@ -0,0 +1,49 @@ +diff --git a/data/mono.pc.in b/data/mono.pc.in +index 01e0a9e5d41..d43bb187218 100644 +--- a/data/mono.pc.in ++++ b/data/mono.pc.in +@@ -7,8 +7,6 @@ sysconfdir=@sysconfdir@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-## Commented out because SLE hides devel files in the SLE SDK, +-## which not all customers will have. +-#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/mini/driver.c b/mono/mini/driver.c +index c4e7f4ccdb3..bb705c0d1fc 100644 +--- a/mono/mini/driver.c ++++ b/mono/mini/driver.c +@@ -1302,6 +1302,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 da0c0e8671d..9d0deaf182f 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