GNU bug report logs - #72205
[PATCH 0/4] Update nheko

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72205 in the body.
You can then email your comments to 72205 AT debbugs.gnu.org in the normal way.

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

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 0/4] Update nheko
Date: Sat, 20 Jul 2024 08:49:31 +0200

These patches update nheko to latest version, after adding a new input
package kdsingleapplication and updating mtxclient. Thanks!

Timotej Lazar (4):
  gnu: Add kdsingleapplication.
  gnu: mtxclient: Update to 0.10.0.
  gnu: mtxclient: Switch to new package style.
  gnu: nheko: Update to 0.12.0.

 gnu/packages/messaging.scm | 88 ++++++++++++++++----------------------
 gnu/packages/qt.scm        | 26 +++++++++++
 2 files changed, 62 insertions(+), 52 deletions(-)


base-commit: 4fd833241d36325dda2ef2c3068087f4096b4d8a
-- 
2.45.2

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72205 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 1/4] gnu: Add kdsingleapplication.
Date: Sat, 20 Jul 2024 08:57:25 +0200

* gnu/packages/qt.scm (kdsingleapplication): New variable.

Change-Id: I08407da35712d465f9573f6bf1de0cc2e8435cb1
---
 gnu/packages/qt.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0138fd3dbf..c150dca78b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5214,6 +5214,32 @@ (define-public libdbusmenu-qt
 and import their menus over DBus.")
     (license license:lgpl2.1+)))
 
+(define-public kdsingleapplication
+  (package
+    (name "kdsingleapplication")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/KDAB/KDSingleApplication")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1w7wg9w4mifrkpn7hhw1nnnwh1vhnf8i4wgfxvh44nacwslbwsb2"))))
+    (build-system qt-build-system)
+    (arguments
+     (list
+      #:qtbase qtbase
+      #:configure-flags
+      #~(list "-DKDSingleApplication_QT6=true" "-DKDSingleApplication_TESTS=true")))
+    (inputs (list libxkbcommon vulkan-headers))
+    (home-page "https://github.com/KDAB/KDSingleApplication")
+    (synopsis "Qt helper class for single-instance policy applications")
+    (description "KD SingleApplication is a helper class for single-instance
+policy applications.")
+    (license (list license:bsd-3 license:expat))))
+
 (define-public kdsoap
   (package
     (name "kdsoap")
-- 
2.45.2

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72205 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 2/4] gnu: mtxclient: Update to 0.10.0.
Date: Sat, 20 Jul 2024 08:57:26 +0200

* gnu/packages/messaging.scm (mtxclient): Update to 0.10.0.

Change-Id: I095e805803b02f5e22ab2a8b764f856a072d7df4
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c097c16a97..4f065d4316 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2421,7 +2421,7 @@ (define-public libqmatrixclient
 (define-public mtxclient
   (package
     (name "mtxclient")
-    (version "0.9.1")
+    (version "0.10.0")
     (source
      (origin
        (method git-fetch)
@@ -2430,7 +2430,7 @@ (define-public mtxclient
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0m8agc3c4n03r92nz3gxkpxmj2c3ncf125nmfdv0jf24gxib126z"))))
+        (base32 "10iidyxjk3w6cljw2r62i5azx84nw3p8hw97d8vy7r5gh1nrrrcn"))))
     (arguments
      `(#:configure-flags
        (list
-- 
2.45.2

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72205 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 3/4] gnu: mtxclient: Switch to new package style.
Date: Sat, 20 Jul 2024 08:57:27 +0200

* gnu/packages/matrix.scm (mtxclient)[arguments]: Use g-exps.

Change-Id: I044faf4e25b9e5d282e9364070a7e24bb6f89b5e
---
 gnu/packages/messaging.scm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4f065d4316..076861d963 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2431,19 +2431,18 @@ (define-public mtxclient
        (file-name (git-file-name name version))
        (sha256
         (base32 "10iidyxjk3w6cljw2r62i5azx84nw3p8hw97d8vy7r5gh1nrrrcn"))))
-    (arguments
-     `(#:configure-flags
-       (list
-        ;; Disable example binaries (not installed)
-        "-DBUILD_LIB_EXAMPLES=OFF")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'disable-network-tests
-           (lambda _
-             (substitute* "CMakeLists.txt"
-               (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)")
-                "# add_test")))))))
     (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list  "-DBUILD_LIB_EXAMPLES=OFF") ; disable example binaries (not installed)
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'disable-network-tests
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)")
+                 "# add_test")))))))
     (inputs
      (list boost
            coeurl
-- 
2.45.2

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72205 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 4/4] gnu: nheko: Update to 0.12.0.
Date: Sat, 20 Jul 2024 08:57:28 +0200

* gnu/packages/messaging.scm (nheko): Update to 0.12.0.
[arguments]: Switch to Qt 6. Use configure flags to disable bundled libraries.
[inputs]: Add brotli, kdsingleapplication, libxkbcommon, vulkan-headers, and
vulkan-loader. Drop boost, xcb-util-wm, qtbase-5, qtquickcontrols2-5, and
single-application-qt5. Use version 6 for remaining Qt inputs.
[native-inputs]: Replace qttools-5 with qttools.

Change-Id: Id7f1ee119ce3ff5bad130b7d13b6c98ed382b928
---
 gnu/packages/messaging.scm | 61 ++++++++++++++------------------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 076861d963..083a86ed8b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -142,6 +142,7 @@ (define-module (gnu packages messaging)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages vulkan)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)
