unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#40063] [PATCH 1/2] gnu: bitlbee-discord: Fix build failure
       [not found] <1327954942.3272829.1584212270035.ref@mail.yahoo.com>
@ 2020-03-14 18:57 ` Adrian Fullmer via Guix-patches via
  2020-03-14 19:34   ` [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version Adrian Fullmer via Guix-patches via
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Fullmer via Guix-patches via @ 2020-03-14 18:57 UTC (permalink / raw)
  To: 40063


[-- Attachment #1.1: Type: text/plain, Size: 223 bytes --]

The old package definition fails to build due to attempting to create a help file in the bitlbee store location. This patch corrects the data directory in which the help file is placed to be in the bitlbee-discord output.


[-- Attachment #1.2: Type: text/html, Size: 459 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-bitlbee-discord-Fix-build-failure.patch --]
[-- Type: text/x-patch, Size: 1008 bytes --]

From f031b1999c22294455c6ca55dc76d34e016ffdb4 Mon Sep 17 00:00:00 2001
From: Adrian Fullmer <adrianfullmer@yahoo.com>
Date: Sat, 14 Mar 2020 11:59:58 -0500
Subject: [PATCH 1/2] gnu: bitlbee-discord: Fix build failure

---
 gnu/packages/messaging.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f8b743f766..72c505c6d9 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -248,6 +248,9 @@ identi.ca and status.net).")
          (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/")))))))
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version
  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
  2020-03-15 17:32     ` Leo Famulari
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Fullmer via Guix-patches via @ 2020-03-14 19:34 UTC (permalink / raw)
  To: 40063


[-- 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version
  2020-03-14 19:34   ` [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version Adrian Fullmer via Guix-patches via
@ 2020-03-15 17:32     ` Leo Famulari
  2020-11-20 21:37       ` Christopher Baines
  0 siblings, 1 reply; 4+ messages in thread
From: Leo Famulari @ 2020-03-15 17:32 UTC (permalink / raw)
  To: 40063

On Sat, Mar 14, 2020 at 07:34:56PM +0000, Adrian Fullmer via Guix-patches via wrote:
> 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.

Is there a link to any upstream bug reports about this?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version
  2020-03-15 17:32     ` Leo Famulari
@ 2020-11-20 21:37       ` Christopher Baines
  0 siblings, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2020-11-20 21:37 UTC (permalink / raw)
  To: Adrian Fullmer; +Cc: 40063

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]


Leo Famulari <leo@famulari.name> writes:

> On Sat, Mar 14, 2020 at 07:34:56PM +0000, Adrian Fullmer via Guix-patches via wrote:
>> 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.
>
> Is there a link to any upstream bug reports about this?

Not sure you got this previous email Adrian, but is this Bitlbee fix
something you're still interested in getting merged?

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-11-20 21:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [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   ` [bug#40063] [PATCH 2/2] gnu: bitlbee-discord: update to working version Adrian Fullmer via Guix-patches via
2020-03-15 17:32     ` Leo Famulari
2020-11-20 21:37       ` Christopher Baines

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git