From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 sAJPFyLYeGaQmAAAe85BDQ:P1 (envelope-from ) for ; Mon, 24 Jun 2024 02:21:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sAJPFyLYeGaQmAAAe85BDQ (envelope-from ) for ; Mon, 24 Jun 2024 04:21:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CHnQnXho; 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)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719195681; 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-to: 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=/RhsVqljhC/2WsVqiaVcVQ4W9CFIKqU8hZ/Uv7rYhAI=; b=jLK2ZrqByaLioXSFcNJU9JHSPUIAfT0ToDwZnOi9TQQBjDpX4YLlBCKNAaR8Yv3uyEtsOp +a3KXlSkHCOcbbaXT8DT+KKnOtfabqv5fR90kY+9FDxHLn63815DjQMPj1K4WrkqyW/usx SXxm0KG1BgIvOzOeMN4owYtqQr6PetBiEuaCBZGCWvS/ZgyqL0e15+08ct45b0Ret0aovl UHqWqoNW67StDYkiuQ7ifyvaWVpUOhsBnBlE5AYhzK2n2wZ+XS8PqQshr37iGrtbpBrsT1 O5dGHTtMjEWguE4sJ9Gz62h76OSGE4Ihu/30aKC5GcCY5tLpjFNgDq0ISdjvEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CHnQnXho; 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)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719195681; a=rsa-sha256; cv=none; b=R8RT494SD3AOoouq8gOTTnp0v0+xZw5N+X2oRm2FXmp8sxhieHpcGfHrIv6RzwfqmRiY+Q PNYIxzLuNEdjonTBT30x3TO2kdrzw5B2i8xIvu9FbEz8qV0HUO/hfOXKacAaVVkvujWozi dEp8XtVCRXK+/i1KQtspMh7IsLqyWRUU/PsRFaiE+OCVhmvK5cCJVpc/JHHBd9jIlOFbJy JCa6LhEHGchTXTN2chVMG/SOyQtCt7EBTvO/AiwEO2qy4TSehpkUlDckgbXIKfSYOj/7Xo Akvl6nKKgqJv7eN3NE/LjO4L2k4PgZLTX5xeqVVAgDmltenHilKJzxVSkTnrrQ== 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 82E9650164 for ; Mon, 24 Jun 2024 04:21:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLZKL-0000Bb-JI; Sun, 23 Jun 2024 22:21:05 -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 1sLZKH-0000An-GD for guix-patches@gnu.org; Sun, 23 Jun 2024 22:21:02 -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 1sLZKH-0006Ab-6q for guix-patches@gnu.org; Sun, 23 Jun 2024 22:21:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sLZKH-0006kY-Ta for guix-patches@gnu.org; Sun, 23 Jun 2024 22:21:01 -0400 Subject: bug#71539: [PATCH] gnu: astyle: Update to 3.5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 24 Jun 2024 02:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 71539 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Artyom V. Poptsov" Cc: 71539-done@debbugs.gnu.org Mail-Followup-To: 71539@debbugs.gnu.org, maxim.cournoyer@gmail.com, poptsov.artyom@gmail.com Received: via spool by 71539-done@debbugs.gnu.org id=D71539.171919560425840 (code D ref 71539); Mon, 24 Jun 2024 02:21:01 +0000 Received: (at 71539-done) by debbugs.gnu.org; 24 Jun 2024 02:20:04 +0000 Received: from localhost ([127.0.0.1]:33765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLZJK-0006ie-Oy for submit@debbugs.gnu.org; Sun, 23 Jun 2024 22:20:03 -0400 Received: from mail-qv1-f45.google.com ([209.85.219.45]:51325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLZJH-0006hx-PN for 71539-done@debbugs.gnu.org; Sun, 23 Jun 2024 22:20:01 -0400 Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6b42574830fso16697176d6.2 for <71539-done@debbugs.gnu.org>; Sun, 23 Jun 2024 19:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719195532; x=1719800332; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/RhsVqljhC/2WsVqiaVcVQ4W9CFIKqU8hZ/Uv7rYhAI=; b=CHnQnXho/AkDcGlsTfnf5Zxna96YOGyFk+O51d/l6D+TUWlVLBRZxlWe4Yg3yc/pLc zgQ1D8nz67b0gnVYYoIavPIbHRqZNHuIDdBs0a9Qu9dT8K/LURaE/rfmgPxgmN3XnW2S JSMPJdnsE/rH9rXq/DIjcuDkKasT73q73tcN8yhlxcun6seyjgsdWly9cNrFt2aYME3V Jp9d7OKEG7PYU+Fzulz3VfOdQctc7G/XjDiSbX8RbPjchhXcCn92Fon7XkkubvRlh8u0 McTDJhR8WorEkiJQ/HL4rMJ/7IQuRT63RgCJ9bdCrQIPWqEVf7100ngspxDXcaeWCJBx Ehdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719195532; x=1719800332; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/RhsVqljhC/2WsVqiaVcVQ4W9CFIKqU8hZ/Uv7rYhAI=; b=m+/Hjczxg1kaatJRSO6LfxAx0aNjtbEwtrZcTel7Jseq5brbCBrQK+vF0+g0FFj3Kc 5glgKqRXS5Bzz7EroL/1OHAwzb/Qwo4hktSDVKB2V7S87lv+djZClp5/E2qlAmoKxXiM 1ttUpkQbthpk067Eu8xzy9SWzengjK1GoeIXGXSADlIYFrufq3HjxtMWeivBc2dwTH/t h6lJ75Ese68ch87MfHL7NFSZFkcTgcxk/qoCfrPBgLhKkB/mp/0vB9+PAZ+Qptlu2LZd udzdJEtyC5JNsVGJ/pzaKk/eU8rrFWMBrz5jhg2dFLE13ENIqk9q1dL2ZEwz68N7hpfU 2H/A== X-Gm-Message-State: AOJu0Yz88rJNY8UD+CxvsUGAqRc1xZKhf/30RqQ4uMxTzg12E7nPtklt 0C0EXxFYl3L6alREr7PMi/EL3QK+CAZG6psMKC9Wlr021pdS2Afg3qIi26GnFNA= X-Google-Smtp-Source: AGHT+IFLfxazPan41oyGkapy9jHc9LMD/qkZNqpYL9wHgLRG9PYfpR6K7TCXuREBJjG3wEjeEp6uHw== X-Received: by 2002:a0c:8bca:0:b0:6b5:6a1:f89a with SMTP id 6a1803df08f44-6b540997f68mr35067956d6.2.1719195532498; Sun, 23 Jun 2024 19:18:52 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b54485d76csm10629226d6.109.2024.06.23.19.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 19:18:52 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (Artyom V. Poptsov's message of "Thu, 13 Jun 2024 21:54:05 +0300") References: Date: Sun, 23 Jun 2024 22:18:51 -0400 Message-ID: <87frt384ms.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Queue-Id: 82E9650164 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.26 X-Spam-Score: -5.26 X-TUID: 4zGqzFHMY99U Hi Artyom, "Artyom V. Poptsov" writes: > * gnu/packages/code.scm (astyle): Update to 3.5. > [source]: Change source archive file name to match the upstream. > [arguments]: Remove "modules". Add "patch-makefile" phase to set > the C++ compiler to version c++17 as it is required for the build. > Simplify "install-more" file. Nitpick, there is no hanging indent is for GNU ChangeLogs. > Change-Id: I8777710d723d22320c288c331645f8d61d5e640e > --- > gnu/packages/code.scm | 28 ++++++++++------------------ > 1 file changed, 10 insertions(+), 18 deletions(-) > > diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm > index d6ac8178f3..44edf43db5 100644 > --- a/gnu/packages/code.scm > +++ b/gnu/packages/code.scm > @@ -20,6 +20,7 @@ > ;;; Copyright =C2=A9 2023 Fries > ;;; Copyright =C2=A9 2023 Zheng Junjie <873216071@qq.com> > ;;; Copyright =C2=A9 2024 Sharlatan Hellseher > +;;; Copyright =C2=A9 2024 Artyom V. Poptsov > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -823,14 +824,14 @@ (define-public uncrustify > (define-public astyle > (package > (name "astyle") > - (version "3.4.8") > + (version "3.5") > (source > (origin > (method url-fetch) > (uri (string-append "mirror://sourceforge/astyle/astyle/astyle%20" > - version "/astyle_" version "_linux.tar.gz")) > + version "/astyle-" version ".tar.bz2")) > (sha256 > - (base32 "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"))= )) > + (base32 "0g4jyp47iz97ld9ac4wb5k59j4cs8dbw4dp8f32bwqx8pyvirz6y"))= )) > (build-system gnu-build-system) > (arguments > (list > @@ -839,11 +840,13 @@ (define-public astyle > #~(list (string-append "prefix=3D" #$output) > "INSTALL=3Dinstall" > "release" "shared") > - #:modules '((guix build gnu-build-system) ;FIXME use %default-modu= les > - (guix build utils) > - (ice-9 regex)) > #:phases > #~(modify-phases %standard-phases > + (add-after 'unpack 'patch-makefile > + (lambda _ > + (substitute* "build/gcc/Makefile" > + (("CBASEFLAGS =3D -Wall -Wextra -fno-rtti -fno-exception= s -std=3Dc\\+\\+11") > + "CBASEFLAGS =3D -Wall -Wextra -fno-rtti -fno-exceptions= -std=3Dc++17")))) That's breaking our max columns width of 80. I've broken the long strings locally. > (replace 'configure > (lambda _ > (chdir "build/gcc"))) > @@ -852,12 +855,6 @@ (define-public astyle > ;; Libraries and headers aren't installed by default. > (let ((include (string-append #$output "/include")) > (lib (string-append #$output "/lib"))) > - (define (link.so file strip-pattern) > - (symlink > - (basename file) > - (regexp-substitute #f > - (string-match strip-pattern file) > - 'pre))) > (mkdir-p include) > (copy-file "../../src/astyle.h" > (string-append include "/astyle.h")) > @@ -865,12 +862,7 @@ (define-public astyle > (for-each (lambda (l) > (copy-file > l (string-append lib "/" (basename l)))) > - (find-files "bin" "^lib.*\\.so")) > - (for-each > - (lambda (file) > - (link.so file "(\\.[0-9]+){3}$") ;.so > - (link.so file "(\\.[0-9]+){2}$")) ;.so.3 > - (find-files lib "lib.*\\.so\\..*")))))))) > + (find-files "bin" "^lib.*\\.so")))))))) > (home-page "https://astyle.sourceforge.net/") > (synopsis "Source code indenter, formatter, and beautifier") > (description The rest LGTM, assuming their build system now takes care of what we used to be doing manually. Applied locally, will push shortly. --=20 Thanks, Maxim