[PATCH 0/3] [staging] Update nheko

DoneSubmitted by Jonathan Brielmaier.
Details
2 participants
  • Jonathan Brielmaier
  • Marius Bakke
Owner
unassigned
Severity
normal
J
J
Jonathan Brielmaier wrote on 22 Apr 2020 19:56
(address . guix-patches@gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200422175643.7263-1-jonathan.brielmaier@web.de
Hi,

this patch series updates to nheko, a matrix client, to version 0.7.
It's a bit more involved as it requires a fix for qtdeclarative (Qml).
nheko requires now qmlcachegen which is assumed wrongly by a cmkae file
in qtbase, but is included in qtdeclarative.

I'm running the updated client locally and it works fine so far.

Jonathan Brielmaier (3):
gnu: qtdeclarative: Fix reference on qmlcachegen.
gnu: mtxclient: Update to 0.3.0.
gnu: nheko: Update to 0.7.0.

gnu/packages/messaging.scm | 15 +++++++++------
gnu/packages/qt.scm | 13 ++++++++++++-
2 files changed, 21 insertions(+), 7 deletions(-)

--
2.26.0
J
J
Jonathan Brielmaier wrote on 22 Apr 2020 21:54
[PATCH 1/3] gnu: qtdeclarative: Fix reference on qmlcachegen.
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200422195411.9961-1-jonathan.brielmaier@web.de
* gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the
reference on qmlcachegen in an installed cmake file.
---
gnu/packages/qt.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

Toggle diff (31 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6ca052c31a..f540da458e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2018 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -778,7 +779,17 @@ xmlpatternsvalidator.")))
                "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg)
-       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+       ((#:tests? _ #f) #f) ; TODO: Enable the tests
+       ((#:phases phases)
+        `(modify-phases ,phases
+          ;; The qt5core install prefix is set to qtbase, but qmlcachegen is
+          ;; provided by qtdeclarative
+          (add-after 'build 'fix-qt5core-install-prefix
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
+                              (("\\$\\{_qt5Core_install_prefix\\}") out )))
+               #t))))))
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)
--
2.26.0
J
J
Jonathan Brielmaier wrote on 22 Apr 2020 21:54
[PATCH 2/3] gnu: mtxclient: Update to 0.3.0.
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200422195411.9961-2-jonathan.brielmaier@web.de
* gnu/packages/messaging.scm (mtxclient): Update to 0.3.0.
[arguments]: Disable Pushrules test as it requires network.
---
gnu/packages/messaging.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (31 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index af3d4bb733..8a9478d01c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1794,7 +1794,7 @@ QMatrixClient project.")
 (define-public mtxclient
   (package
     (name "mtxclient")
-    (version "0.2.1")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
@@ -1803,7 +1803,7 @@ QMatrixClient project.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj"))))
+        (base32 "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"))))
     (arguments
      `(#:configure-flags
        (list
@@ -1814,7 +1814,7 @@ QMatrixClient project.")
          (add-before 'configure 'disable-network-tests
            (lambda _
              (substitute* "CMakeLists.txt"
-               (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption)")
+               (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)")
                 "# add_test"))
              #t))
          (add-before 'configure 'set-home
--
2.26.0
J
J
Jonathan Brielmaier wrote on 22 Apr 2020 21:54
[PATCH 3/3] gnu: nheko: Update to 0.7.0.
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200422195411.9961-3-jonathan.brielmaier@web.de
* gnu/packages/messaging.scm (nheko): Update to 0.7.0.
[inputs]: Add qtdeclarative, qtgraphicaleffects and qtquickcontrols2.
Arrange qtsvg in alphabetical order.
---
gnu/packages/messaging.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8a9478d01c..65a157861e 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1844,7 +1844,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
 (define-public nheko
   (package
     (name "nheko")
-    (version "0.6.4")
+    (version "0.7.0")
     (source
      (origin
        (method git-fetch)
@@ -1853,7 +1853,7 @@ 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 "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"))))
+        (base32 "1lizi2s2237cvhsrkl5bkvxy8a2664xk657kbl1fsg26cix9n9af"))))
     (arguments
      `(#:tests? #f                      ;no test target
        #:configure-flags
@@ -1883,8 +1883,11 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("mtxclient" ,mtxclient)
        ("openssl" ,openssl)
        ("qtbase" ,qtbase)
-       ("qtsvg" ,qtsvg)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtsvg" ,qtsvg)
        ("spdlog" ,spdlog)
        ("tweeny" ,tweeny)
        ("zlib" ,zlib)))
--
2.26.0
J
J
Jonathan Brielmaier wrote on 10 May 2020 15:49
[v2 PATCH 0/3] [staging] Update nheko
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200510134922.16128-1-jonathan.brielmaier@web.de
Diff compared to v1:
- rebased on current staging
- update nheko to 0.7.1

Jonathan Brielmaier (3):
gnu: qtdeclarative: Fix reference on qmlcachegen.
gnu: mtxclient: Update to 0.3.0.
gnu: nheko: Update to 0.7.1.

gnu/packages/messaging.scm | 15 +++++++++------
gnu/packages/qt.scm | 13 ++++++++++++-
2 files changed, 21 insertions(+), 7 deletions(-)

--
2.26.2
J
J
Jonathan Brielmaier wrote on 10 May 2020 15:49
[PATCH 1/3] gnu: qtdeclarative: Fix reference on qmlcachegen.
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200510134922.16128-2-jonathan.brielmaier@web.de
* gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the
reference on qmlcachegen in an installed cmake file.
---
gnu/packages/qt.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

Toggle diff (31 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c9ac750cc5..f96cbaaca4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2018 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -778,7 +779,17 @@ xmlpatternsvalidator.")))
                "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg)
-       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+       ((#:tests? _ #f) #f) ; TODO: Enable the tests
+       ((#:phases phases)
+        `(modify-phases ,phases
+          ;; The qt5core install prefix is set to qtbase, but qmlcachegen is
+          ;; provided by qtdeclarative
+          (add-after 'build 'fix-qt5core-install-prefix
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
+                              (("\\$\\{_qt5Core_install_prefix\\}") out )))
+               #t))))))
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)
--
2.26.2
J
J
Jonathan Brielmaier wrote on 10 May 2020 15:49
[PATCH 2/3] gnu: mtxclient: Update to 0.3.0.
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200510134922.16128-3-jonathan.brielmaier@web.de
* gnu/packages/messaging.scm (mtxclient): Update to 0.3.0.
[arguments]: Disable Pushrules test as it requires network.
---
gnu/packages/messaging.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (31 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c6217a95de..cbf9475ad3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1779,7 +1779,7 @@ QMatrixClient project.")
 (define-public mtxclient
   (package
     (name "mtxclient")
-    (version "0.2.1")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
@@ -1788,7 +1788,7 @@ QMatrixClient project.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj"))))
+        (base32 "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"))))
     (arguments
      `(#:configure-flags
        (list
@@ -1799,7 +1799,7 @@ QMatrixClient project.")
          (add-before 'configure 'disable-network-tests
            (lambda _
              (substitute* "CMakeLists.txt"
-               (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption)")
+               (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)")
                 "# add_test"))
              #t))
          (add-before 'configure 'set-home
--
2.26.2
J
J
Jonathan Brielmaier wrote on 10 May 2020 15:49
[PATCH 3/3] gnu: nheko: Update to 0.7.1.
(address . 40777@debbugs.gnu.org)(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
20200510134922.16128-4-jonathan.brielmaier@web.de
* gnu/packages/messaging.scm (nheko): Update to 0.7.1.
[inputs]: Add qtdeclarative, qtgraphicaleffects and qtquickcontrols2.
Arrange qtsvg in alphabetical order.
---
gnu/packages/messaging.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cbf9475ad3..5920629f85 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1829,7 +1829,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
 (define-public nheko
   (package
     (name "nheko")
-    (version "0.6.4")
+    (version "0.7.1")
     (source
      (origin
        (method git-fetch)
@@ -1838,7 +1838,7 @@ 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 "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"))))
+        (base32 "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"))))
     (arguments
      `(#:tests? #f                      ;no test target
        #:configure-flags
@@ -1868,8 +1868,11 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("mtxclient" ,mtxclient)
        ("openssl" ,openssl)
        ("qtbase" ,qtbase)
-       ("qtsvg" ,qtsvg)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtsvg" ,qtsvg)
        ("spdlog" ,spdlog)
        ("tweeny" ,tweeny)
        ("zlib" ,zlib)))
--
2.26.2
M
M
Marius Bakke wrote on 23 May 2020 00:10
Re: [bug#40777] [v2 PATCH 0/3] [staging] Update nheko
(name . Jonathan Brielmaier)(address . jonathan.brielmaier@web.de)
87h7w78vto.fsf@devup.no
Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:

Toggle quote (9 lines)
> Diff compared to v1:
> - rebased on current staging
> - update nheko to 0.7.1
>
> Jonathan Brielmaier (3):
> gnu: qtdeclarative: Fix reference on qmlcachegen.
> gnu: mtxclient: Update to 0.3.0.
> gnu: nheko: Update to 0.7.1.

The qtdeclarative patch had gone stale again, but I merged it manually
and finally pushed these patches. Good catch and fix on that
qmlcachegen issue, must have been quite a debugging journey.

And sorry for the delay!

By the way, consider applying for commit access to reduce the load on
current Guix committers, who seem to be swamped at the moment. :-)
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7ITeMACgkQoqBt8qM6
VPouDgf+JsvAHkJGP1FcNIscheGDDm/wucJbaMknVi4d7ub4a+gWqNA8yn0Mshyr
HA5rfSHe0TFmHhnS8FXKMOuz9lld/f3FhouxMvsnrsoBC3y8Bl1SRsAh3FvW/B6W
mluS7iiTA/kLkOAlp7blQqna/xxpaeey64/GBcnDz0WTFeh0s/ICcKm/J8QiWGy2
hoIG2h1Oo0OuvyeUbSKwdRJFLdRPej2j+jY+yCt5b1RuWP9ECFrNS+YqfVY4UcuJ
olDqP1Lxvsojdzn/AOhpSYTpIg/yG7mo5YpTC51wBXE6B713qWzBs+iuLQXhH3JO
grlwjmf2pzpKm+r41hLS1UCuVgHZLQ==
=0oKS
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 40777@debbugs.gnu.org