From patchwork Fri May 20 18:27:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 39543 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 BB96927BBEA; Fri, 20 May 2022 19:28:28 +0100 (BST) 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 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 38C8727BBE9 for ; Fri, 20 May 2022 19:28:28 +0100 (BST) Received: from localhost ([::1]:41126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ns7MR-0001pT-5C for patchwork@mira.cbaines.net; Fri, 20 May 2022 14:28:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns7M2-0001nR-8I for guix-patches@gnu.org; Fri, 20 May 2022 14:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ns7M1-0008Vq-WC for guix-patches@gnu.org; Fri, 20 May 2022 14:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ns7M1-0004lx-R8 for guix-patches@gnu.org; Fri, 20 May 2022 14:28:01 -0400 Subject: bug#55349: [PATCH]: Add libobjc2. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 20 May 2022 18:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 55349 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zhu Zihao Cc: 55349-done@debbugs.gnu.org Mail-Followup-To: 55349@debbugs.gnu.org, ludo@gnu.org, all_but_last@163.com Received: via spool by 55349-done@debbugs.gnu.org id=D55349.165307125118304 (code D ref 55349); Fri, 20 May 2022 18:28:01 +0000 Received: (at 55349-done) by debbugs.gnu.org; 20 May 2022 18:27:31 +0000 Received: from localhost ([127.0.0.1]:40098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ns7LX-0004lA-E8 for submit@debbugs.gnu.org; Fri, 20 May 2022 14:27:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ns7LT-0004ku-Cl for 55349-done@debbugs.gnu.org; Fri, 20 May 2022 14:27:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns7LN-0008Sm-RW; Fri, 20 May 2022 14:27:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=4OqaZrGFP/TyK73YP3YMfgc2e5E5QHqGK3KYqJBAfao=; b=pK0Fn1EVIp6GLX2tS1Kw MuNgRM+Ng9j0uEB9TUtFucemQlFWd5gb+wh/suPNFy8LfHY4ErpYFAZpiO+ruunTd8Cf2v+g40lvE 6Ok6ZeCbnD+c4avFk6lfvDaZGeZvmqWilnTqsUO8AF3WbISJSKPesf+DNFzCyhF26ql5WBNemrJOm 3lzILkYlKlB5cg8LczxZuypKVOm4Qgp8tmGsdUarM5XUGs3vs4gD4/6CiJLVjeKowoa6RDMpt5g+b 0QkdXkyWrzzopFIc8t7LaM/NR711sA035GubO/2hYDjCKXT7deELzNhT42QTBfE08b/uHoEWHaktc odF9YF62INwg9Q==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:65128 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns7LN-00058m-DD; Fri, 20 May 2022 14:27:21 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <86k0atbn1y.fsf@163.com> <864k1xbm5m.fsf@163.com> Date: Fri, 20 May 2022 20:27:18 +0200 In-Reply-To: <864k1xbm5m.fsf@163.com> (Zhu Zihao's message of "Tue, 10 May 2022 20:34:50 +0800") Message-ID: <87v8u0vz3t.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, Zhu Zihao skribis: >>From 8ecb351adf9220651d7901d88c1acc120b2572f2 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Tue, 10 May 2022 19:57:17 +0800 > Subject: [PATCH 1/3] gnu: Use license: prefix for gnu/packages/gnustep.scm. > > * gnu/packages/gnustep.scm (gnustep-make)[license]: Use "license:" prefix. > (windowmaker): Ditto. > (wmbattery): Ditto. > (wmnd): Ditto. > (wmcpuload): Ditto. > (wmclock): Ditto. > (wmfire): Ditto. [...] >>From f8e8dccc92813ded4e3464593427c6cae095e490 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Tue, 10 May 2022 19:27:25 +0800 > Subject: [PATCH 2/3] gnu: clang: Add OBJC_INCLUDE_PATH to native-search-paths. > > Clang is also a compiler for Objective-C. > > * gnu/packages/llvm.scm (clang-for-llvm): Add OBJC_INCLUDE_PATH to native-search-paths. [...] >>From 6c828759cc66da8a1c7ecfed77abe7cd41aee055 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Sun, 27 Mar 2022 01:11:15 +0800 > Subject: [PATCH 3/3] gnu: Add libobjc2. > > * gnu/packages/patches/libobjc2-unbundle-robin-map.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add corresponding file entry. > * gnu/packages/gnustep.scm (libobjc2): New variable. Applied, with the cosmetic changes below to placate ‘guix lint’. Thanks, Ludo’. diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 0fde3c0ebe..0314983559 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -75,18 +75,17 @@ (define-public libobjc2 (package (name "libobjc2") (version "2.1") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/gnustep/libobjc2") - (commit (string-append "v" version)))) - (sha256 - (base32 - "1zjryzvy06gjf36gz6zrkg9icwz6wsf80mp94x6bq1109vkl40b5")) - (patches - (search-patches "libobjc2-unbundle-robin-map.patch")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnustep/libobjc2") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1zjryzvy06gjf36gz6zrkg9icwz6wsf80mp94x6bq1109vkl40b5")) + (file-name (git-file-name name version)) + (patches + (search-patches "libobjc2-unbundle-robin-map.patch")))) (build-system cmake-build-system) (arguments (list @@ -99,7 +98,7 @@ (define-public libobjc2 (home-page "http://www.gnustep.org/") (synopsis "Objective-C runtime library for Clang") (description "Libobjc2 is an Objective-C runtime library designed as a -drop-in replacment for GCC runtime. It supports following features beyond +drop-in replacment for GCC runtime. It supports following features beyond GCC runtime. @itemize