(address . guix-patches@gnu.org)
ee0fa96d-8b1a-f11c-ebcf-7c54bc1698f8@raghavgururajan.name
Hello Guix!
Please find the attached patch-set.
Regards,
RG.
From 55aa0d8d546fe2b67651042461bb23145c3a1393 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 21 Nov 2020 13:13:49 -0500
Subject: [PATCH 1/4] gnu: dino: Make some cosmetic changes.
* gnu/packages/messaging.scm (dino): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Toggle diff (61 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 9a2034f253..b60922e809 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -932,19 +932,19 @@ Encryption to Gajim.")
(package
(name "dino")
(version "0.2.0")
- (outputs '("out" "debug"))
(source
(origin
(method url-fetch)
- (uri (string-append "https://github.com/dino/dino/releases/download/v"
- version "/dino-" version ".tar.gz"))
+ (uri
+ (string-append "https://github.com/dino/dino/releases/download/v"
+ version "/dino-" version ".tar.gz"))
(sha256
- (base32
- "0iigh7bkil6prf02dqcl6lmd89jxz685h8lqr3ni4x39zkcransn"))))
+ (base32 "0iigh7bkil6prf02dqcl6lmd89jxz685h8lqr3ni4x39zkcransn"))))
(build-system cmake-build-system)
+ (outputs '("out" "debug"))
(arguments
`(#:tests? #f
- #:parallel-build? #f ; not supported
+ #:parallel-build? #f ; not supported
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
@@ -955,6 +955,11 @@ Encryption to Gajim.")
(modify-phases %standard-phases
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("glib" ,glib "bin")
+ ("vala" ,vala)
+ ("gettext" ,gettext-minimal)))
(inputs
`(("libgee" ,libgee)
("libsignal-protocol-c" ,libsignal-protocol-c)
@@ -966,15 +971,10 @@ Encryption to Gajim.")
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin")
- ("vala" ,vala)
- ("gettext" ,gettext-minimal)))
- (home-page "https://dino.im")
(synopsis "Graphical Jabber (XMPP) client")
(description "Dino is a Jabber (XMPP) client which aims to fit well into
a graphical desktop environment like GNOME.")
+ (home-page "https://dino.im")
(license license:gpl3+)))
(define-public prosody
--
2.29.2
From f4bbc73b45b431917e4f9021777c1141d754ac1a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 21 Nov 2020 13:17:52 -0500
Subject: [PATCH 2/4] gnu: dino: Update synopsis and description.
* gnu/packages/messaging.scm (dino) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Toggle diff (20 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b60922e809..0cfc380643 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -971,9 +971,10 @@ Encryption to Gajim.")
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
- (synopsis "Graphical Jabber (XMPP) client")
- (description "Dino is a Jabber (XMPP) client which aims to fit well into
-a graphical desktop environment like GNOME.")
+ (synopsis "Mordern Jabber/XMPP Client using GTK+/Vala")
+ (description "Dino is a modern chat client for the desktop. It focuses on
+providing a clean and reliable Jabber/XMPP experience while having your privacy
+in mind.")
(home-page "https://dino.im")
(license license:gpl3+)))
--
2.29.2
From f17d03f041f9e6790347d6446ac5109e7d00f4fc Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 21 Nov 2020 13:24:34 -0500
Subject: [PATCH 3/4] gnu: dino: Re-arrange inputs in alphabetical order.
* gnu/packages/messaging.scm (dino) [native-inputs]: Re-order.
[inputs]: Re-order.
---
gnu/packages/messaging.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Toggle diff (38 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0cfc380643..15848a9511 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -956,21 +956,21 @@ Encryption to Gajim.")
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
- `(("pkg-config" ,pkg-config)
+ `(("gettext" ,gettext-minimal)
("glib" ,glib "bin")
- ("vala" ,vala)
- ("gettext" ,gettext-minimal)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(inputs
- `(("libgee" ,libgee)
- ("libsignal-protocol-c" ,libsignal-protocol-c)
+ `(("glib-networking" ,glib-networking)
+ ("gpgme" ,gpgme)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+ ("gtk+" ,gtk+)
+ ("libgee" ,libgee)
("libgcrypt" ,libgcrypt)
+ ("libsignal-protocol-c" ,libsignal-protocol-c)
("libsoup" ,libsoup)
("qrencode" ,qrencode)
- ("sqlite" ,sqlite)
- ("gpgme" ,gpgme)
- ("gtk+" ,gtk+)
- ("glib-networking" ,glib-networking)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+ ("sqlite" ,sqlite)))
(synopsis "Mordern Jabber/XMPP Client using GTK+/Vala")
(description "Dino is a modern chat client for the desktop. It focuses on
providing a clean and reliable Jabber/XMPP experience while having your privacy
--
2.29.2
From 4c07e4fc6704eed0632ca11b12aa50f246a41b3d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 21 Nov 2020 13:26:44 -0500
Subject: [PATCH 4/4] gnu: dino: Add some inputs.
* gnu/packages/messaging.scm (dino) [native-inputs]: Add gtk+:bin.
[inputs]: Add glib.
These inputs are referenced by the package, but were used indirectly
via propagation from other inputs. Now they are just directly added.
---
gnu/packages/messaging.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Toggle diff (20 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 15848a9511..a04a078b52 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -958,10 +958,12 @@ Encryption to Gajim.")
(native-inputs
`(("gettext" ,gettext-minimal)
("glib" ,glib "bin")
+ ("gtk+:bin" ,gtk+ "bin")
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
- `(("glib-networking" ,glib-networking)
+ `(("glib" ,glib)
+ ("glib-networking" ,glib-networking)
("gpgme" ,gpgme)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
--
2.29.2