[bug#49737] [PATCH] Update nheko

[bug#49737] [PATCH] Update nheko

[Nicholas von Klitzing]

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

Hello,

Attached is a patch to update nheko, update 2 nheko dependencies, and add VoIP support to nheko.

Please be aware this is my first time using guile and submitting a guix patch. Feedback would be appreciated.

Kind regards,
Nicholas

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-Updated-lmdb-and-switched-to-maintained-fork.patch --]
[-- Type: text/x-patch; filename="0001-Updated-lmdb-and-switched-to-maintained-fork.patch"; name="0001-Updated-lmdb-and-switched-to-maintained-fork.patch", Size: 5272 bytes --]

From 78239d946903eacf20a90183438c28590a6c37b2 Mon Sep 17 00:00:00 2001
From: Nicholas von Klitzing <nicholas@nvk.pm>
Date: Sun, 25 Jul 2021 23:12:28 +0200
Subject: [PATCH] Updated lmdb++ and switched to maintained fork Updated nheko
 Added gstreamer dependencies to nheko build to enable VoIP support

---
 gnu/packages/databases.scm |  6 +++---
 gnu/packages/messaging.scm | 43 ++++++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7de85d10c1..e266c0706c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2488,16 +2488,16 @@ virtual address space — not physical RAM.")
 (define-public lmdbxx
   (package
     (name "lmdbxx")
-    (version "0.9.14.0")
+    (version "1.0.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/drycpp/lmdbxx")
+             (url "https://github.com/hoytech/lmdbxx")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"))))
+        (base32 "12k5rz74d1l0skcks9apry1svkl96g9lf5dcgylgjmh7v1jm0b7c"))))
     (arguments
      `(#:make-flags
        (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e5ecdb8894..4ff5e51f5b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2300,7 +2300,7 @@ QMatrixClient project.")
 (define-public mtxclient
   (package
     (name "mtxclient")
-    (version "0.3.1")
+    (version "0.5.1")
     (source
      (origin
        (method git-fetch)
@@ -2309,7 +2309,7 @@ QMatrixClient project.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x"))))
+        (base32 "1xznfx2bhw0ahwmkxm0rs05vz05ijk5k4190rj6qp3bvb9byiajh"))))
     (arguments
      `(#:configure-flags
        (list
@@ -2350,7 +2350,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
 (define-public nheko
   (package
     (name "nheko")
-    (version "0.7.2")
+    (version "0.8.2")
     (source
      (origin
        (method git-fetch)
@@ -2359,13 +2359,22 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s"))))
+        (base32 "0362hkbprc6jqlgmvzwxyvify4b1ldjakyqdz55m25xsypbpv2f3"))))
     (arguments
      `(#:tests? #f                      ;no test target
        #:configure-flags
        (list
         "-DCMAKE_BUILD_TYPE=Release"
-        "-DCMAKE_CXX_FLAGS=-fpermissive")
+        "-DCMAKE_CXX_FLAGS=-fpermissive"
+        "-DCOMPILE_QML=ON")
+       #:imported-modules
+       (,@%qt-build-system-modules
+        (guix build glib-or-gtk-build-system))
+       #:modules
+       ((guix build qt-build-system)
+        ((guix build glib-or-gtk-build-system)
+         #:prefix glib-or-gtk:)
+        (guix build utils))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'remove-Werror
@@ -2377,10 +2386,26 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
            (lambda _
              ;; Make Qt deterministic.
              (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
-             #t)))))
+             #t))
+         (add-after 'install 'wrap-env
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (for-each
+                (lambda (name)
+                  (let ((file (string-append out "/bin/" name))
+                        (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                    (wrap-program file
+                      `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))
+                '("nheko")))
+             #t))
+         (add-after 'wrap-env 'glib-or-gtk-compile-schemas
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+         (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (build-system qt-build-system)
     (inputs
      `(("boost" ,boost)
+       ("bash-minimal" ,bash-minimal)
        ("cmark" ,cmark)
        ("json-modern-cxx" ,json-modern-cxx)
        ("libolm" ,libolm)
@@ -2393,9 +2418,15 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtkeychain" ,qtkeychain)
        ("qtsvg" ,qtsvg)
        ("spdlog" ,spdlog)
        ("tweeny" ,tweeny)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gst-plugins-bad" ,gst-plugins-bad)
+       ("gst-plugins-good" ,gst-plugins-good)
+       ("libnice" ,libnice)
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.32.0


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

[bug#49737] [PATCH] Update nheko

[Nicolò Balzarotti]

Nicholas von Klitzing <nicholas@nvk.pm> writes:

> Hello,
>

Hi,
> Attached is a patch to update nheko, update 2 nheko dependencies, and add VoIP support to nheko.
>

Have you taken a look at other patches available on the mailing list?

For example there are bug#46012 and bug#48822 to name a few.  It
would be wonderful if somebody could review & merge bug#46012 (which
IIRC it's the best one).  Could you compare yours with it and report
back on the other issue?

Thanks,
Nicolò

[bug#49737] [PATCH] Update nheko

[Nicholas von Klitzing]

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

Hi Nicolò,

Thanks for informing me of those patches. I had not checked the GNU Bug Tracker.

The patch in bug#46012 looks good to me. It covers everything and more I wanted to address in my patch. 


I unfortunately do not have the guix experience to be of much help for the issue relating to the exact specifics how it should be packaged.

What is currently blocking the merge?

Best,
Nicholas
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

On Monday, July 26th, 2021 at 12:56 AM, Nicolò Balzarotti <anothersms@gmail.com> wrote:

> Nicholas von Klitzing nicholas@nvk.pm writes:
> 

> > Hello,
> 

> Hi,
> 

> > Attached is a patch to update nheko, update 2 nheko dependencies, and add VoIP support to nheko.
> 

> Have you taken a look at other patches available on the mailing list?
> 

> For example there are bug#46012 and bug#48822 to name a few. It
> 

> would be wonderful if somebody could review & merge bug#46012 (which
> 

> IIRC it's the best one). Could you compare yours with it and report
> 

> back on the other issue?
> 

> Thanks,
> 

> Nicolò

[-- Attachment #1.2: publickey - nicholas@nvk.pm - 0xE46F87BA.asc --]
[-- Type: application/pgp-keys, Size: 717 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

[bug#49737] [PATCH] Update nheko

[Nicolò Balzarotti]

Nicholas von Klitzing <nicholas@nvk.pm> writes:

> Hi Nicolò,
>
Hi

> Thanks for informing me of those patches. I had not checked the GNU Bug Tracker.
>
> The patch in bug#46012 looks good to me. It covers everything and more I wanted to address in my patch. 
>
>
> I unfortunately do not have the guix experience to be of much help for the issue relating to the exact specifics how it should be packaged.
>
> What is currently blocking the merge?
>

I think we just need somebody who has the time to review it, unless
there's something blocking it which I'm not aware of.

Thanks, Nicolò

> Best,
> Nicholas
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On Monday, July 26th, 2021 at 12:56 AM, Nicolò Balzarotti <anothersms@gmail.com> wrote:
>
>> Nicholas von Klitzing nicholas@nvk.pm writes:
>> 
>
>> > Hello,
>> 
>
>> Hi,
>> 
>
>> > Attached is a patch to update nheko, update 2 nheko dependencies, and add VoIP support to nheko.
>> 
>
>> Have you taken a look at other patches available on the mailing list?
>> 
>
>> For example there are bug#46012 and bug#48822 to name a few. It
>> 
>
>> would be wonderful if somebody could review & merge bug#46012 (which
>> 
>
>> IIRC it's the best one). Could you compare yours with it and report
>> 
>
>> back on the other issue?
>> 
>
>> Thanks,
>> 
>
>> Nicolò

[bug#49737] [PATCH] Update nheko

[Nicholas von Klitzing]

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

Do you have any estimates for when this patch will be reviewed?

The last update to bug#46012 was over 3 months ago.

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

On Thursday, July 29th, 2021 at 3:31 PM, Nicolò Balzarotti <anothersms@gmail.com> wrote:

> Nicholas von Klitzing nicholas@nvk.pm writes:
> 

> > Hi Nicolò,
> 

> Hi
> 

> > Thanks for informing me of those patches. I had not checked the GNU Bug Tracker.
> > 

> > The patch in bug#46012 looks good to me. It covers everything and more I wanted to address in my patch.
> > 

> > I unfortunately do not have the guix experience to be of much help for the issue relating to the exact specifics how it should be packaged.
> > 

> > What is currently blocking the merge?
> 

> I think we just need somebody who has the time to review it, unless
> 

> there's something blocking it which I'm not aware of.
> 

> Thanks, Nicolò
> 

> > Best,
> > 

> > Nicholas
> > 

> > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> > 

> > On Monday, July 26th, 2021 at 12:56 AM, Nicolò Balzarotti anothersms@gmail.com wrote:
> > 

> > > Nicholas von Klitzing nicholas@nvk.pm writes:
> > 

> > > > Hello,
> > 

> > > Hi,
> > 

> > > > Attached is a patch to update nheko, update 2 nheko dependencies, and add VoIP support to nheko.
> > 

> > > Have you taken a look at other patches available on the mailing list?
> > 

> > > For example there are bug#46012 and bug#48822 to name a few. It
> > 

> > > would be wonderful if somebody could review & merge bug#46012 (which
> > 

> > > IIRC it's the best one). Could you compare yours with it and report
> > 

> > > back on the other issue?
> > 

> > > Thanks,
> > 

> > > Nicolò

[-- Attachment #1.2: publickey - nicholas@nvk.pm - 0xE46F87BA.asc --]
[-- Type: application/pgp-keys, Size: 717 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

[bug#49737] [PATCH] Update nheko

[Nicolò Balzarotti]

Nicholas von Klitzing <nicholas@nvk.pm> writes:

> Do you have any estimates for when this patch will be reviewed?
>
> The last update to bug#46012 was over 3 months ago.
>
You could try reply to that bug, or maybe ask on IRC hoping that someone
is willed to review it and eventually merge :)

Nicolò

> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On Thursday, July 29th, 2021 at 3:31 PM, Nicolò Balzarotti <anothersms@gmail.com> wrote:
>
>> Nicholas von Klitzing nicholas@nvk.pm writes:
>> 
>
>> > Hi Nicolò,
>> 
>
>> Hi
>> 
>
>> > Thanks for informing me of those patches. I had not checked the GNU Bug Tracker.
>> > 
>
>> > The patch in bug#46012 looks good to me. It covers everything and more I wanted to address in my patch.
>> > 
>
>> > I unfortunately do not have the guix experience to be of much help for the issue relating to the exact specifics how it should be packaged.
>> > 
>
>> > What is currently blocking the merge?
>> 
>
>> I think we just need somebody who has the time to review it, unless
>> 
>
>> there's something blocking it which I'm not aware of.
>> 
>
>> Thanks, Nicolò
>> 
>
>> > Best,
>> > 
>
>> > Nicholas
>> > 
>
>> > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>> > 
>
>> > On Monday, July 26th, 2021 at 12:56 AM, Nicolò Balzarotti anothersms@gmail.com wrote:
>> > 
>
>> > > Nicholas von Klitzing nicholas@nvk.pm writes:
>> > 
>
>> > > > Hello,
>> > 
>
>> > > Hi,
>> > 
>
>> > > > Attached is a patch to update nheko, update 2 nheko dependencies, and add VoIP support to nheko.
>> > 
>
>> > > Have you taken a look at other patches available on the mailing list?
>> > 
>
>> > > For example there are bug#46012 and bug#48822 to name a few. It
>> > 
>
>> > > would be wonderful if somebody could review & merge bug#46012 (which
>> > 
>
>> > > IIRC it's the best one). Could you compare yours with it and report
>> > 
>
>> > > back on the other issue?
>> > 
>
>> > > Thanks,
>> > 
>
>> > > Nicolò

bug#49737: [PATCH] Update nheko

[Michael Rohleder]

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

I think this can be closed as we have merged #46012 (and several
versions of nheko after that).

-- 
If builders built buildings the way programmers wrote programs,
then the first woodpecker to come along would destroy civilization.

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