From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id IIY2LWI4aGcL0wAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 22 Dec 2024 16:03:46 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id IIY2LWI4aGcL0wAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 22 Dec 2024 17:03:46 +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=hCq5mfVz;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=gsLWQCsu;
	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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none)
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1734883426;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=eRZRGDb+ibfrqXXDdL81W9bRX7wiAziXg6PJX4o/as8=;
	b=DF1BUfQ8RYTwATsztLT1U0LoBLJPXYnhSIy/IztwfNyJdTD5jUSPki9/KR5mHNqqduS+im
	aHXd6jjBYZX/N03hGqesab0Lbi/bIA9H3h3QgpbxEjTLRO7MHGlkvmJe+ayvjyocyHQiWu
	0W6dIjY+rZ5QNHrRlzkXOGD44D5RPyHOZVZgri6L37PpWFgQLAD4IiruScZ6SE4jn8k0nl
	y7B/6qQL1k+o/qV+2mPxnRpZYljJrZY6ckwMEG+qxR+1Bo90gin8qeRcxEppYkyUPzbvEZ
	rjOcPTZp5sAbiRlG2LHMocePdFZGB4HGJIwakA3lGVXvJ7CXUqNYrQYuVa+8tQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=hCq5mfVz;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=gsLWQCsu;
	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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none)
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734883426; a=rsa-sha256; cv=none;
	b=IZuDKfgqUPo1lQTdV3fMxZ7ATMyb+QHub9i6oNv0LD1ULMXyfdzjBCxtCZD5zStDBP9PNW
	JvojDQCUMPdwovsOZcYyrns/smk86NpK2nHJTKVTVpFB8H4N646aYvv8yY7T99b+ES7V+b
	VjW6c1nE2bENoycRT6jSufjnoMxwTFvKJXwx83pNqXBeP2etLXGzkhWZ679I4TsYk6UyTM
	YjCAil/js/y2m32zBY17H/XMEMJA+9umbq218bFGVFftNVCekTn4Ry24tHOKPyMjxKBlgr
	SWh8zledJlsa4zcsyhUZu6qdcBLKyY9LS8JnieR9h4zNfFMgeohWFvvRvhd4UA==
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 657308045A
	for <larch@yhetil.org>; Sun, 22 Dec 2024 17:03:46 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tPOQ5-0005Qm-Ky; Sun, 22 Dec 2024 11:03:05 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tPOQ4-0005Ph-3z
 for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:04 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tPOQ3-0008VF-Rd
 for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:03 -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=eRZRGDb+ibfrqXXDdL81W9bRX7wiAziXg6PJX4o/as8=; 
 b=hCq5mfVz+te6fOIPSvsIuYaAeSuFrG6Tk7nyunMl8f9sb0WTNA4flOGk9Ks6BLFDfDr9Cs0fQSGGdICYYdBlySEnSbMvd2IhAlFr93K0+2KJD6U0Z8QS/4Gd0z/GOtdXi3SyxxqWSXIqJ6mOKncVB6V6PYTtivxTvYXuYrtLJBXl7w+ofsGRQ/pu6sl9zOWMKpuFooqfGxRiiQx3rguMiKqArxkFCmUP566Kyuv/LIp7ovCW16HV97J9u4nyBP+TARzqgAEtr1ZAWWlowf6lS2ECY60Br06RcNMYu9Y3WDZEd653DBKQYG2AaBJh2ARgAT2jHGFi3dt6TUj8g6gDHg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tPOQ3-0003eR-Bb
 for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:03 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#75026] [PATCH core-updates 4/7] gnu: brotli: Update to 1.1.0.
Resent-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sun, 22 Dec 2024 16:03:03 +0000
Resent-Message-ID: <handler.75026.B75026.173488336813965@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 75026
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75026@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Received: via spool by 75026-submit@debbugs.gnu.org id=B75026.173488336813965
 (code B ref 75026); Sun, 22 Dec 2024 16:03:03 +0000
