[PATCH] utox update, c-toxcore new package

[PATCH] utox update, c-toxcore new package

[ng0]

Adds c-toxcore, updates utox.

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

[ng0]

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

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8660915bb..dcea40836 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -622,6 +622,43 @@ protocols.")
       (license license:gpl3+)
       (home-page "https://tox.chat"))))
 
+(define-public c-toxcore
+  (package
+    (name "c-toxcore")
+    (version "0.1.0")
+    (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
+         "0mx79da7bhv2bba5x4nx4ld8rb0vmrs84jabk5cliinpnwnim24n"))))
+    (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
+           (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

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

[ng0]

* gnu/packages/messaging.scm (utox): Update to 0.11.0.
[source]: Update source uri.
[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 dcea40836..d9877b7ea 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)
@@ -662,40 +663,47 @@ protocols.")
 (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 1/2] gnu: Add c-toxcore.

[Leo Famulari]

On Thu, Dec 15, 2016 at 07:14:14PM +0000, ng0 wrote:
> * gnu/packages/messaging.scm (c-toxcore): New variable.

> +    (version "0.1.0")

I see a new release:

https://github.com/TokTok/c-toxcore/tree/v0.1.1

> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/TokTok/c-toxcore/archive/v"
> +                           version ".tar.gz"))

Is this the canonical source of c-toxcore? What is its relationship to
<https://github.com/irungentoo/toxcore>?

> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'autoconf
> +           (lambda _
> +             (zero? (system* "autoreconf" "-vfi")))))

Is there no bootstrapped tarball? Okay if not, I'm just wondering.

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

[Leo Famulari]

On Thu, Dec 15, 2016 at 07:14:15PM +0000, ng0 wrote:
> * gnu/packages/messaging.scm (utox): Update to 0.11.0.
> [source]: Update source uri.
> [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.

Overall LGTM, but can you give some more information about the changed
source location?

> -     (uri (string-append "https://github.com/GrayHatter/uTox/archive/v"
> +     (uri (string-append "https://github.com/uTox/uTox/archive/v"
>                           version ".tar.gz"))

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

[ng0]

Leo Famulari <leo@famulari.name> writes:

> On Thu, Dec 15, 2016 at 07:14:14PM +0000, ng0 wrote:
>> * gnu/packages/messaging.scm (c-toxcore): New variable.
>
>> +    (version "0.1.0")
>
> I see a new release:
>
> https://github.com/TokTok/c-toxcore/tree/v0.1.1

They release very quickly. I can only update this on monday if
I'm lucky, possibly later. It's okay if we add the 0.1.0 and
update afterwards I think.

>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append "https://github.com/TokTok/c-toxcore/archive/v"
>> +                           version ".tar.gz"))
>
> Is this the canonical source of c-toxcore? What is its relationship to
> <https://github.com/irungentoo/toxcore>?

Yes, see toktok.github.io or what it was. c-toxcore seems to be
where every client is moving to, why how and what reasons there
are that it came to be, I'm not really interested in. There's
just a pull request to change to c-toxcore for every client, but
not all of them yet I think. So we need both at the moment.

>> +    (arguments
>> +     `(#:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'unpack 'autoconf
>> +           (lambda _
>> +             (zero? (system* "autoreconf" "-vfi")))))
>
> Is there no bootstrapped tarball? Okay if not, I'm just wondering.

Sadly no.

-- 
♥Ⓐ  ng0  | PGP keys and more: https://n0is.noblogs.org/
         |                    http://ng0.chaosnet.org

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

[ng0]

Leo Famulari <leo@famulari.name> writes:

> On Thu, Dec 15, 2016 at 07:14:15PM +0000, ng0 wrote:
>> * gnu/packages/messaging.scm (utox): Update to 0.11.0.
>> [source]: Update source uri.
>> [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.
>
> Overall LGTM, but can you give some more information about the changed
> source location?

GrayHatter moved uTox to its own organization I assume? What
exactly do you mean by giving more information? I don't really
use github and therefore I can not ask people, just guess. And
the more up to date code is in the uTox namespace where the
previous developer/namespace, GrayHatter commits to aswell.

>> -     (uri (string-append "https://github.com/GrayHatter/uTox/archive/v"
>> +     (uri (string-append "https://github.com/uTox/uTox/archive/v"
>>                           version ".tar.gz"))
>

-- 
♥Ⓐ  ng0  | PGP keys and more: https://n0is.noblogs.org/
         |                    http://ng0.chaosnet.org