From: Adrian Fullmer via Guix-patches via <guix-patches@gnu.org>
To: "40063@debbugs.gnu.org" <40063@debbugs.gnu.org>
Subject: [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version
Date: Sat, 14 Mar 2020 19:34:56 +0000 (UTC) [thread overview]
Message-ID: <38089017.3258274.1584214496561@mail.yahoo.com> (raw)
In-Reply-To: <1327954942.3272829.1584212270035@mail.yahoo.com>
[-- Attachment #1.1: Type: text/plain, Size: 168 bytes --]
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.
[-- Attachment #1.2: Type: text/html, Size: 417 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-bitlbee-discord-update-to-working-version.patch --]
[-- Type: text/x-patch, Size: 4645 bytes --]
From f53eb6bc1f9659430617a3232239411e1792549d Mon Sep 17 00:00:00 2001
From: Adrian Fullmer <adrianfullmer@yahoo.com>
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
next prev parent reply other threads:[~2020-03-14 19:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1327954942.3272829.1584212270035.ref@mail.yahoo.com>
2020-03-14 18:57 ` [bug#40063] [PATCH 1/2] gnu: bitlbee-discord: Fix build failure Adrian Fullmer via Guix-patches via
2020-03-14 19:34 ` Adrian Fullmer via Guix-patches via [this message]
2020-03-15 17:32 ` [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version Leo Famulari
2020-11-20 21:37 ` Christopher Baines
2021-07-14 13:05 ` bug#40063: [PATCH 1/2] gnu: bitlbee-discord: Fix build failure Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38089017.3258274.1584214496561@mail.yahoo.com \
--to=guix-patches@gnu.org \
--cc=40063@debbugs.gnu.org \
--cc=adrianfullmer@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).