From unknown Mon Jun 16 23:10:59 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#71539 <71539@debbugs.gnu.org> To: bug#71539 <71539@debbugs.gnu.org> Subject: Status: [PATCH] gnu: astyle: Update to 3.5. Reply-To: bug#71539 <71539@debbugs.gnu.org> Date: Tue, 17 Jun 2025 06:10:59 +0000 retitle 71539 [PATCH] gnu: astyle: Update to 3.5. reassign 71539 guix-patches submitter 71539 "Artyom V. Poptsov" severity 71539 normal tag 71539 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 13 14:54:24 2024 Received: (at submit) by debbugs.gnu.org; 13 Jun 2024 18:54:24 +0000 Received: from localhost ([127.0.0.1]:38212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHpaZ-0004U4-Vq for submit@debbugs.gnu.org; Thu, 13 Jun 2024 14:54:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:43144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHpaV-0004Tt-8c for submit@debbugs.gnu.org; Thu, 13 Jun 2024 14:54:22 -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 1sHpaV-0000yl-7e for guix-patches@gnu.org; Thu, 13 Jun 2024 14:54:19 -0400 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sHpaT-0004RN-Fv for guix-patches@gnu.org; Thu, 13 Jun 2024 14:54:19 -0400 Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2ebec2f11b7so13561421fa.2 for ; Thu, 13 Jun 2024 11:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718304855; x=1718909655; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=i+n4WWh9AZjh6vs+dN0+dJR/Rs+/sPIIrdU6BYcXVbo=; b=UvyX+Nb9af5veEIK4N0LwELItiCcTAFm9z8nmKRHXz7rVzriREKLY+82GIwI1WLhOW Lcclh7/L/b8VEKO1DsbGcqn5nF7k6TDN1YS7wBL/UADO7hBecmw1q3Ehn50ewV2Zmldv BF47kIv9PAUFWRV2QIOBN7Pv6+tI9P5ka4xv+miXnhaD4fWZ97mfyLPvQiQNDSA+sLaS 6XuTPsjz1iq3UCBgCqEp1CoQZE/6D3JFSIA7zVb/rbCcySD8AWP3+ZRleBwjpFoNdmJ5 VOf25VejJufiXKVvnqIBLJNlPZ6r86bHGqMDUUpvXm2/chTeh7vreY0gmLSnvnr3TyUv XZww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718304855; x=1718909655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=i+n4WWh9AZjh6vs+dN0+dJR/Rs+/sPIIrdU6BYcXVbo=; b=kowQOKn04kjS6pi4sfCnUuky8hFnh0XknwMqkal3xVLDHqCHK78+k5UfICAyWqoEtC B8ManGiklLvhUhEkr8iwmkAbSxB92mNp0nh3NeLmOFiJQ59p7WEwg7JJIcysbNbClSyX f12hgU4qKCeZvQb+P569NZVWnhhAHVTPN1//9/Lm4LIOmm53Gy6RG8GA31+decoPXOek MM/zVwjq7iXuwyLDHU5r1ZGphZgpAZUzfGVS++GP2P88U1ybZHZEUAFewWPkYpFPBemb SUdXcu5pX44q7H7D/Kem5MBLeo6b7mDL0Kj7o14RNx5pytn5/nrcdHtnzuy3mq3Yj6L7 h2Rg== X-Gm-Message-State: AOJu0Yy/8zgQGqH4x9h80rppdmEB2Hbf709jvbzshNq8m7v2bGyXtMl/ QeuWSAY9aKZRanMrS3Siit2J6gpDhPPC33uX5llIVbUdwfrPHjf+FtBYvw== X-Google-Smtp-Source: AGHT+IGsSC/EiytQP3k3BupYhC8F0bf3e4f1U211WFHkipTKxleFEapX55ymCH+C0meSNhDSuFvCEA== X-Received: by 2002:a2e:888f:0:b0:2ea:8308:841e with SMTP id 38308e7fff4ca-2ec0e5d0b7amr4226411fa.24.1718304854319; Thu, 13 Jun 2024 11:54:14 -0700 (PDT) Received: from elephant.. ([95.79.83.83]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ec05c8a2adsm3327441fa.109.2024.06.13.11.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 11:54:13 -0700 (PDT) From: "Artyom V. Poptsov" To: guix-patches@gnu.org Subject: [PATCH] gnu: astyle: Update to 3.5. Date: Thu, 13 Jun 2024 21:54:05 +0300 Message-ID: X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::232; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x232.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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. 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 © 2023 Fries ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 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=" #$output) "INSTALL=install" "release" "shared") - #:modules '((guix build gnu-build-system) ;FIXME use %default-modules - (guix build utils) - (ice-9 regex)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda _ + (substitute* "build/gcc/Makefile" + (("CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c\\+\\+11") + "CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++17")))) (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 base-commit: 7e00fb9f31f51ac2f9fa67b71a3eb8aaa23efdb6 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 22:20:03 2024 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 To: "Artyom V. Poptsov" Subject: Re: [bug#71539] [PATCH] gnu: astyle: Update to 3.5. 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71539-done Cc: 71539-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Mon Jun 16 23:10:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 22 Jul 2024 11:24:16 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator