From patchwork Sat Mar 14 19:34:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 20677 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 D226027BBE4; Sat, 14 Mar 2020 19:36:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DB71A27BBEA for ; Sat, 14 Mar 2020 19:36:15 +0000 (GMT) Received: from localhost ([::1]:47764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDCZz-00015O-B9 for patchwork@mira.cbaines.net; Sat, 14 Mar 2020 15:36:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47702) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDCZq-00015D-Jv for guix-patches@gnu.org; Sat, 14 Mar 2020 15:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDCZm-0004xb-Uk for guix-patches@gnu.org; Sat, 14 Mar 2020 15:36:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56299) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jDCZm-0004wA-Jk for guix-patches@gnu.org; Sat, 14 Mar 2020 15:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jDCZm-0002HB-GH for guix-patches@gnu.org; Sat, 14 Mar 2020 15:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version In-Reply-To: <1327954942.3272829.1584212270035@mail.yahoo.com> Resent-From: Adrian Fullmer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Mar 2020 19:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "40063@debbugs.gnu.org" <40063@debbugs.gnu.org> Received: via spool by 40063-submit@debbugs.gnu.org id=B40063.15842145208702 (code B ref 40063); Sat, 14 Mar 2020 19:36:02 +0000 Received: (at 40063) by debbugs.gnu.org; 14 Mar 2020 19:35:20 +0000 Received: from localhost ([127.0.0.1]:34039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jDCZ2-0002GC-1W for submit@debbugs.gnu.org; Sat, 14 Mar 2020 15:35:20 -0400 Received: from sonic315-14.consmr.mail.bf2.yahoo.com ([74.6.134.124]:46380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jDCYw-0002Fo-Ik for 40063@debbugs.gnu.org; Sat, 14 Mar 2020 15:35:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1584214504; bh=CliddJmVi1Okc4bg7X+z+TWx3swGyEn8Q04MHWjiuMI=; h=Date:From:To:Subject:References:From:Subject; b=fM4EeUCT/5X4RavG0bDIwiiQchBPES2UiLRA7OhKNCTULDXUyjLkhEU5AbavJl4R9kaMf83bYrdkj1vWQm23KmC7dvyJi3uQbMklUKoMT4KvQpOYuUihGF56SaEdUVGXMfMvb6qgO7hXZen4OoEBtiL+hbgIbABhq60GbfMGrWidwt+HvOJDzhiygzON0I4Sk/xChBugbLCq0uYd8lXntttl1/xawjD72eBqTcP32IlIJZKGGTzAhcA9IjsKTKP5rT37HhZAycBSlpeqoaV9vxg1PQqIEm14kqHW56ht6xu/EcgYLeNzDm43Int1JP5smh9iNy7OVjZ2DLC1zWIhbg== X-YMail-OSG: pdMESKUVM1lgLfy6EyDhvpGDUSgtioZ1FDvohsC8nCD4o0dCCiuSOn9ehttP89Y gDS2STjFS5K.9lxX8HPeap54hci.dQCzUw23pLyGd1O7McQQ41kgcGgPShEs_x4sQFBYTvuYkX60 I1Jeb.Najz_D0LlXfILKv8ud1HDBrdDL7CH3sYezzwerq5GRc2jX.NkuT580aSXLl127NAk18mQ8 VM.nk0BstekXrl1KxHMbBhx4rxKiPe8FXljn_ajCXuRlCkXhC7gBWtSbz9QCemJs6tipBmGtdS8S T7adx_oApzQevUwuYVTMledO8LC06ca1JCvww37eHXjUCA2vLAI6TWVjDoFgm2QSgFN1pihowxij CwEwSHcZHDU6hbBKtUABoVtaeEZ6r5chA.yMWMvnP9nKr8C71NaAf0RoXiB3ZbA1aqHryOLslz0K Nr2GOyxj8bp0IrCtxFYkbaZYqUPGo13qiJkKEgJ0kM8_tXzANzJJyYLDwsuFo9M_xSjcYudC3phY TXLpIY29UGIum6v._CIu1hDDD5XfLWGarZdCf3dNhRQ35jcJiNlFJdrbIwzuU7xLLXa5801W9EiW 2t6bCBgXn36.3TO9QlHkeiOvE9Hr1y89F3nmE5L9Kxr4n7PjUoi7hucKpC.KVcVAxHU7t1gbXtxw iGp.JHA5l86ARLA9c8G43UsvvABt4ltibyYZgcbjfIuLLjkSwRtQP3xyWxiMIfV9ZzbXn3hcQReJ MipDdr4o5FPRScM.CjNrw9cpo_jpb_UzxjGMbdGgryhoZAhaZHIAVvUZ7wkSmR_xGLwGwAmLumx1 pd7eiHoRDMd9WeyL1OpSEX1Hljwc6haAhlIXSagitucBFM7fSwt6WaBhm_r_Aekj0s6GrnXcxfTB lWRwxMjLvYxASXFoojMhM5wuu.25pBmizID6JeKoU48IzvuQkifFR1lK4hqaY9KsyAmlfhkWD8pR uVzyICfLgqBY6DfC4FRq9iPZZRvvEg1GlWcw64q9UuZQAjSS5vGpYGEhaJuzCLRnljHwUBnmntoH XX_MyPT7sLQilF7R1uh5i4B2pZLH0owuxNLoW9m_Now4ZTGE8pkgLRbPqZULWBJbbqQzc_d8M0Sk kzBBbx006AHcgBONaQi7ciCeU5PQM5I7BCZyY6XPbFKK8aCcccHJ0Wdf_z_oJbzluyhfWljN6MTc LKlA6Qx4Oh7v._YHQQmEK061uH1oDtnh9tz9P1KeK.l1gnPxWnIHngZ3AHkXBkVvbN__C0kuAq1c sseiuaNWNxkJhLiq6t0B_tfSXt2M8VGsko6B3C1qB3kx8FyghV0jvJJKdqXAwJmjZrmMfdoDu08R JXyTGmKJiS4cJlDvHLr.JWfpoV.lVzNwiWYAFPTLQ Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.bf2.yahoo.com with HTTP; Sat, 14 Mar 2020 19:35:04 +0000 Date: Sat, 14 Mar 2020 19:34:56 +0000 (UTC) Message-ID: <38089017.3258274.1584214496561@mail.yahoo.com> MIME-Version: 1.0 References: <38089017.3258274.1584214496561.ref@mail.yahoo.com> X-Mailer: WebService/1.1.15342 YMailNorrin Mozilla/5.0 (X11; Linux x86_64; rv:71.0) Gecko/20100101 Firefox/71.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" Reply-to: Adrian Fullmer , Adrian Fullmer via Guix-patches X-Patchwork-Original-From: Adrian Fullmer via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches The latest stable version of bitlbee-discord is partially incompatible with discord as it exists now, so i upgraded to the latest git version which functions correctly. From f53eb6bc1f9659430617a3232239411e1792549d Mon Sep 17 00:00:00 2001 From: Adrian Fullmer Date: Sat, 14 Mar 2020 12:42:06 -0500 Subject: [PATCH 2/2] gnu: bitlbee-discord: update to working version --- gnu/packages/messaging.scm | 78 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 72c505c6d9..75cf5375c6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -223,50 +223,52 @@ identi.ca and status.net).") (license (list license:gpl2+ license:bsd-2)))) (define-public bitlbee-discord - (package - (name "bitlbee-discord") - (version "0.4.2") - (source - (origin + (let ((commit "3061edd283b4e886384e5e8cad10f92dc45f3ee7") + (revision "0")) + (package + (name "bitlbee-discord") + (version (git-version "0.4.2" revision commit)) + (source + (origin (method git-fetch) (uri (git-reference (url "https://github.com/sm00th/bitlbee-discord.git") - (commit version))) + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f")))) - (build-system gnu-build-system) - (arguments - `(#: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)) - #t)) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "./configure" - (string-append "--with-bdatadir=" - (assoc-ref outputs "out") - "/share/bitlbee/") - (string-append "--with-plugindir=" - (assoc-ref outputs "out") - "/lib/bitlbee/"))))))) - (inputs `(("glib" ,glib))) - (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ("libtool" ,libtool) - ("bitlbee" ,bitlbee) ; needs bitlbee headers - ("bash" ,bash))) - (synopsis "Discord plugin for Bitlbee") - (description "Bitlbee-discord is a plugin for Bitlbee witch provides + (base32 "1d6nkr7wfrhra09ql258hvhr6q8kmnigcr14hjbwk10kqcb277y6")))) + (build-system gnu-build-system) + (arguments + `(#: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)) + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" + (string-append "--with-bdatadir=" + (assoc-ref outputs "out") + "/share/bitlbee/") + (string-append "--with-plugindir=" + (assoc-ref outputs "out") + "/lib/bitlbee/"))))))) + (inputs `(("glib" ,glib))) + (native-inputs `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ("libtool" ,libtool) + ("bitlbee" ,bitlbee) ; needs bitlbee headers + ("bash" ,bash))) + (synopsis "Discord plugin for Bitlbee") + (description "Bitlbee-discord is a plugin for Bitlbee witch provides access to servers running the Discord protocol.") - (home-page "https://github.com/sm00th/bitlbee-discord/") - (license license:gpl2+))) + (home-page "https://github.com/sm00th/bitlbee-discord/") + (license license:gpl2+)))) (define-public hexchat (package -- 2.25.1