PATCH v2: c-toxcore, utox update, utox description

PATCH v2: c-toxcore, utox update, utox description

[ng0]

 [PATCH 1/3] gnu: Add c-toxcore.
 [PATCH 2/3] gnu: utox: Update to 0.11.0.
 [PATCH 3/3] gnu: utox: Fix description.

Applied the changes as requested, added some more infos about changed upstream.
If the nature of c-toxcore is still not clear, take a look at all the other clients
and their pull requests, and maybe ask directly upstream (as I have no time and no account
on github), I just saw this new toxcore everyone is using now.

[PATCH 1/3] gnu: Add c-toxcore.

[ng0]

* gnu/packages/messaging.scm (c-toxcore): New variable.
---
 gnu/packages/messaging.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8660915bb..4e3cc3098 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -622,6 +622,48 @@ protocols.")
       (license license:gpl3+)
       (home-page "https://tox.chat"))))
 
+;; Some tox clients move to c-toxcore, which seems to be where all the
+;; recent development happens. It is run by the same developers as toxcore,
+;; forked into a group namespace.
+(define-public c-toxcore
+  (package
+    (name "c-toxcore")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/TokTok/c-toxcore/archive/v"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0dybpz44pi0zm8djppjna0r8yh5wvl3l885dv2f1wp5366bk59n3"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("check" ,check)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libsodium" ,libsodium)
+       ("opus" ,opus)
+       ("libvpx" ,libvpx)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoconf
+           ;; The tarball source is not bootstrapped.
+           (lambda _
+             (zero? (system* "autoreconf" "-vfi")))))
+       #:tests? #f)) ; FIXME: Testsuite fails, needs internet connection.
+    (synopsis "Library for the Tox encrypted messenger protocol")
+    (description
+     "Official fork of the C library implementation of the Tox
+encrypted messenger protocol.")
+    (license license:gpl3+)
+    (home-page "https://tox.chat")))
+
 (define-public utox
   (package
    (name "utox")
-- 
2.11.0

Re: [PATCH 1/3] gnu: Add c-toxcore.

[Ludovic Courtès]

ng0 <ng0@libertad.pw> skribis:

> * gnu/packages/messaging.scm (c-toxcore): New variable.

Applied, thanks!

[PATCH 2/3] gnu: utox: Update to 0.11.0.

[ng0]

* gnu/packages/messaging.scm (utox): Update to 0.11.0.
[source]: Update source uri to new group namespace on github.
[build-system]: Change to cmake-build-system.
[arguments]: Remove previous content and disable tests,
add two new phases.
[inputs]: Remove libtoxcore, add c-toxcore.
[native-inputs]: Remove it.
---
 gnu/packages/messaging.scm | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4e3cc3098..aa3d82d63 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -34,6 +34,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
   #:use-module (gnu packages autotools)
@@ -667,40 +668,47 @@ encrypted messenger protocol.")
 (define-public utox
   (package
    (name "utox")
-   (version "0.9.8")
+   (version "0.11.0")
    (source
     (origin
      (method url-fetch)
-     (uri (string-append "https://github.com/GrayHatter/uTox/archive/v"
+     (uri (string-append "https://github.com/uTox/uTox/archive/v"
                          version ".tar.gz"))
      (file-name (string-append name "-" version ".tar.gz"))
      (sha256
       (base32
-       "13hfqbwzcgvfbvf9yjm62aqsvxnpqppb50c88sys43m7022yqcsy"))))
-   (build-system gnu-build-system)
+       "15s4iwjk1s0kihjqn0f07c9618clbphpr827mds3xddkiwnjz37v"))))
+   (build-system cmake-build-system)
    (arguments
-    '(#:make-flags (list (string-append "PREFIX=" %output)
-                         "CC=gcc")
-      #:tests? #f ; No tests
+    '(#:tests? #f ; No test phase.
       #:phases
       (modify-phases %standard-phases
-        ;; No configure script
-        (delete 'configure))))
+        (add-after 'unpack 'fix-freetype-include
+          (lambda _
+            (substitute* "CMakeLists.txt"
+              (("/usr/include/freetype2")
+               (string-append (assoc-ref %build-inputs "freetype")
+                              "/include/freetype2")))))
+        (add-before 'install 'patch-cmake-find-utox
+          (lambda _
+            (substitute* "../build/cmake_install.cmake"
+              (("/uTox-0.11.0/utox")
+               "/build/utox")))))))
    (inputs
+    ;; TODO: Fix the filechoser dialogue, which input
+    ;; does it need?
     `(("dbus" ,dbus)
       ("filteraudio" ,filteraudio)
       ("fontconfig" ,fontconfig)
       ("freetype" ,freetype)
       ("libsodium" ,libsodium)
-      ("libtoxcore" ,libtoxcore)
+      ("c-toxcore" ,c-toxcore)
       ("libvpx" ,libvpx)
       ("libx11" ,libx11)
       ("libxext" ,libxext)
       ("libxrender" ,libxrender)
       ("openal" ,openal)
       ("v4l-utils" ,v4l-utils)))
-   (native-inputs
-    `(("pkg-config" ,pkg-config)))
    (synopsis "Lightweight Tox client")
    (description "A  lightweight Tox client.  Tox is a distributed and secure
 instant messenger with audio and video chat capabilities.")
-- 
2.11.0

Re: [PATCH 2/3] gnu: utox: Update to 0.11.0.

[Ludovic Courtès]

ng0 <ng0@libertad.pw> skribis:

> * gnu/packages/messaging.scm (utox): Update to 0.11.0.
> [source]: Update source uri to new group namespace on github.
> [build-system]: Change to cmake-build-system.
> [arguments]: Remove previous content and disable tests,
> add two new phases.
> [inputs]: Remove libtoxcore, add c-toxcore.
> [native-inputs]: Remove it.

Applied, thanks!

>     (inputs
> +    ;; TODO: Fix the filechoser dialogue, which input
> +    ;; does it need?

The GTK+3 file chooser needs GTK+3’s “share/” directory in
XDG_DATA_DIRS so that it can find the file chooser schema.

‘glib-or-gtk-build-system’ has a phase that wraps the binary with the
right XDG_DATA_DIRS.  Probably you could reuse it here?

HTH,
Ludo’.

[PATCH 3/3] gnu: utox: Fix description.

[ng0]

* gnu/packages/messaging.scm (utox): Fix description.
---
 gnu/packages/messaging.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index aa3d82d63..4575b70ad 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -710,7 +710,8 @@ encrypted messenger protocol.")
       ("openal" ,openal)
       ("v4l-utils" ,v4l-utils)))
    (synopsis "Lightweight Tox client")
-   (description "A  lightweight Tox client.  Tox is a distributed and secure
+   (description
+    "Utox is a lightweight Tox client.  Tox is a distributed and secure
 instant messenger with audio and video chat capabilities.")
    (home-page "http://utox.org/")
    (license license:gpl3)))
-- 
2.11.0

Re: [PATCH 3/3] gnu: utox: Fix description.

[Ludovic Courtès]

ng0 <ng0@libertad.pw> skribis:

> * gnu/packages/messaging.scm (utox): Fix description.

Applied, thanks!  :-)