From patchwork Mon May 16 21:47:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 39422 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 5450E27BBEA; Mon, 16 May 2022 22:58:24 +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.9 required=5.0 tests=BAYES_00,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 1A12827BBE9 for ; Mon, 16 May 2022 22:58:24 +0100 (BST) Received: from localhost ([::1]:59854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqijP-0006ua-73 for patchwork@mira.cbaines.net; Mon, 16 May 2022 17:58:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqiZQ-0003jY-CO for guix-patches@gnu.org; Mon, 16 May 2022 17:48:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqiZQ-0007hM-3J for guix-patches@gnu.org; Mon, 16 May 2022 17:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqiZQ-0006dx-1v for guix-patches@gnu.org; Mon, 16 May 2022 17:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55465] [PATCH 2/5] gnu: libstrophe: Improve package definition. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 May 2022 21:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55465@debbugs.gnu.org Received: via spool by 55465-submit@debbugs.gnu.org id=B55465.165273767325441 (code B ref 55465); Mon, 16 May 2022 21:48:04 +0000 Received: (at 55465) by debbugs.gnu.org; 16 May 2022 21:47:53 +0000 Received: from localhost ([127.0.0.1]:55221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqiZA-0006bp-Tz for submit@debbugs.gnu.org; Mon, 16 May 2022 17:47:53 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:35768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqiZ4-0006Zg-2L for 55465@debbugs.gnu.org; Mon, 16 May 2022 17:47:45 -0400 Received: from [2001:470:8:9f5:e878:315c:5ed6:89d] (helo=leyden.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nqiYy-0003dJ-OR for 55465@debbugs.gnu.org; Mon, 16 May 2022 17:47:36 -0400 From: Jack Hill Date: Mon, 16 May 2022 17:47:21 -0400 Message-Id: <20220516214724.6136-2-jackhill@jackhill.us> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516214724.6136-1-jackhill@jackhill.us> References: <20220516214724.6136-1-jackhill@jackhill.us> 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 * gnu/packages/messaging.scm (libstrophe)[phases]: Use gexps. {install-extra-license-files}: New phase. [home-page]: Use https and add trailing /. --- gnu/packages/messaging.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fb5169f062..283b0e9f0e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -2113,14 +2114,20 @@ (define-public libstrophe (base32 "1apply301lxyjax2677bd5mc0a3233nm5qb7fiqpawq2n7vh17v0")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--disable-static") + (list #:configure-flags '(list "--disable-static") #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'patch-make (lambda _ (substitute* "Makefile.am" (("'\\^xmpp_'") "'.'")) - #t))))) + #t)) + (add-after 'install-licence-files 'install-extra-licence-files + (lambda _ + (let ((license-directory (string-append #$output + "/share/doc/" + #$name "-" #$version "/"))) + (install-file "MIT-LICENSE.txt" license-directory))))))) (inputs (list expat openssl)) (native-inputs @@ -2129,7 +2136,7 @@ (define-public libstrophe (description "Libstrophe is a minimal XMPP library written in C. It has almost no external dependencies, only an XML parsing library (expat or libxml are both supported).") - (home-page "http://strophe.im/libstrophe") + (home-page "https://strophe.im/libstrophe/") ;; Dual-licensed. (license (list license:gpl3+ license:x11))))