@@ -2466,7 +2467,7 @@ (define-public mtxclient
 (define-public nheko
   (package
     (name "nheko")
-    (version "0.11.3")
+    (version "0.12.0")
     (source
      (origin
        (method git-fetch)
@@ -2475,41 +2476,25 @@ (define-public nheko
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0yjbxyba87nkpjmql7s6nv2r2i9s956zgwlfhdi4jjg96v2rgmnr"))
+        (base32 "113ids1k2pjmvs9cgh025vkpg5mipw295dlkx7n3ydi0r8mzw1l5"))
        (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (delete-file-recursively "third_party")))))
+       (snippet '(delete-file-recursively "third_party"))))
     (arguments
      (list
       #:tests? #f                       ;no test target
+      #:qtbase qtbase
       #:configure-flags
       #~(list "-DCMAKE_BUILD_TYPE=Release"
               ;; Fix required because we are using a static SingleApplication
               "-DCMAKE_CXX_FLAGS= \"-DQAPPLICATION_CLASS=QApplication\" "
               ;; Compile Qml will make Nheko faster, but you will need to recompile
               ;; it, when you update Qt.  That's fine for us.
-              "-DCOMPILE_QML=ON")
+              "-DCOMPILE_QML=ON"
+              ;; Use system libraries.
+              "-DUSE_BUNDLED_BLURHASH=OFF"
+              "-DUSE_BUNDLED_CPPHTTPLIB=OFF")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'unbundle-dependencies
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((libSingleApplication.a
-                     (search-input-file inputs "lib/libSingleApplication.a"))
-                    (httplib.h (search-input-file inputs "include/httplib.h")))
-                (substitute* "CMakeLists.txt"
-                  ;; Remove include and source dirs,replace with the correct one
-                  (("third_party/blurhash/blurhash\\.[ch]pp") "")
-                  (("third_party/cpp-httplib-0\\.5\\.12")
-                   (dirname httplib.h))
-                  (("add_subdirectory.*third_party/SingleApplication.*") "")
-                  ;; Link using the correct static/shared libs
-                  (("SingleApplication::SingleApplication")
-                   (string-append
-                    ;; Dynamic libraries
-                    "httplib" "\n" "blurhash" "\n"
-                    ;; Static library
-                    libSingleApplication.a))))))
           (add-after 'unpack 'fix-determinism
             (lambda _
               ;; Make Qt deterministic.
@@ -2521,37 +2506,37 @@ (define-public nheko
                   `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
     (build-system qt-build-system)
     (inputs
-     (list boost
-           blurhash
-           cpp-httplib
+     (list blurhash
+           brotli
            cmark
            coeurl
+           cpp-httplib
            curl
            gst-plugins-base
            gst-plugins-bad              ; sdp & webrtc for voip
            gst-plugins-good-qt          ; rtpmanager for voip
-           nlohmann-json
+           kdsingleapplication
            libevent
            libnice                      ; for voip
-           olm
+           libxkbcommon
            lmdb
            lmdbxx
            mtxclient
+           nlohmann-json
+           olm
            openssl
-           qtbase-5
-           qtdeclarative-5
-           qtkeychain
+           qtdeclarative
            qtgraphicaleffects
-           qtmultimedia-5
-           qtquickcontrols2-5
-           qtsvg-5
+           qtkeychain-qt6
+           qtmultimedia
+           qtsvg
            re2
            spdlog
-           single-application-qt5
-           xcb-util-wm
+           vulkan-headers
+           vulkan-loader
            zlib))
     (native-inputs
-     (list asciidoc pkg-config qttools-5))
+     (list asciidoc pkg-config qttools))
     (home-page "https://github.com/Nheko-Reborn/nheko")
     (synopsis "Desktop client for Matrix using Qt and C++14")
     (description "@code{Nheko} want to provide a native desktop app for the
-- 
2.45.2

Message #22 received at 72205-done <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 72205-done <at> debbugs.gnu.org
Subject: Re: [bug#72205] [PATCH 0/4] Update nheko
Date: Thu, 25 Jul 2024 13:15:34 +0800

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

Timotej Lazar <timotej.lazar <at> araneo.si> writes:

> These patches update nheko to latest version, after adding a new input
> package kdsingleapplication and updating mtxclient. Thanks!
>
> Timotej Lazar (4):
>   gnu: Add kdsingleapplication.
>   gnu: mtxclient: Update to 0.10.0.
>   gnu: mtxclient: Switch to new package style.
>   gnu: nheko: Update to 0.12.0.
>
>  gnu/packages/messaging.scm | 88 ++++++++++++++++----------------------
>  gnu/packages/qt.scm        | 26 +++++++++++
>  2 files changed, 62 insertions(+), 52 deletions(-)
>
>
> base-commit: 4fd833241d36325dda2ef2c3068087f4096b4d8a

push, see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=e9f02e7e4b29a1e327cb437483fec0e8ecd74d60

[signature.asc (application/pgp-signature, inline)]

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 72205 <at> debbugs.gnu.org, 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#72205] [PATCH 1/4] gnu: Add kdsingleapplication.
Date: Wed, 31 Jul 2024 15:05:21 +0900

Hi,

(I got notified for this 1/4 patch due to touching qt.scm; I haven't
checked the rest of the series).

Timotej Lazar <timotej.lazar <at> araneo.si> writes:

> * gnu/packages/qt.scm (kdsingleapplication): New variable.
>
> Change-Id: I08407da35712d465f9573f6bf1de0cc2e8435cb1
> ---
>  gnu/packages/qt.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 0138fd3dbf..c150dca78b 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -5214,6 +5214,32 @@ (define-public libdbusmenu-qt
>  and import their menus over DBus.")
>      (license license:lgpl2.1+)))
>  
> +(define-public kdsingleapplication
> +  (package
> +    (name "kdsingleapplication")
> +    (version "1.1.0")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/KDAB/KDSingleApplication")
> +             (commit (string-append "v" version))))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32 "1w7wg9w4mifrkpn7hhw1nnnwh1vhnf8i4wgfxvh44nacwslbwsb2"))))
> +    (build-system qt-build-system)
> +    (arguments
> +     (list
> +      #:qtbase qtbase
> +      #:configure-flags
> +      #~(list "-DKDSingleApplication_QT6=true" "-DKDSingleApplication_TESTS=true")))

That's a nitpick, but my impression was that ON/OFF as boolean value for
CMake were more common (or YES/NO).

> +    (inputs (list libxkbcommon vulkan-headers))
> +    (home-page "https://github.com/KDAB/KDSingleApplication")
> +    (synopsis "Qt helper class for single-instance policy applications")
> +    (description "KD SingleApplication is a helper class for single-instance
> +policy applications.")
> +    (license (list license:bsd-3 license:expat))))

Is it dual licensed? Or which files/section of the source is covered by
which? A comment is needed.

-- 
Thanks,
Maxim

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 72205 <at> debbugs.gnu.org, 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#72205] [PATCH 1/4] gnu: Add kdsingleapplication.
Date: Wed, 31 Jul 2024 14:28:27 +0200

(Sending again to include the list.)

Thanks for the review! The patches have already been merged, but I’ll send another one fixing the issues you point out.

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> [2024-07-31 15:05:21+0900]:
> Timotej Lazar <timotej.lazar <at> araneo.si> writes:
>> +      #:configure-flags
>> +      #~(list "-DKDSingleApplication_QT6=true" "-DKDSingleApplication_TESTS=true")))
>
> That's a nitpick, but my impression was that ON/OFF as boolean value for
> CMake were more common (or YES/NO).

I went by the build instructions¹ but I’ll change it to be consistent with (most) other packages.

>> +    (license (list license:bsd-3 license:expat))))
>
> Is it dual licensed? Or which files/section of the source is covered by
> which? A comment is needed.

No, some build files are licensed differently. I meant to add a comment but forgot.

¹ https://github.com/KDAB/KDSingleApplication/blob/1.1/INSTALL.txt

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72205 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH] gnu: kdsingleapplication: Improve package.
Date: Wed, 31 Jul 2024 20:57:12 +0200

* gnu/packages/qt.scm (kdsingleapplication)[arguments]: Use ON instead of true
for cmake #:configure-flags.
[license]: Note files covered by each license.

Change-Id: Ia10b43e881e457bb80f0b773a3a64a40a1d8becb
---
 gnu/packages/qt.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c150dca78b..1b9935aa80 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5232,13 +5232,15 @@ (define-public kdsingleapplication
      (list
       #:qtbase qtbase
       #:configure-flags
-      #~(list "-DKDSingleApplication_QT6=true" "-DKDSingleApplication_TESTS=true")))
+      #~(list "-DKDSingleApplication_QT6=ON" "-DKDSingleApplication_TESTS=ON")))
     (inputs (list libxkbcommon vulkan-headers))
     (home-page "https://github.com/KDAB/KDSingleApplication")
     (synopsis "Qt helper class for single-instance policy applications")
     (description "KD SingleApplication is a helper class for single-instance
 policy applications.")
-    (license (list license:bsd-3 license:expat))))
+    (license
+     (list license:bsd-3 ; cmake/*
+           license:expat)))) ; everything else
 
 (define-public kdsoap
   (package

base-commit: 01d4363168ed10ea223047f7a7b83201f161ec0b
-- 
2.45.2

Previous Next

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