From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 KBP6OKZAa2bGTAAAqHPOHw:P1 (envelope-from ) for ; Thu, 13 Jun 2024 18:55:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id KBP6OKZAa2bGTAAAqHPOHw (envelope-from ) for ; Thu, 13 Jun 2024 20:55:35 +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=UvyX+Nb9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1718304934; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=i+n4WWh9AZjh6vs+dN0+dJR/Rs+/sPIIrdU6BYcXVbo=; b=e94oZTZmsy1p9wWL3ySVv9jMb10DuUzHUPCfsU3b0vz0CxEfLGcXiEsGhZK7vXtdh2JFwT CKT1MARzY7+5kng3VaX9AhoeQiosnuZVZxr5s88CV0W5eavuzw+8ppLnjc+PVDuCshVtM6 UairNBDQwL0tnKQUWjxWcBBZM1/VfiOiSsWPZ0Za9+4soLiRA+ApktQATIPL/xumUYcCd9 4NqHOIv6EmO98Ztm4FBOJs/LDY5E7J2nJfABq3SWFClj9cPNaHWfBppeX/yjSqif+rhQiP ap3DSq9kLg8drh+RytalQo5m5K5fxVVn0mFEDK0VFiH6Fs4yMz72564cm0TJbg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718304934; a=rsa-sha256; cv=none; b=BIMe+H4EgvabURFUjp/yJzxxNGxVMXh7JrjWP3wiaKEIqyZh9FfHk9bW5uO4vPpJ7icOrB FTNYe9YIszzGRdkJN1CId1qQye4yWLgxhrisYDgbW+OyNK9XJsyvBfDS3uVXvd/szQ/Tbh llLb8qUbQW4hlub9Hw713P+q8nQIYC7247puVOCm3UdKV4KxtSEvRpiPwJahq8zTWfng+c 9BrSSFcFaZQBiIfC/3ntD38WAHQ0OpHnAKhIpnTeZT5wen4o/fC3sFyKIxsC1etKzce0eA GE/1xv9jyAameyPK1u753Tge4m2rrMcnWHM5AOivLP0M13xSK589awxNADrKWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=UvyX+Nb9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" 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 6AD566431D for ; Thu, 13 Jun 2024 20:55:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHpbR-0001Lf-6p; Thu, 13 Jun 2024 14:55:19 -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 1sHpbF-0001BB-53 for guix-patches@gnu.org; Thu, 13 Jun 2024 14:55:05 -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 1sHpbD-0004WN-7l for guix-patches@gnu.org; Thu, 13 Jun 2024 14:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sHpbC-0004VB-DN for guix-patches@gnu.org; Thu, 13 Jun 2024 14:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71539] [PATCH] gnu: astyle: Update to 3.5. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jun 2024 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71539 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71539@debbugs.gnu.org Cc: "Artyom V. Poptsov" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171830486417244 (code B ref -1); Thu, 13 Jun 2024 18:55:02 +0000 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" 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-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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.45 X-Spam-Score: -2.45 X-Migadu-Queue-Id: 6AD566431D X-Migadu-Scanner: mx11.migadu.com X-TUID: 0q9hvB77Yj3Q * 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