GNU bug report logs - #77770
[PATCH 0/2] Update Dino to 0.5.0

Previous Next

To reply to this bug, email your comments to 77770 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Update Dino to 0.5.0
Date: Sat, 12 Apr 2025 21:19:02 +0200

Hi folks,

this is a small little update to get the latest Dino version.

Cheers

Liliana Marie Prikler (2):
  gnu: Add libomemo-c.
  gnu: dino: Update to 0.5.0.

 gnu/packages/messaging.scm | 55 +++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 25 deletions(-)


base-commit: 1d3dbe81bfb74fea10ad5fd16716e9b3c1b66a8e
-- 
2.49.0

Message #8 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 77770 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add libomemo-c.
Date: Sat, 12 Apr 2025 21:17:39 +0200

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

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 26db072b4a..e98eef89f1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -586,6 +586,30 @@ (define-public libsignal-protocol-c
 end-to-end encryption.")
    (license license:gpl3+)))
 
+(define-public libomemo-c
+  (package
+    (inherit libsignal-protocol-c)
+    (name "libomemo-c")
+    (version "0.5.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/dino/libomemo-c")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "1xszd4cjrlwwsy19ri2ymqr676qpqqhxv3cw5zwch3lms68p51hy"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(for-each delete-file
+                           (find-files "." "\\.pb-c\\.[ch]$")))))
+    (build-system meson-build-system)
+    (arguments (list #:configure-flags #~(list "-Dtests=true")))
+    (propagated-inputs (list protobuf-c))
+    (home-page "https://github.com/dino/libomemo-c")
+    (description "This package provides a fork of libsignal-protocol-c, used
+by dino to provide OMEMO support.")))
+
 (define-public axc
   (package
     (name "axc")
-- 
2.49.0

Message #11 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 77770 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: dino: Update to 0.5.0.
Date: Sat, 12 Apr 2025 20:46:13 +0200

* gnu/packages/messaging.scm (dino): Update to 0.5.0.
[build-system]: Use meson-build-system.
[arguments]: Drop configure-flags, parallel-build, modules,
and imported-modules.
<#:glib-or-gtk?>: Set to #t.
<#:phases>: Adjust accordingly.
[inputs]: Replace libsignal-protocol-c with libomemo-c.
---
 gnu/packages/messaging.scm | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e98eef89f1..75d01e7299 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1406,7 +1406,7 @@ (define-public gajim-openpgp
 (define-public dino
   (package
     (name "dino")
-    (version "0.4.5")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
@@ -1414,24 +1414,13 @@ (define-public dino
         (string-append "https://github.com/dino/dino/releases/download/v"
                        version "/dino-" version ".tar.gz"))
        (sha256
-        (base32 "129v048k3fp0xwwm6fr5h9nn82zg8bp66z3dy0jsqqd3wdxsxqw1"))))
-    (build-system cmake-build-system)
+        (base32 "1hghyldh95i6sx778nkbmfn5qbi2h7qpv59vzi7zz9anmxgjckli"))))
+    (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
-     (list #:configure-flags #~(list "-DBUILD_TESTS=true" "-DUSE_SOUP3=true")
-           #: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))
-           #:imported-modules `(,@%default-gnu-imported-modules
-                                (guix build cmake-build-system)
-                                (guix build glib-or-gtk-build-system))
+     (list #:glib-or-gtk? #t
            #:phases
            #~(modify-phases %standard-phases
-               ;; For A/V support.
-               (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
-                 (assoc-ref glib-or-gtk:%standard-phases
-                            'generate-gdk-pixbuf-loaders-cache-file))
                (add-after 'install 'wrap
                  (lambda* (#:key outputs #:allow-other-keys)
                    (let* ((out (assoc-ref outputs "out"))
@@ -1440,15 +1429,7 @@ (define-public dino
                      (wrap-program dino
                        `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
                        `("GDK_PIXBUF_MODULE_FILE" =
-                         (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))
-               (add-after 'install 'glib-or-gtk-wrap
-                 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (when tests?
-                     (invoke "./libdino-test")
-                     (invoke "./signal-protocol-vala-test")
-                     (invoke "./xmpp-vala-test")))))))
+                         (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")
@@ -1477,7 +1458,7 @@ (define-public dino
            libgcrypt
            libgee
            libnice
-           libsignal-protocol-c
+           libomemo-c
            libsoup
            libsrtp                      ;for calls support
            pango                        ;gtk4 wants pango 1.50+
-- 
2.49.0

Message #14 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 77770 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu
Subject: Re: [bug#77770] [PATCH 1/2] gnu: Add libomemo-c.
Date: Mon, 14 Apr 2025 09:46:27 +0900

Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/messaging.scm (libomemo-c): New variable.
> ---
>  gnu/packages/messaging.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 26db072b4a..e98eef89f1 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -586,6 +586,30 @@ (define-public libsignal-protocol-c
>  end-to-end encryption.")
>     (license license:gpl3+)))
>  
> +(define-public libomemo-c
> +  (package
> +    (inherit libsignal-protocol-c)
> +    (name "libomemo-c")
> +    (version "0.5.1")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/dino/libomemo-c")
> +                    (commit (string-append "v" version))))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32 "1xszd4cjrlwwsy19ri2ymqr676qpqqhxv3cw5zwch3lms68p51hy"))
> +              (modules '((guix build utils)))
> +              (snippet
> +               #~(for-each delete-file
> +                           (find-files "." "\\.pb-c\\.[ch]$")))))
> +    (build-system meson-build-system)
> +    (arguments (list #:configure-flags #~(list "-Dtests=true")))
> +    (propagated-inputs (list protobuf-c))
> +    (home-page "https://github.com/dino/libomemo-c")
> +    (description "This package provides a fork of libsignal-protocol-c, used
> +by dino to provide OMEMO support.")))

nitpick: s/dino/Dino/, or 'by the @command{dino} command'.

-- 
Thanks,
Maxim

Message #17 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 77770 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu
Subject: Re: [bug#77770] [PATCH 2/2] gnu: dino: Update to 0.5.0.
Date: Mon, 14 Apr 2025 09:47:00 +0900

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/messaging.scm (dino): Update to 0.5.0.
> [build-system]: Use meson-build-system.
> [arguments]: Drop configure-flags, parallel-build, modules,
> and imported-modules.
> <#:glib-or-gtk?>: Set to #t.
> <#:phases>: Adjust accordingly.
> [inputs]: Replace libsignal-protocol-c with libomemo-c.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

-- 
Thanks,
Maxim

Message #20 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Frank Pursel <frank.pursel <at> gmail.com>
To: 77770 <at> debbugs.gnu.org
Subject: Re: [bug#77770] [PATCH 2/2] gnu: dino: Update to 0.5.0.
Date: Tue, 15 Apr 2025 06:47:23 -0700

[Message part 1 (text/plain, inline)]

Thank you Liliana for the patches to dino.  I've installed them in a
recent version of guix without issues, built the package and installed
it on my x86_64 guix system and been successfully communicating on it
for the past 24 hours.  Though not a thorough code review, it's a data
point.

The only weirdness I noted was that the 'about dino' window lists the
dino version as undefined.  I suspect that this is an upstream issue and
has nothing to do with the guix packaging.  So, looks good to me.

Regards,
Frank Pursel

Message #23 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 77770 <at> debbugs.gnu.org
Cc: vivien <at> planete-kraus.eu, Frank Pursel <frank.pursel <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH v2 1/2] gnu: Add libomemo-c.
Date: Sat, 12 Apr 2025 21:17:39 +0200

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

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d127b90..6f9cca2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -586,6 +586,30 @@ (define-public libsignal-protocol-c
 end-to-end encryption.")
    (license license:gpl3+)))
 
+(define-public libomemo-c
+  (package
+    (inherit libsignal-protocol-c)
+    (name "libomemo-c")
+    (version "0.5.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/dino/libomemo-c")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "1xszd4cjrlwwsy19ri2ymqr676qpqqhxv3cw5zwch3lms68p51hy"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(for-each delete-file
+                           (find-files "." "\\.pb-c\\.[ch]$")))))
+    (build-system meson-build-system)
+    (arguments (list #:configure-flags #~(list "-Dtests=true")))
+    (propagated-inputs (list protobuf-c))
+    (home-page "https://github.com/dino/libomemo-c")
+    (description "This package provides a fork of libsignal-protocol-c, used
+by Dino to provide OMEMO support.")))
+
 (define-public axc
   (package
     (name "axc")
--
libgit2 1.5.2

Message #26 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 77770 <at> debbugs.gnu.org
Cc: vivien <at> planete-kraus.eu, Frank Pursel <frank.pursel <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH v2 2/2] gnu: dino: Update to 0.5.0.
Date: Sat, 12 Apr 2025 20:46:13 +0200

* gnu/packages/messaging.scm (dino): Update to 0.5.0.
[build-system]: Use meson-build-system.
[arguments]: Drop configure-flags, parallel-build, modules,
and imported-modules.
<#:glib-or-gtk?>: Set to #t.
<#:phases>: Adjust accordingly.  Add ‘hardcode-version’.
[inputs]: Replace libsignal-protocol-c with libomemo-c.
---
 gnu/packages/messaging.scm | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 6f9cca2..c27ca1d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1407,55 +1407,43 @@ (define-public gajim-openpgp
 (define-public dino
   (package
     (name "dino")
-    (version "0.4.5")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "https://github.com/dino/dino/releases/download/v"
                        version "/dino-" version ".tar.gz"))
        (sha256
-        (base32 "129v048k3fp0xwwm6fr5h9nn82zg8bp66z3dy0jsqqd3wdxsxqw1"))))
-    (build-system cmake-build-system)
+        (base32 "1hghyldh95i6sx778nkbmfn5qbi2h7qpv59vzi7zz9anmxgjckli"))))
+    (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
-     (list #:configure-flags #~(list "-DBUILD_TESTS=true" "-DUSE_SOUP3=true")
-           #: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))
-           #:imported-modules `(,@%default-gnu-imported-modules
-                                (guix build cmake-build-system)
-                                (guix build glib-or-gtk-build-system))
+     (list #:glib-or-gtk? #t
            #:phases
            #~(modify-phases %standard-phases
-               ;; For A/V support.
-               (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
-                 (assoc-ref glib-or-gtk:%standard-phases
-                            'generate-gdk-pixbuf-loaders-cache-file))
+               (add-after 'unpack 'hardcode-version
+                 (lambda _
+                   ;; XXX: the meson.build code to locate the version script
+                   ;; is wrong and raises an error.
+                   (substitute* "libdino/src/version.vala.in"
+                     (("%VERSION%") #$version))))
                (add-after 'install 'wrap
                  (lambda* (#:key outputs #:allow-other-keys)
                    (let* ((out (assoc-ref outputs "out"))
                           (dino (string-append out "/bin/dino"))
                           (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
                      (wrap-program dino
                        `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
                        `("GDK_PIXBUF_MODULE_FILE" =
-                         (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))
-               (add-after 'install 'glib-or-gtk-wrap
-                 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (when tests?
-                     (invoke "./libdino-test")
-                     (invoke "./signal-protocol-vala-test")
-                     (invoke "./xmpp-vala-test")))))))
+                         (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")
            gobject-introspection
            `(,gtk "bin")
            pkg-config
+           ;; python                       ; for version.py
            vala))
     (inputs
      (list adwaita-icon-theme
@@ -1478,7 +1466,7 @@ (define-public dino
            libgcrypt
            libgee
            libnice
-           libsignal-protocol-c
+           libomemo-c
            libsoup
            libsrtp                      ;for calls support
            pango                        ;gtk4 wants pango 1.50+
--
libgit2 1.5.2

Message #29 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Frank Pursel <frank.pursel <at> gmail.com>
To: 77770 <at> debbugs.gnu.org
Subject: Re: [bug#77770] New patch set build
Date: Wed, 16 Apr 2025 08:06:11 -0700

Liliana:

Using the newer patch set I again built dino v0.5.0.  the version label
issue that I reported earlier is resolved.  So, it was not upstream...

Seems to be working as expected.

Thanks,
Frank Pursel

Message #32 received at 77770 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: vivien <at> planete-kraus.eu, 77770 <at> debbugs.gnu.org,
 Frank Pursel <frank.pursel <at> gmail.com>
Subject: Re: [PATCH v2 1/2] gnu: Add libomemo-c.
Date: Sun, 20 Apr 2025 22:06:10 +0900

Hi Liliana,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/messaging.scm (libomemo-c): New variable.
> ---
>  gnu/packages/messaging.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index d127b90..6f9cca2 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -586,6 +586,30 @@ (define-public libsignal-protocol-c
>  end-to-end encryption.")
>     (license license:gpl3+)))
>  
> +(define-public libomemo-c
> +  (package
> +    (inherit libsignal-protocol-c)
> +    (name "libomemo-c")
> +    (version "0.5.1")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/dino/libomemo-c")
> +                    (commit (string-append "v" version))))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32 "1xszd4cjrlwwsy19ri2ymqr676qpqqhxv3cw5zwch3lms68p51hy"))
> +              (modules '((guix build utils)))
> +              (snippet

I always like a comment to explain why we prune the source.

> +               #~(for-each delete-file
> +                           (find-files "." "\\.pb-c\\.[ch]$")))))
> +    (build-system meson-build-system)
> +    (arguments (list #:configure-flags #~(list "-Dtests=true")))
> +    (propagated-inputs (list protobuf-c))
> +    (home-page "https://github.com/dino/libomemo-c")
> +    (description "This package provides a fork of libsignal-protocol-c, used
> +by Dino to provide OMEMO support.")))

Otherwise LGTM.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail>

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.