From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6BKOHFdfNWBUUwAA0tVLHw (envelope-from ) for ; Tue, 23 Feb 2021 20:02:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aGBlGFdfNWCMUgAAbx9fmQ (envelope-from ) for ; Tue, 23 Feb 2021 20:02:31 +0000 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 34E21181DC for ; Tue, 23 Feb 2021 21:02:30 +0100 (CET) Received: from localhost ([::1]:45388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEdt7-0007OE-D1 for larch@yhetil.org; Tue, 23 Feb 2021 15:02:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEdsh-0007NY-DI for guix-patches@gnu.org; Tue, 23 Feb 2021 15:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49053) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEdsg-0008Pp-7K for guix-patches@gnu.org; Tue, 23 Feb 2021 15:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEdsg-0004z2-4i for guix-patches@gnu.org; Tue, 23 Feb 2021 15:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46653] Make some changes to Profanity stuff (v4) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 20:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Prikler , 46653@debbugs.gnu.org Received: via spool by 46653-submit@debbugs.gnu.org id=B46653.161411050119130 (code B ref 46653); Tue, 23 Feb 2021 20:02:02 +0000 Received: (at 46653) by debbugs.gnu.org; 23 Feb 2021 20:01:41 +0000 Received: from localhost ([127.0.0.1]:60599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEdsL-0004yU-9J for submit@debbugs.gnu.org; Tue, 23 Feb 2021 15:01:41 -0500 Received: from out0.migadu.com ([94.23.1.103]:42815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEdsJ-0004yL-1k for 46653@debbugs.gnu.org; Tue, 23 Feb 2021 15:01:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1614110497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GuWU1bHG4+8NmqqH2pfyg4GJmxXjiNcXfquXbKPqF0k=; b=pgrhb5C9tzLAEMTXXi87q5Ks69HyY18Y88ZB4kYgq6xjLaezk9gt3WOxhUsXWxXxpAK3YD a39I9x8A/5cblNSYJmWnN3GC+P527PsLqXK4sNVA9EyMiDHcRzrenEwLNz20Fd8yByUtGA HR+AxxjzTKd8nj3+aY3wU3F5jP7ZvcJ6xP6jaw+APQXq6aBkaZPn2i5jVJt/ftZs/Tz/6T /bJ0ZbCvof6P9kNz3pgsRFznzvLw0mgQFbgpDa4WDRtOslkK0FJi5Jo19NeUJOfJtap/I2 jPId24icYWPaDt5clZ50PirfyQS9MNXlAHOia8a4apQq86sJRxoELtyzBKLI9A== References: <13de1bda-3aa8-684c-3294-f6c37ab93cce@raghavgururajan.name> <73f708d8213aaac67e357bba5efd29fc6f8e1fbe.camel@student.tugraz.at> <3cf8c70f-176e-74cb-d01e-15cd0043844a@raghavgururajan.name> <78adf800f0dc37d53ed9fc1727e89ec122b20f0f.camel@student.tugraz.at> <049d3b368514b72d7c267fd9d7fdcf78e7059fe8.camel@student.tugraz.at> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: <1c4c1c15-9230-1991-78d6-1fbbc322ebd5@raghavgururajan.name> Date: Tue, 23 Feb 2021 15:01:35 -0500 MIME-Version: 1.0 In-Reply-To: <049d3b368514b72d7c267fd9d7fdcf78e7059fe8.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TD8LqSqkGcknQvBxbA9FM7eGRtGk2wHl7" X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=pgrhb5C9; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 34E21181DC X-Spam-Score: -4.97 X-Migadu-Scanner: scn1.migadu.com X-TUID: ytlyI1/Hzq3g This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --TD8LqSqkGcknQvBxbA9FM7eGRtGk2wHl7 Content-Type: multipart/mixed; boundary="rxMGWuxgPE6RrDpycAt5PzIX52UWB7T2T"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 46653@debbugs.gnu.org Message-ID: <1c4c1c15-9230-1991-78d6-1fbbc322ebd5@raghavgururajan.name> Subject: Re: Make some changes to Profanity stuff (v4) References: <13de1bda-3aa8-684c-3294-f6c37ab93cce@raghavgururajan.name> <73f708d8213aaac67e357bba5efd29fc6f8e1fbe.camel@student.tugraz.at> <3cf8c70f-176e-74cb-d01e-15cd0043844a@raghavgururajan.name> <78adf800f0dc37d53ed9fc1727e89ec122b20f0f.camel@student.tugraz.at> <049d3b368514b72d7c267fd9d7fdcf78e7059fe8.camel@student.tugraz.at> In-Reply-To: <049d3b368514b72d7c267fd9d7fdcf78e7059fe8.camel@student.tugraz.at> --rxMGWuxgPE6RrDpycAt5PzIX52UWB7T2T Content-Type: multipart/mixed; boundary="------------A671A2DD1053CAEB93ADDD06" Content-Language: en-US This is a multi-part message in MIME format. --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > Great, now re-order them again so that no patch causes a rebuild of a > formerly patched package. Done in v4. >> That would be 3 tests. > 3 of how many? And how many on the other package? Tests are now fixed in v4, with the help of Tobias. Regards, RG. --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-libmesode-Update-source-home-page-URIs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-libmesode-Update-source-home-page-URIs.patch" =46rom 2e1a5f04edba75795aa260697e704b189f4ec41d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 19:37:30 -0500 Subject: [PATCH 1/6] gnu: libmesode: Update source, home-page URIs. * gnu/packages/messaging.scm (libmesode) [source]: Update to new upstream URI. [home-page]: Same. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1878c71c7d..a20a322725 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2008,7 +2008,7 @@ is also scriptable and extensible via Guile.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boothj5/libmesode") + (url "https://github.com/profanity-im/libmesode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2027,7 +2027,7 @@ is also scriptable and extensible via Guile.") (description "Libmesode is a fork of libstrophe for use with Profani= ty XMPP Client. In particular, libmesode provides extra TLS functionality = such as manual SSL certificate verification.") - (home-page "https://github.com/boothj5/libmesode") + (home-page "https://github.com/profanity/libmesode") ;; Dual-licensed. (license (list license:gpl3+ license:x11)))) =20 --=20 2.30.1 --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-libmesode-Disable-static-libraries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-libmesode-Disable-static-libraries.patch" =46rom 8d062edc31ca954c4896b3421128687037758bc4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 20:24:15 -0500 Subject: [PATCH 2/6] gnu: libmesode: Disable static libraries. * gnu/packages/messaging.scm (libmesode) [arguments]<#:phases>['patch-mak= e]: New phase. <#:configure-flags>[--disable-static]: New flag. --- gnu/packages/messaging.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a20a322725..53515abe8b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2015,6 +2015,17 @@ is also scriptable and extensible via Guile.") (base32 "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))= )) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-make + (lambda _ + (substitute* "Makefile.am" + (("'\\^xmpp_'") "'.'")) + #t))))) (inputs `(("expat" ,expat) ("openssl" ,openssl))) --=20 2.30.1 --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-libstrophe-Update-to-0.10.1.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-libstrophe-Update-to-0.10.1.patch" =46rom bb38ac368dfd1cd8c1cae4783f1fd9b5368a2c52 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 09:39:22 -0500 Subject: [PATCH 3/6] gnu: libstrophe: Update to 0.10.1. * gnu/packages/messaging.scm (libstrophe) [version]: Update to 0.10.1. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 53515abe8b..14d4a0052a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2045,7 +2045,7 @@ manual SSL certificate verification.") (define-public libstrophe (package (name "libstrophe") - (version "0.9.3") + (version "0.10.1") (source (origin (method git-fetch) @@ -2054,7 +2054,7 @@ manual SSL certificate verification.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk"))= )) + (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))= )) (build-system gnu-build-system) (inputs `(("expat" ,expat) --=20 2.30.1 --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-libstrophe-Disable-static-libraries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-libstrophe-Disable-static-libraries.patch" =46rom 9a5e084babd6ad1bef077e63257f2e5c7c230167 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 12:03:23 -0500 Subject: [PATCH 4/6] gnu: libstrophe: Disable static libraries. * gnu/packages/messaging.scm (libstrope) [arguments]<#:phases>['patch-mak= e]: New phase. <#:configure-flags>[--disable-static]: New flag. --- gnu/packages/messaging.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 14d4a0052a..5f2df4c6fc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2056,6 +2056,17 @@ manual SSL certificate verification.") (sha256 (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))= )) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-make + (lambda _ + (substitute* "Makefile.am" + (("'\\^xmpp_'") "'.'")) + #t))))) (inputs `(("expat" ,expat) ("openssl" ,openssl))) --=20 2.30.1 --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-profanity-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-profanity-Add-missing-inputs.patch" =46rom 06dfa7fb50fcb29faa2ae4f465612cb0daa51368 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 19:46:39 -0500 Subject: [PATCH 5/6] gnu: profanity: Add missing inputs. * gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt. --- gnu/packages/messaging.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5f2df4c6fc..1f4c7aae4d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2121,10 +2121,12 @@ are both supported).") ("glib" ,glib) ("gpgme" ,gpgme) ("gtk+" ,gtk+-2) + ("libgcrypt" ,libgcrypt) ("libmesode" ,libmesode) ("libnotify" ,libnotify) ("libotr" ,libotr) ("libsignal-protocol-c" ,libsignal-protocol-c) + ;; ("libxss" ,libxss) ("ncurses" ,ncurses) ("openssl" ,openssl) ("python" ,python-wrapper) --=20 2.30.1 --------------A671A2DD1053CAEB93ADDD06 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-profanity-Disable-static-libraries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0006-gnu-profanity-Disable-static-libraries.patch" =46rom 90d6f7db7fdfadfb5ebc546702fe0c1a468bc92e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 20:28:57 -0500 Subject: [PATCH 6/6] gnu: profanity: Disable static libraries. * gnu/packages/messaging.scm (profanity) [arguments]<#:configure-flag>: A= dd --disable-static. --- gnu/packages/messaging.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1f4c7aae4d..d6e160d5dc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2100,6 +2100,7 @@ are both supported).") (arguments `(#:configure-flags (list + "--disable-static" "--enable-notifications" "--enable-python-plugins" "--enable-c-plugins" --=20 2.30.1 --------------A671A2DD1053CAEB93ADDD06-- --rxMGWuxgPE6RrDpycAt5PzIX52UWB7T2T-- --TD8LqSqkGcknQvBxbA9FM7eGRtGk2wHl7 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDVfHwUDAAAAAAAKCRBfWBZkf4vlUY91 AQC5coR5JkMruTEDZHFaB3So6rmz5c3XJOR2nwrkHqcXEgEAoczY2IDTKHvtX7kqtwqLBpqXb+PB ngBLfotZNs1Y5g8= =sboP -----END PGP SIGNATURE----- --TD8LqSqkGcknQvBxbA9FM7eGRtGk2wHl7--