Received: (at 75026) by debbugs.gnu.org; 22 Dec 2024 16:02:48 +0000
Received: from localhost ([127.0.0.1]:51577 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tPOPl-0003d2-CL
 for submit@debbugs.gnu.org; Sun, 22 Dec 2024 11:02:47 -0500
Received: from mail-pl1-f182.google.com ([209.85.214.182]:60636)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@gmail.com>) id 1tPOPh-0003cC-B1
 for 75026@debbugs.gnu.org; Sun, 22 Dec 2024 11:02:42 -0500
Received: by mail-pl1-f182.google.com with SMTP id
 d9443c01a7336-216728b1836so27086125ad.0
 for <75026@debbugs.gnu.org>; Sun, 22 Dec 2024 08:02:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1734883295; x=1735488095; darn=debbugs.gnu.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=eRZRGDb+ibfrqXXDdL81W9bRX7wiAziXg6PJX4o/as8=;
 b=gsLWQCsujenRCCMrcOfCRfZxl4x8vlCLRzxxZCDRRF7uFetfZmmgOWaRthqJbZZ/15
 8pSru60vhZo/zQIegT/+9dCNwlYBb1GjtjXDR9W9j3M1S9k7u6D2nbFg+G9rIB44AGsw
 OVK9oin6eyO+vNcqrhRsictKAhAeK4+Qb4YXALemDytjUhpi33F52qZtOnKkdIbnfal9
 6ituQ9xxi5YypRXXox2JZ/snAohcsNS/g6U4hq5/4CQaZsGJddsSmtzat1J/VaRKBJLk
 dn4Dm27r0S0c1T2nDKBNGrBjQJEuYzt5SOWOu+XEmICVRahK6FL1ZRFB01rSzvtR4ipj
 n53w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1734883295; x=1735488095;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=eRZRGDb+ibfrqXXDdL81W9bRX7wiAziXg6PJX4o/as8=;
 b=W0h4jRUe3TU/jTgWNf9VAQ6nYh1v66Pbx6X4qolg8PKS+gA3ZVskXhOMMp7Qqvyk4P
 VqNI5QsqJ7ZhFYwvS3DfyTItKaHPuB90qxYNpyAHwy6FhPb/e192mg/QlRC0vEsMDPYk
 KxO/NbVEiY/9Hb04NfPFA3NiA4K+pBq/L971Y8C/wNW88iuLq4g3Z+Cx0cYbRyH8s7nw
 Rv4lC5iTbNNtGTWCDKkRLlGqOF8V+l5/QdMTluMLl+SFgnkO/bxmw6ME4OjwW2s/6N1W
 +hgP6isTK7dqp3Y+BzMLU8A2F8yTq8SgCSkxXdE4b+tLJtsp6qrq58X7AN4+Kg8gmObR
 dsGw==
X-Gm-Message-State: AOJu0YzOp1TklCzH2gKYqA5VVyeRzS7aqLe/1LkaiUqJ9vdRKVbXaOdQ
 r8roRT98sHxs5GFilaAay6sWMrH65F/p51ZdWITBV0L7cGf9Kx9uSJe6wg==
X-Gm-Gg: ASbGncuoH2B7lNd2dayd7J1uTg6WVQ1ZANy1pS+1c/2UyovV2ehSaNkUTvXpLTuXyjb
 zRKlSbnfmiW79K+Ktx9W4TIMf4Iie7xvN5Tj0hom2mqbGqVcLYVlo8oiQenEAlIXBUxh6Qq7N43
 /jrP+A9sS28DFfF4cALfpKjvc5HXn2KIgf+LByfKWvLiIOFahXm0KYsgn+mGPCQyPFu00ca9fRc
 CDPh2+vqrD7j4fKkapF6c0pmktMGsQ6ruhH7ST98tRSG46JKSxEoJMikH1VMqGIu3ef58ieY4k=
