[bug#38347] gnome-contacts

[bug#38347] gnome-contacts

[Raghav Gururajan]

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

Hello Guix!

Please find the attached file containing patch to add gnome-contacts.

Thank you!

Regards,
RG.

[-- Attachment #1.2: 0001-Add-gnome-contacts.patch --]
[-- Type: text/x-patch, Size: 2949 bytes --]

From 1ea14a09d76e7be1eda9282dafb6ea57b18eae74 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 23 Nov 2019 11:11:29 -0500
Subject: [PATCH] Add gnome-contacts.

---
 gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cd881b5b87..bbec7eabca 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
+;;; Copyright © 2019 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -468,6 +469,56 @@ can be used to configure a source directory checked out from Git and some
 commonly used macros.")
     (license license:gpl2+)))
 
+(define-public gnome-contacts
+  (package
+    (name "gnome-contacts")
+    (version "3.30.2")
+    (source (origin
+	      (method url-fetch)
+	      (uri (string-append "mirror://gnome/sources/" name "/"
+				  (version-major+minor version) "/"
+				  name "-" version ".tar.xz"))
+	      (sha256
+	       (base32 
+		"1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"))))
+    (build-system meson-build-system)
+    (arguments
+      `(#:phases
+        (modify-phases %standard-phases
+          (add-after 'unpack 'generate-vapis
+            (lambda* (#:key inputs #:allow-other-keys)
+              (invoke "vapigen" "--directory=vapi" "--pkg=gio-2.0"
+                      "--library=goa-1.0"
+                      (string-append (assoc-ref inputs "gnome-online-accounts:lib")
+                                     "/share/gir-1.0/Goa-1.0.gir"))
+              #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("vala" ,vala)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("libgee" ,libgee)
+       ("evolution-data-server" ,evolution-data-server)
+       ("gnome-desktop" ,gnome-desktop)
+       ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+       ("cheese" ,cheese)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("telepathy-glib" ,telepathy-glib)
+       ("gettext" ,gettext-minimal)
+       ("libxslt" ,libxslt)
+       ("docbook-xml" ,docbook-xml)
+       ("dockbook-xsl" ,docbook-xsl)
+       ("gtk+" ,gtk+)
+       ("gtk+:bin" ,gtk+ "bin")))
+    (propagated-inputs
+     `(("folks", folks)
+       ("telepathy-mission-control" ,telepathy-mission-control)))
+    (synopsis "Contacts is GNOME's integrated address book.")
+    (description "It is written in Vala and uses 
+		 libfolks (also written in Vala) and Evolution Data Server.")
+    (home-page "https://wiki.gnome.org/Apps/Contacts")
+    (license gpl2))
+
 (define-public gnome-desktop
   (package
     (name "gnome-desktop")
-- 
2.24.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#38347] gnome-contacts

[Tobias Geerinckx-Rice via Guix-patches via]

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

Raghav,

Raghav Gururajan 写道：
> Please find the attached file containing patch to add 
> gnome-contacts.

Thank you!  Congratulations on your first patch, and may there be 
many more.

I was going to fix the points below myself, but then they 
multiplied and hey, I can always say it's a good lesson for you, 
right?  Just send the result to this thread with ‘v2’ clearly in 
the subject line.

* Using ‘name’ in source URIs is harmless but also completely 
  useless.  Just use:

    (uri (string-append "mirror://gnome/sources/gnome-contacts/"
                        (version-major+minor version) "/"
                        "gnome-contacts-" version ".tar.xz"))

* Could you explain *why* generate-vapis needs to be done 
  manually?  For a mostly non-GNOMEhead like me, it's just black 
  magic.

* Nitpick: the ‘`’ of `(#:phases should fall under the ‘(’ of 
  (arguments:

    (arguments
     `(#:phases

  You can use C-M-q in emacs or run etc/indent-code.el manually to 
  indent the code for you.

* You need to move inputs that appear in ‘guix gc --references 
  /gnu/store/…gnome-contacts…’ from (native-inputs) to (inputs).

* Fix ‘dockbook-xsl’ typo.

* Since you're rewriting most *inputs anyway, please order them 
  alphabetically.

* Synopses don't need to include the name of the programme or a 
  leading article (‘a’):

    (synopsis "GNOME's integrated address book")

* The description is far too short, and just not very relevant to 
  me.

  I took a look at the README; what about:

    (description
     "Contacts is GNOME's integrated address book.  It organizes 
     contact                                         
information from all your online and offline sources, and provides 
a central                                     
place to:                                                                                                        
@enumerate                                                                                                       
@item search for and view contacts,                                                                              
@item edit contact details and make new contacts,                                                                
@item integrate with online address books,                                                                       
@item automatically link contacts from different online sources.                                                 
@end enumerate\n")

* Add ‘license:’ prefix to gpl2 (without it, Guix won't even 
  work).

* A randomly chosen source file 
  (https://gitlab.gnome.org/GNOME/gnome-contacts/blob/master/src/cc-crop-area.c) 
  says ‘or any later version’.  This makes the licence gpl2+, not 
  gpl2 (-only), unless there are files that lack this wording. 
  Could you check?

                                 * * *

I'm happy to hear that you have more patches planned.  Please 
check them for similar points and send them to guix-patches at 
gnu.org.

Thanks again!

T G-R

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

[bug#38347] gnome-contacts v2

[Raghav Gururajan]

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

Hello Guix!

Please find the attached file containing revised patch for gnome-
contacts.

Thank you!

Regards,
RG.

[-- Attachment #1.2: 0004-gnu-Add-gnome-contacts.patch --]
[-- Type: text/x-patch, Size: 4460 bytes --]

From 28cb5a45af5ff85365c5bcb4745f4e87d9d3d0bd Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 23 Nov 2019 15:52:17 -0500
Subject: [PATCH 4/4] gnu: Add gnome-contacts.

* gnu/packages/gnome.scm (gnome-contacts): New Variable.
---
 gnu/packages/gnome.scm | 95 +++++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index febc874b31..d72f81dac6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -499,53 +499,54 @@ commonly used macros.")
 
 (define-public gnome-contacts
   (package
-    (name "gnome-contacts")
-    (version "3.30.2")
-    (source (origin
-	      (method url-fetch)
-	      (uri (string-append "mirror://gnome/sources/" name "/"
-				  (version-major+minor version) "/"
-				  name "-" version ".tar.xz"))
-	      (sha256
-	       (base32 
-		"1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"))))
-    (build-system meson-build-system)
-    (arguments
-      `(#:phases
-        (modify-phases %standard-phases
-          (add-after 'unpack 'generate-vapis
-            (lambda* (#:key inputs #:allow-other-keys)
-              (invoke "vapigen" "--directory=vapi" "--pkg=gio-2.0"
-                      "--library=goa-1.0"
-                      (string-append (assoc-ref inputs "gnome-online-accounts:lib")
-                                     "/share/gir-1.0/Goa-1.0.gir"))
-              #t)))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("vala" ,vala)
-       ("glib:bin" ,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
-       ("libgee" ,libgee)
-       ("evolution-data-server" ,evolution-data-server)
-       ("gnome-desktop" ,gnome-desktop)
-       ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
-       ("cheese" ,cheese)
-       ("gst-plugins-base" ,gst-plugins-base)
-       ("telepathy-glib" ,telepathy-glib)
-       ("gettext" ,gettext-minimal)
-       ("libxslt" ,libxslt)
-       ("docbook-xml" ,docbook-xml)
-       ("dockbook-xsl" ,docbook-xsl)
-       ("gtk+" ,gtk+)
-       ("gtk+:bin" ,gtk+ "bin")))
-    (propagated-inputs
-     `(("folks", folks)
-       ("telepathy-mission-control" ,telepathy-mission-control)))
-    (synopsis "Contacts is GNOME's integrated address book.")
-    (description "It is written in Vala and uses 
-		 libfolks (also written in Vala) and Evolution Data Server.")
-    (home-page "https://wiki.gnome.org/Apps/Contacts")
-    (license gpl2))
+   (name "gnome-contacts")
+   (version "3.30.2")
+   (source (origin
+	    (method url-fetch)
+	    (uri (string-append "mirror://gnome/sources/gnome-contacts/"
+				(version-major+minor version) "/"
+				name "-" version ".tar.xz"))
+	    (sha256
+	     (base32 
+	      "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"))))
+   (build-system meson-build-system)
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+		     (add-after 'unpack 'generate-vapis		;; To generate goa's missing .vapi file
+				(lambda* (#:key inputs #:allow-other-keys)
+				  (invoke "vapigen" "--directory=vapi" "--pkg=gio-2.0"
+					  "--library=goa-1.0"
+					  (string-append (assoc-ref inputs "gnome-online-accounts:lib")
+							 "/share/gir-1.0/Goa-1.0.gir"))
+				  #t)))))
+   (native-inputs
+    `(("glib:bin" ,glib "bin")
+      ("gtk+:bin" ,gtk+ "bin")))
+   (inputs
+    `(("cheese" ,cheese)
+      ("docbook-xml" ,docbook-xml)
+      ("dockbook-xsl" ,docbook-xsl)
+      ("evolution-data-server" ,evolution-data-server)
+      ("gettext" ,gettext-minimal)
+      ("gnome-desktop" ,gnome-desktop)
+      ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+      ("gobject-introspection" ,gobject-introspection)
+      ("gst-plugins-base" ,gst-plugins-base)
+      ("gtk+" ,gtk+)
+      ("libgee" ,libgee)
+      ("libxslt" ,libxslt)
+      ("pkg-config" ,pkg-config)
+      ("telepathy-glib" ,telepathy-glib)
+      ("vala" ,vala)))
+   (propagated-inputs
+    `(("folks", folks)
+      ("telepathy-mission-control" ,telepathy-mission-control)))
+   (synopsis "GNOME's integrated address book.")
+   (description "Contacts organizes your contacts information from all your online 
+		 and offline sources, providing a centralized place for managing your contacts.")
+   (home-page "https://wiki.gnome.org/Apps/Contacts")
+   (license license:gpl2+))
 
 (define-public gnome-desktop
   (package
-- 
2.24.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#38347] gnome-contacts v2

[Jonathan Brielmaier]

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

Hey,

I took your patch and applied it with some caveats to master. I updated
to 3.32.

gnome-contacts launches when installed, but it's not possible to add any
local contacts or remote ones. So there is still some work left.

~Jonathan

On 23.11.19 21:56, Raghav Gururajan wrote:
> Hello Guix!
>
> Please find the attached file containing revised patch for gnome-
> contacts.
>
> Thank you!
>
> Regards,
> RG.
>

[-- Attachment #2: 0001-gnu-Add-gnome-contacts.patch --]
[-- Type: text/x-patch, Size: 3440 bytes --]

From 0b63ccca6ba4f400c7dd1079ba2d28dc9f01026b Mon Sep 17 00:00:00 2001
From: Raghav Guruajan <raghavguruajan@disroot.org
Date: Sun, 8 Dec 2019 22:32:13 +0100
Subject: [PATCH] gnu: Add gnome-contacts.

* gnu/packages/gnome.scm (gnome-contacts): New variable.

Co-authored-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
---
 gnu/packages/gnome.scm | 54 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7bac1454f8..8b99fc0fb7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -42,6 +42,8 @@
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
+;;; Copyright © 2019 Raghav Guruajan <raghavguruajan@disroot.org
+;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8892,3 +8894,55 @@ tile-matching game Mahjong.  It features multiple board layouts, tile themes,
 and a high score table.")
     (home-page "https://wiki.gnome.org/Apps/Mahjongg")
     (license license:gpl2+)))
+
+(define-public gnome-contacts
+  (package
+    (name "gnome-contacts")
+    (version "3.32.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/gnome-contacts/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-vapis ;; To generate goa's missing .vapi file
+           (lambda* (#:key inputs #:allow-other-keys)
+             (invoke "vapigen" "--directory=vapi" "--pkg=gio-2.0"
+                     "--library=goa-1.0"
+                     (string-append (assoc-ref inputs "gnome-online-accounts:lib")
+                                    "/share/gir-1.0/Goa-1.0.gir"))
+             #t)))))
+    (native-inputs
+     `(("glib:bin" ,glib "bin")
+       ("gtk+:bin" ,gtk+ "bin")
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cheese" ,cheese)
+       ("docbook-xml" ,docbook-xml)
+       ("dockbook-xsl" ,docbook-xsl)
+       ("evolution-data-server" ,evolution-data-server)
+       ("gettext" ,gettext-minimal)
+       ("gnome-desktop" ,gnome-desktop)
+       ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+)
+       ("libgee" ,libgee)
+       ("libxslt" ,libxslt)
+       ("telepathy-glib" ,telepathy-glib)
+       ("vala" ,vala)))
+    (propagated-inputs
+     `(("folks", folks)
+       ("telepathy-mission-control" ,telepathy-mission-control)))
+    (synopsis "GNOME's integrated address book")
+    (description "Contacts organizes your contacts information from all your online
+and offline sources, providing a centralized place for managing your contacts.")
+    (home-page "https://wiki.gnome.org/Apps/Contacts")
+    (license license:gpl2+)))
--
2.24.0

[bug#38347] gnome-contacts v2

[Raghav Gururajan]

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

Hello Jonathan!

> I took your patch and applied it with some caveats to master. I
> updated
> to 3.32.
> 
> gnome-contacts launches when installed, but it's not possible to add
> any
> local contacts or remote ones. So there is still some work left.

Thanks so much.

I believe gnome-contacts uses evolution-data-server for data
management. Could you please try with `evolution-data-server` as
propagated-input?

Thank you!

Regards,
RG.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#38347: gnome-contacts v2

[Ludovic Courtès]

Hi,

Raghav Gururajan <raghavgururajan@disroot.org> skribis:

> From 28cb5a45af5ff85365c5bcb4745f4e87d9d3d0bd Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sat, 23 Nov 2019 15:52:17 -0500
> Subject: [PATCH 4/4] gnu: Add gnome-contacts.
>
> * gnu/packages/gnome.scm (gnome-contacts): New Variable.

I merged the two patches, addressed the ‘guix lint’ warnings, and pushed
as 4e868d22e6fedb439910c50bb5c61ab712a479be with a followup commit.

I tried it under GNOME in a VM and it’s not entirely clear that it’s
working as expected: it seems to be expecting to import the address book
from an online service but doesn’t know of any?

Thank you,
Ludo’.

[bug#38347] gnome-contacts v2

[Raghav Gururajan]

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

Hello Ludo!

> I merged the two patches, addressed the ‘guix lint’ warnings, and
> pushed
> as 4e868d22e6fedb439910c50bb5c61ab712a479be with a followup commit.
> 
> I tried it under GNOME in a VM and it’s not entirely clear that it’s
> working as expected: it seems to be expecting to import the address
> book
> from an online service but doesn’t know of any?

Thank you very much.

I believe it can be tried with 'evolution-data-server' as propagated
input.

Let me try and get back to you.

AFAIK, it can create local contacts or sync contacts from online
accounts (WebDAV).

Regards,
RG.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#38347] gnome-contacts v2

[Raghav Gururajan]

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

Hello Ludo!

> > I merged the two patches, addressed the ‘guix lint’ warnings, and
> > pushed
> > as 4e868d22e6fedb439910c50bb5c61ab712a479be with a followup commit.
> > 
> > I tried it under GNOME in a VM and it’s not entirely clear that
> > it’s
> > working as expected: it seems to be expecting to import the address
> > book
> > from an online service but doesn’t know of any?
> 
> Thank you very much.
> 
> I believe it can be tried with 'evolution-data-server' as propagated
> input.
> 
> Let me try and get back to you.
> 
> AFAIK, it can create local contacts or sync contacts from online
> accounts (WebDAV).

The application is working fine on my end. No need of 'eds' as
propagated input.

Regards,
RG.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]