From patchwork Sat Mar 30 11:42:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62372 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E4A8A27BBEA; Sat, 30 Mar 2024 11:44:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4C3D327BBE2 for ; Sat, 30 Mar 2024 11:44:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqX80-0003my-Ot; Sat, 30 Mar 2024 07:44:04 -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 1rqX7z-0003mY-BR for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:03 -0400 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 1rqX7y-0006kY-TI for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqX7z-0002hn-8h; Sat, 30 Mar 2024 07:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70087] [PATCH 4/4] gnu: minizinc: Update to 2.8.3. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 11:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70087@debbugs.gnu.org Cc: Herman Rimm , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70087-submit@debbugs.gnu.org id=B70087.171179901010290 (code B ref 70087); Sat, 30 Mar 2024 11:44:03 +0000 Received: (at 70087) by debbugs.gnu.org; 30 Mar 2024 11:43:30 +0000 Received: from localhost ([127.0.0.1]:44103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7R-0002fp-Kr for submit@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:29 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54339 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7M-0002ed-8J for 70087@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1711798993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SfFWW89TEECW7kiRztkFHNZxt7bSFUz/EtOJyAgToCE=; b=Kg25UCLQ7WT66itQozInHQ7dDIpT27ofJIkkgYD3hTUbBt7hKKZhADhY838sO7dDsKqybd SLGP1stq16euK0fQgEzvffbVhcn+4SckvMGkvdXe/fpXRIBk93oF1dT3gG2Bu/Sb7r7Lik uKIxTx5sDw6cZYAxFvaSC85h2efrVfun+Qi7lcVxLztEw3vmC1N4eUO4wSDIEQKevsx8UG Zbq60HVFvKEZOpXC59nbnMf3LbDRUTJHimj+IhqtSGqOQTahQLUlLsiNya84OeL94FpBq5 OgbtcrhHUhIhlpzxtNc1tT7CfoXfPqf+7k7bfNn2IiLn65jXHWl/UKkhZBLh0w== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id e4a63f6e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Mar 2024 11:43:13 +0000 (UTC) Date: Sat, 30 Mar 2024 12:42:41 +0100 Message-ID: <5345bf947c546c7a9c1a581e9d22d33b953158ec.1711794209.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (minizinc): Update. Change-Id: I503fd004b38abaac8829a2cb94c182b001d83763 --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fd44f1f985..5a58696858 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4034,7 +4034,7 @@ (define-public metamath (define-public minizinc (package (name "minizinc") - (version "2.5.5") + (version "2.8.3") (source (origin (method git-fetch) (uri (git-reference @@ -4043,7 +4043,7 @@ (define-public minizinc (file-name (git-file-name name version)) (sha256 (base32 - "10b2hsl1fx9psh0iagmp8ki3f60f3qg5hmvra5aczjlfmbl88ggp")) + "1h3pc92m7ypvmhrrhk2263ib5rqc4fv4n6lai0p8dwiidjpcqnpz")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -4089,6 +4089,9 @@ (define-public minizinc "MIP_solverinstance.cpp" "MIP_wrap.cpp"))) (scandir ".")))) + ;; Gecode 6.3 does not yet support new interface. + (substitute* "solvers/gecode/gecode_solverinstance.cpp" + (("600300") "600400")) (substitute* "CMakeLists.txt" (("find_package\\(([^ ]*).*\\)" all pkg) (if (member pkg '("Gecode" "OsiCBC" "Threads"))