X-Google-Smtp-Source: AGHT+IHDzpzQvx/7+xXRey6+AwK+WMJKGKqpXj6bVS4r5Jlpu7jbwdPWUstn/bleAyAvkyibUPi8VQ==
X-Received: by 2002:a17:903:2310:b0:215:a190:ba10 with SMTP id
 d9443c01a7336-219e6ea23d7mr127497235ad.15.1734883294892; 
 Sun, 22 Dec 2024 08:01:34 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
 by smtp.gmail.com with ESMTPSA id
 d9443c01a7336-219dc9f68e4sm58423495ad.211.2024.12.22.08.01.32
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sun, 22 Dec 2024 08:01:33 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 23 Dec 2024 01:01:02 +0900
Message-ID: <f565959c06d550ff7a751d358f577d94df9c288f.1734882716.git.maxim.cournoyer@gmail.com>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1734882716.git.maxim.cournoyer@gmail.com>
References: <cover.1734882716.git.maxim.cournoyer@gmail.com>
MIME-Version: 1.0
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=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-Scanner: mx11.migadu.com
X-Migadu-Spam-Score: -4.38
X-Spam-Score: -4.38
X-Migadu-Queue-Id: 657308045A
X-TUID: 2JlIh2r0MFXK

* gnu/packages/compression.scm (brotli): Update to 1.1.0.
[source]: Delete obsolete snippet.
[arguments]: Use gexps.

Change-Id: I4fe13683ff33f528ef897bb65bbb239d4d4985c6
---
 gnu/packages/compression.scm | 47 +++++++++++++++---------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 44461bb87c..93b6cd070b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2351,7 +2351,7 @@ (define-public isa-l
 (define-public brotli
   (package
     (name "brotli")
-    (version "1.0.9")
+    (version "1.1.0")
     (source
      (origin
        (method git-fetch)
@@ -2360,35 +2360,26 @@ (define-public brotli
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1fikasxf7r2dwlk8mv8w7nmjkn0jw5ic31ky3mvpkdzwgd4xfndl"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Cherry-picked from upstream since the latest release
-           ;; https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc
-           (substitute* (find-files "scripts" "^lib.*pc\\.in")
-             (("-R\\$\\{libdir\\} ") ""))
-           #t))))
+        (base32 "0cvcq302wpjpd1a2cmxcp9a01lwvc2kkir8vsdb3x11djnxc0nsk"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'rename-static-libraries
-           ;; The build tools put a 'static' suffix on the static libraries, but
-           ;; other applications don't know how to find these.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((lib (string-append (assoc-ref %outputs "out") "/lib/")))
-               (rename-file (string-append lib "libbrotlicommon-static.a")
-                            (string-append lib "libbrotlicommon.a"))
-               (rename-file (string-append lib "libbrotlidec-static.a")
-                            (string-append lib "libbrotlidec.a"))
-               (rename-file (string-append lib "libbrotlienc-static.a")
-                            (string-append lib "libbrotlienc.a"))
-               #t))))
-       #:configure-flags
-       (list ;; Defaults to "lib64" on 64-bit archs.
-             (string-append "-DCMAKE_INSTALL_LIBDIR="
-                            (assoc-ref %outputs "out") "/lib"))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'rename-static-libraries
+            ;; The build tools put a 'static' suffix on the static libraries, but
+            ;; other applications don't know how to find these.
+            (lambda _
+              (let ((lib (string-append #$output "/lib/")))
+                (rename-file (string-append lib "libbrotlicommon-static.a")
+                             (string-append lib "libbrotlicommon.a"))
+                (rename-file (string-append lib "libbrotlidec-static.a")
+                             (string-append lib "libbrotlidec.a"))
+                (rename-file (string-append lib "libbrotlienc-static.a")
+                             (string-append lib "libbrotlienc.a"))))))
+      #:configure-flags
+      #~(list ;; Defaults to "lib64" on 64-bit archs.
+         (string-append "-DCMAKE_INSTALL_LIBDIR=" #$output "/lib"))))
     (home-page "https://github.com/google/brotli")
     (synopsis "General-purpose lossless compression")
     (description "This package provides the reference implementation of Brotli,
-- 
2.46.0