From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OA3WIFRHAWKs7AAAgWs5BA (envelope-from ) for ; Mon, 07 Feb 2022 17:22:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uGlmHVRHAWJbpAAAauVa8A (envelope-from ) for ; Mon, 07 Feb 2022 17:22:44 +0100 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 B8C3B202AC for ; Mon, 7 Feb 2022 17:22:43 +0100 (CET) Received: from localhost ([::1]:60740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH6mo-0000gO-5X for larch@yhetil.org; Mon, 07 Feb 2022 11:22:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nH6Pv-00082A-BE for guix-patches@gnu.org; Mon, 07 Feb 2022 10:59:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nH6Pt-00067V-Nk for guix-patches@gnu.org; Mon, 07 Feb 2022 10:59:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nH6Pt-0001pk-KF for guix-patches@gnu.org; Mon, 07 Feb 2022 10:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53850] [PATCH] gnu: bitlbee-discord: Update to 0.4.3-1.607f988 Resent-From: Adam Maleszka Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 15:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53850 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53850@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16442495407037 (code B ref -1); Mon, 07 Feb 2022 15:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Feb 2022 15:59:00 +0000 Received: from localhost ([127.0.0.1]:43359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nH6Pq-0001pN-7C for submit@debbugs.gnu.org; Mon, 07 Feb 2022 10:59:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:39150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nH6Pl-0001pC-9F for submit@debbugs.gnu.org; Mon, 07 Feb 2022 10:58:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nH6Pl-0007vA-0Q for guix-patches@gnu.org; Mon, 07 Feb 2022 10:58:53 -0500 Received: from sonic310-14.consmr.mail.bf2.yahoo.com ([74.6.135.124]:40054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nH6PS-00063d-13 for guix-patches@gnu.org; Mon, 07 Feb 2022 10:58:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1644249511; bh=Le/76IWFp1SiYiNRgiNdKO9DEx5X4v1Li0Cibtmkqm4=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=aRNdE5qzSXfyhJWdyxQwetBQ6GopJHXqhv0rhY+e7lBlpPhOE0RZFOyiM11DgC/pFUAc7TLPsz4fCGTT+Kk8DDCHwTZCrvS+/Lq4DcDHJaSEfL2QEz6jlk+zRaZRWzBUSTpTG4vnCtk1eCNxnatHqF6HRWACH3LtPbLKgIf9vyxJ3SU8kGacmdCiF0ZVgeRht+jcB4JIZXUFSrH7kggSkmuA+3kDUnag9nfJg9av9jg+2TxTD+cmIPw+p8H/X+V1QDuKux3d1xwwcioFpKKlc8TsnQfxV3gLoOmqr2y3jEXOqieM+1aXN+yTBSDN+f8U0wR1MbDzWrct6ROlTdYdpQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1644249511; bh=6J+pZDYJ/YXW71i3OP8NChOFo57KLerYC8x1V4flwno=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=Zavs4SrwWxXMNLtdTfWUEuYh6FbWvO9Hz4y1+29nJ4FlUSszfwc5LXfbZbabaW4b0o0cx0vTzMnS+1XZMA3QkrBgYG6FXRMtx3GqPiPxYHNxrHf7Ym3VnDGSh3Ods9k8kVuNMFNfanXdkYUuPYvn4k8+wMBung4veSv1MsSnvPWtqVt/lpMLyEnIkTEqx+h6u79kj72Q9IBzHIfdfxDYcgDR7qRpDKrIlarxlrUF9tzS0VXIMMA7U68HC/XGFpiTcqZe2wvYa03uB/QarV/NjgN760XkNfKON3CiYIoNHki/w5kCH2QdGXZ0DCgGQfqcUISNSSXRiawHpFNfcVwIcg== X-YMail-OSG: u3QDB7IVM1lteBlseEpeObKqL_XqzZFViLN.ufbfmrdGLslcr3TPf0SIbwz9zSb dI3h5gaPJisCoNaK57djb2wGtbGm7wNo_iADryN3SZRQMzTfUK267B_w1HkRjuFJTTVmfwq0ZhcF Cy19YhvlzEgpx3TewC5G_hjx0huGSLfipuPHNz_AYUAIrvXADpQIYwapFFCPM4IzfQOORX15.Li5 HGmk28OavEsDZtITaoenSsE3YR_t1bZA._.5yhj99TFRWrzg22vC3cIB7u7qQle_Hiqforq3pt7N WR2lzwASZOhXsPHunoWTZwToj1aCePuHycSF1vOEXvaT2O7j8IR2bFNEwQF34nF1qmBd4uIqindX tUkhJlM4FK2X4O7y2M2osW_FBsu.JXSmGABy3LK6CIWlfgreEYOd.LcB3owqOxasoiUQa416hMCB rH.Hr.LhVN7rqeUE.LBnjynBqZgaAVTLi5.9Lctea9OGMVB1SNY34jbfxoM3nGlOmC2YE01ZN0_u qMmkdZUyr0ob13fRPJ2AP2._5Bc0jk9UKx2M7MaZuunqktRR8fxgqea6jxWCRWMnoUzWV1PPbhXe Edb0LDgKsKtRWqiPLPQgAwSpuqEtPw0gH3W6Rng4BOMiQCBY12BV7jSZDzpye8c3T7z2zhwLkABq 7xSbkhziO3dcyYESXnbK4TUaq4kZK_MUHzb_a6jBJ0kt0seyzmIU3qfoJcCJYzscFdfznUHzTVOJ U1hq4kVGRtGgNzfGy7ZrTxytw_aE9oOedPdmiv7AnYrT6aIB8prUQql0K4eouhkV.zY8fd63lM7R 3rN16maLuk.eaRXWDVgOae8ItvmKeeYgJJrasc9cJQgq2cmYe.eE3eovkAJgT8O0rDrRGVLX1tlz P__4WxKzumSUHh6uevtEECtqaq092VaA1gCe.Hf8AYx_3Yqt8VkJK3pTRtdBTQTIijWC.F64kVbo x_3ou9ruLvSk7M92eT0sy4lYgQQuEdZCg8JNgFmTZSBUN.m6YXjWAGfptW.ZEd_EWHTFnbfbBbnS pdOq2myZsVoj6txvg9C0aV8BLmV64A7mQVgFpLOrsmr2z6wMlPp6AkIxz5tW_sN7yoB9TMbgkt0c GZpRplqJv9F0ZzvNQqbsvgtYPX.fTTzelhrvu7i4hRBF_Unpdo_8jNMXeVVVXwQu47mDgkJF5sva edVwcm3KcYRTbu.1XB2Y5FI76MYzUbBttq2B8Y8Jp6nN2jVd5rNdQhUX.eBn62knhrnLNA5WE6Dd vCF59NVkqK05cQKxCgr0IWK7m8caSddnhIEBjdCzlRI0I_tv_aRimiFBH1aRpIvxQ.hFHr1Hf4vF 1nb123__bgYatAFWiMbqzljI8nMMGENa3NSk3F.cPAN3woS6h61MPrsJYz8gKLgvRRafa9Wuv6_m kvzQK6yTp7TXxmeUhjJjc72fHEAePq3mQ9zfvZ2UNlkPcV85ziTeB4qYLkxfBWjzLqfU9dyM.KvN MBdfpYYRE84kICA.W0_oaZhWbEJauk7YdOpycEWY4MBsmYxDLrzwyfg1suQJBicdY0tlrycmPX_P pNTaDaghIEJ7jFNkBEnKW2GzS2ZJCZ60paaNy4GFBTVv89HS86h1YVc7AwSXI2Pl2Kj40R026evB zZdTOzIgJTh7A9ezxMr6Yq1IK.zZXjxVkNr8XyHdYCtwKKTWYLuVCmJnCjuA8rKUCiLqllIyMIuO Lfksei41AKl1CNXxy5bUCFnb9SVeuSEQIEPv_xvJDlLiDcF0ElJNtirwjaFakPs9NGOtPXLN8YZ_ ieXJblrd0shV1qvOAmZ90L.o4PlY3zsFChBPxxKesyolkJ1Ne7LUsDEIG8WH9GD7evOTLkpEzPFe rIQbezEr.QlMLwBmi._BYljc_oJ5Suqu.1YLgMcVPoadxPcyJSe3BRrwhWqtZ8JbxcrVpc0fY49i x_OA4AbMgS3tKZ3WB9lCg9Xva93lkzP5a6._SvJmfOljoeeKUuwW9_SHVG5_4RiZ1td9ClUz_N3L 9QT0AOifNdmqinOXjzOCu6c7modVVYn4jb436RBPXq4aXR6bw_m9ct22x247c9TjtTcQ9FpY5Q0p eWEGS8MIHVSP4gJRRp3K2N6OjT8XbDsMgkpCp.wCD.ZP88mFGB657_EK9977egrvRiTQTpgqj0Cd Q2L02T5pvEeVxtT1jTOeEBY50tW1C X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.bf2.yahoo.com with HTTP; Mon, 7 Feb 2022 15:58:31 +0000 Received: by kubenode505.mail-prod1.omega.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 01b46109779917890656de3bf09506a5; Mon, 07 Feb 2022 15:58:28 +0000 (UTC) User-agent: mu4e 1.6.10; emacs 28.0.91 Date: Mon, 07 Feb 2022 16:51:37 +0100 Message-ID: <87bkzik6sd.fsf@aol.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" References: <87bkzik6sd.fsf.ref@aol.com> X-Mailer: WebService/1.1.19711 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.aol Received-SPF: pass client-ip=74.6.135.124; envelope-from=adam_maleszka@aol.com; helo=sonic310-14.consmr.mail.bf2.yahoo.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, RCVD_IN_MSPIKE_H2=-0.001, 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-Mailman-Approved-At: Mon, 07 Feb 2022 11:22:30 -0500 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: Adam Maleszka X-ACL-Warn: , Adam Maleszka via Guix-patches From: Adam Maleszka via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644250964; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Le/76IWFp1SiYiNRgiNdKO9DEx5X4v1Li0Cibtmkqm4=; b=DfhtaZMBSR+/4BRM5V+zxef1SYljPBVW2sBp5JDSQfZJeDL0mNaFlLMFp3lni7isO+ipo+ Ij9t0iLYZtFBWGkXo84omAq9ZwJMRQqQLYQRG6Xtb+3ITsVoG4hoKvxk64NE+FkoXbGkNv tF16if8ZxeTDsnezBhWVVq1treF8V76Gay+ojsXO9dHrtx41FxZG4ASXqwBReCTzKTu+DD nWz1YB5bQRfth4e53SL2IFuYlPgrrBOhBfa9b66ovfdDFTjFbuft90IMI/wFxbDWTNZ2mA CvyuyzJk5KpFeLf5YL2Ce31CrALJ3BQqFy+lHHDpz8JBxGw2rN78u8ZsQu5rvg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644250964; a=rsa-sha256; cv=none; b=Ds7zbN+gqd7wMIt3pL+RMiybBrohZzGFFyxTprTls/OVOBO3cROzpuM+eT2/jkq33y61IF XpuK4MMS8eUeZzxCVct4BztuGyv3VTyuxtoQE5aq5/Kp0rMhmD5rmWvKG9vCtlxPVdZL4b viwtpDGTJDMLOcNZQNNky3rxzDD3QO+J484vRQn/SXUMmipYZFKlKxnSJ28/eAZmCY08D1 UIf15Pqhiq5VrkDlac2Rj9VNiMqwRIKdKMZGTWZfDsuDlz86ChdLPsyGOQV0armrdO12wQ tlrqh5N530oClKSZ+1PF7ROZrIcnlSpOnnXubfVAdsF63eGXoP9cAL3+aJNvIg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=aol.com header.s=a2048 header.b=aRNdE5qz; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -5.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=aol.com header.s=a2048 header.b=aRNdE5qz; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: B8C3B202AC X-Spam-Score: -5.93 X-Migadu-Scanner: scn1.migadu.com X-TUID: //VM8oIpDAHg --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain For more information, refer to: https://issues.guix.gnu.org/53840 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-bitlbee-discord-Update-to-0.4.3-1.607f988.patch Content-Transfer-Encoding: quoted-printable From=20b307d3e8bccbef9436502b10192960441f684687 Mon Sep 17 00:00:00 2001 From: Adam Maleszka Date: Mon, 7 Feb 2022 16:47:56 +0100 Subject: [PATCH] gnu: bitlbee-discord: Update to 0.4.3-1.607f988 =2D-- gnu/packages/messaging.scm | 85 +++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 768642f119..67b1a91598 100644 =2D-- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -713,44 +713,55 @@ (define-public bitlbee-purple #f))))) =20 (define-public bitlbee-discord =2D (package =2D (name "bitlbee-discord") =2D (version "0.4.3") =2D (source =2D (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://github.com/sm00th/bitlbee-discord") =2D (commit version))) =2D (file-name (git-file-name name version)) =2D (sha256 =2D (base32 "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"))= )) =2D (build-system gnu-build-system) =2D (arguments =2D `(#:configure-flags =2D (let ((out (assoc-ref %outputs "out"))) =2D (list (string-append "--with-bdatadir=3D" out "/share/bitlbee/") =2D (string-append "--with-plugindir=3D" out "/lib/bitlbee/")= )) =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'patch-autogen =2D (lambda _ =2D (let ((sh (which "sh"))) =2D (substitute* "autogen.sh" (("/bin/sh") sh)) =2D (setenv "CONFIG_SHELL" sh))))))) =2D (inputs (list glib)) =2D (native-inputs (list pkg-config =2D autoconf =2D automake =2D texinfo =2D libtool =2D bitlbee ; needs bitlbee headers =2D bash)) =2D (synopsis "Discord plugin for Bitlbee") =2D (description "Bitlbee-discord is a plugin for Bitlbee which provides + ;; Version 0.4.3 of bitlbee-discord was prepared to work for + ;; glib@2.68. However, version 2.69 of glib introduced a breaking change + ;; causing bitlbee-discord to throw: + ;;=20 + ;; discord - Login error: Failed to switch to websocket mode + ;; + ;; This makes the plugin unable to connect and therefore unusable: + ;; https://github.com/sm00th/bitlbee-discord/issues/226 + ;; The specified commit fixes incompatibility with glib@2.69 and newer. + (let ((commit "607f9887ca85f246e970778e3d40aa5c346365a7") + (revision "1")) + (package + (name "bitlbee-discord") + (version (git-version "0.4.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sm00th/bitlbee-discord") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jkwhx2walx2ay0vc9x13q0j1qq4r5x30ss03a3j7ks28xvsnxc7"))= )) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "--with-bdatadir=3D" out "/share/bitlbee/") + (string-append "--with-plugindir=3D" out "/lib/bitlbee/")= )) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-autogen + (lambda _ + (let ((sh (which "sh"))) + (substitute* "autogen.sh" (("/bin/sh") sh)) + (setenv "CONFIG_SHELL" sh))))))) + (inputs (list glib)) + (native-inputs (list pkg-config + autoconf + automake + texinfo + libtool + bitlbee ; needs bitlbee headers + bash)) + (synopsis "Discord plugin for Bitlbee") + (description "Bitlbee-discord is a plugin for Bitlbee which provides access to servers running the Discord protocol.") =2D (home-page "https://github.com/sm00th/bitlbee-discord/") =2D (license license:gpl2+))) + (home-page "https://github.com/sm00th/bitlbee-discord/") + (license license:gpl2+)))) =20 (define-public purple-mattermost ;; The latest release (1.2) only supports Mattermost's /api/v3. Choose a base-commit: 699e79e0fbe4b4dd8c041ea3c08c76abf7bf9156 =2D-=20 2.34.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEERQucRYoeupMglC1aWTH8ZLoP+osFAmIBQaIACgkQWTH8ZLoP +ot5kRAApU+BB9sgpFPVdZM3rC9GmglCKongk5Ipqr4aWe+GXk6iVeS1aii965Vu k30g5F27a0XRThQSGDZbMfk8zdsY0AR47oYC3MHLrLMARH2vbofZXyAuBu+vT85o a+wrGcn0KKfGMzI+R+iDYyryOfZlgxQU+SbDDCRRQl361UemIo3aG7y/kKJMRsNn qoOY3TbNK/SoRGA0Z7nYByGOXns6vu6pKC3B9QTl8QVnRdyM5UoXmjH83OwryPWd UBNX1ucHlBKNm0TgIz9o/Ad2AaLsj/TSzSKOpHceGpSvCgcVM4vaw84LB9Bj+Ua8 gnLArk8gQI1A7ud2672cZR+JQ4bDmSfyM7vBSFeMauc8JAwFHubdrimlgcllUX0K Vqa1G6KND/9UVjVpE/nFMmez1KpOM8k6f8idqEEsFTey7DLwJpge8XJ2Nzb6LRwL AmWjTau5fqkFQ3AQgAoDOtdYkNLdE9FQ87YrNCc/3Pypk4Ei1nOrkzs7iI/dzQO5 W6u5il7Li2aUVIOtW3vPfPCqN9VSm82wowu72C/H1OFtNdoK9B993GS8chV69VPt Nf3LT41z/Tv4G7cxtAmUSz+/CLon/f4i5gjeREumap7oz+NYqXIVGYW8dAAkj7+F MadYEjsxWxC9wUpWSAGZdjuloj1m9DGwYKHCPEVByIzRLJcQHuY= =uJyk -----END PGP SIGNATURE----- --==-=-=--