From patchwork Sat Mar 9 07:48:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 61568 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 DB20927BBE9; Sat, 9 Mar 2024 08:52:01 +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=unavailable 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 382A127BBE2 for ; Sat, 9 Mar 2024 08:52:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1risQZ-0002dy-L0; Sat, 09 Mar 2024 03:51:36 -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 ) id 1risQV-0002dK-3b for guix-patches@gnu.org; Sat, 09 Mar 2024 03:51:31 -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 ) id 1risQU-00008s-Ce for guix-patches@gnu.org; Sat, 09 Mar 2024 03:51:30 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1risR0-0003eb-Ra for guix-patches@gnu.org; Sat, 09 Mar 2024 03:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69652] [PATCH gnome-team v2 1/3] gnu: orbit2: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Mar 2024 08:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69652 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69652@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69652-submit@debbugs.gnu.org id=B69652.170997427113946 (code B ref 69652); Sat, 09 Mar 2024 08:52:02 +0000 Received: (at 69652) by debbugs.gnu.org; 9 Mar 2024 08:51:11 +0000 Received: from localhost ([127.0.0.1]:60580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1risQA-0003cm-51 for submit@debbugs.gnu.org; Sat, 09 Mar 2024 03:51:11 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1risQ5-0003bq-Rx for 69652@debbugs.gnu.org; Sat, 09 Mar 2024 03:51:06 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 40c3cfd0; Sat, 9 Mar 2024 08:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=zv851waTHdfwyJvTqhfp0K8BO6U=; b=I MMUgJMNqKcX6o50rTZioypYD/kC2k/3+GpfcnMxYVxbSH2CkrPi4xqPXnKqBWMQG LNAC7XU3OPCKRkIPEsQZlrRUCAL8h4EDVcweDKE5kNXRjjB+qkGM7SgjKm02hXBk vyt0tobGpogX8Cow4HrVJ/wuDnGP8NE/yqlOck5wX1w0aC5Yagpb6PODdGXcPWeY c6IpP4RZGUschn5NmehovNYH9x8/nvOmOfK+gxMX97cjSMu57lVzlz7M3t1ukM3N NCsRdQXKi2GS8bHrsgLLHo+QY7auAybiQVWb9NPD8snkep6EIvh14vBTCNKK7XPN FsXKdnqlRUFBtjF0rTGQQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 501c03f1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Mar 2024 08:50:29 +0000 (UTC) Message-ID: <1a1cf98038cc19b4212b055f74cf0bb9858d52cb.1709974034.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 9 Mar 2024 08:48:36 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/gnome.scm (orbit2) [arguments]: Convert to list of G-Expressions. [native-inputs]: Write the native-input list on one line. Change-Id: I6a09616719c07cbb48195cf0c59d8b799c404d47 --- gnu/packages/gnome.scm | 54 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 13cad0add2..fa911e1e59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3800,35 +3800,35 @@ (define-public orbit2 "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam")))) (build-system gnu-build-system) (arguments - `(;; The "timeout-server" test hangs when run in parallel. - #:parallel-tests? #f - #:configure-flags - '(;; We don't need static libraries, plus they don't build reproducibly - ;; (non-deterministic ordering of .o files in the archive.) - "--disable-static" - - ;; The programmer kindly gives us a hook to turn off deprecation - ;; warnings ... - "DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") - ;; ... which they then completly ignore !! - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-parallel-build - ;; Parallel build fails because of a failed dependency, - ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274 - (lambda _ - (substitute* "src/services/name/Makefile.am" - (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h") - "orbit_name_server_2_DEPENDENCIES = \ + (list + ;; The "timeout-server" test hangs when run in parallel. + #:parallel-tests? #f + #:configure-flags + #~'(;; We don't need static libraries, plus they don't build reproducibly + ;; (non-deterministic ordering of .o files in the archive.) + "--disable-static" + + ;; The programmer kindly gives us a hook to turn off deprecation + ;; warnings ... + "DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") + ;; ... which they then completly ignore !! + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-parallel-build + ;; Parallel build fails because of a failed dependency, + ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274 + (lambda _ + (substitute* "src/services/name/Makefile.am" + (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h") + "orbit_name_server_2_DEPENDENCIES = \ $(DEPS) CosNaming.h libname-server-2.a")))) - (add-before 'configure 'ignore-deprecations - (lambda _ - (substitute* "linc2/src/Makefile.in" - (("-DG_DISABLE_DEPRECATED") - "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))))))) + (add-before 'configure 'ignore-deprecations + (lambda _ + (substitute* "linc2/src/Makefile.in" + (("-DG_DISABLE_DEPRECATED") + "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))))))) (inputs (list glib libidl)) - (native-inputs - (list pkg-config)) + (native-inputs (list pkg-config)) (home-page "https://projects.gnome.org/orbit2/") (synopsis "CORBA 2.4-compliant Object Request Broker") (description "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb)