| Message ID | 20210331052348.5164-11-maxim.cournoyer@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Update jami and add jami-qt | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
Thanks for working on these patches. I'm excited to try out the new Jami version. On Wed, 31 Mar 2021, Maxim Cournoyer wrote: > * gnu/packages/jami.scm (jami): Update to 20210326.1.cfba013. Rename to ... > (jami-gnome): In prevision of the soon released Jami Qt client. > (jami): Define as obsoleted by jami-gnome. However, I wonder if something has gone wrong with the renaming. I applied the whole series on top of fea1eea452e9659b79f88fa80a45ca7c03cded1f. However, running make in the Guix checkout now fails as follows. I did re-run ./bootstrap and ./configure for good measure: ``` jackhill@alperton ~/repos/guix [env]$ make make all-recursive make[1]: Entering directory '/home/jackhill/repos/guix' Making all in po/guix make[2]: Entering directory '/home/jackhill/repos/guix/po/guix' make[2]: Leaving directory '/home/jackhill/repos/guix/po/guix' Making all in po/packages make[2]: Entering directory '/home/jackhill/repos/guix/po/packages' make[2]: Leaving directory '/home/jackhill/repos/guix/po/packages' make[2]: Entering directory '/home/jackhill/repos/guix' Compiling Scheme modules... [ 8%] LOAD gnu/packages/build-tools.scm ;;; note: source file ./gnu/packages/build-tools.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/build-tools.go ;;; note: source file ./gnu/packages/build-tools.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/build-tools.go ;;; note: source file ./gnu/packages/networking.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/networking.go ;;; note: source file ./gnu/packages/networking.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/networking.go ;;; note: source file ./gnu/packages/nettle.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/nettle.go ;;; note: source file ./gnu/packages/nettle.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/nettle.go ;;; note: source file ./gnu/packages/telephony.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/telephony.go ;;; note: source file ./gnu/packages/telephony.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/telephony.go [ 17%] LOAD gnu/packages/emulators.scm ;;; note: source file ./gnu/packages/emulators.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/emulators.go ;;; note: source file ./gnu/packages/emulators.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/emulators.go [ 25%] LOAD gnu/packages/jami.scm ;;; note: source file ./gnu/packages/jami.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/jami.go ;;; note: source file ./gnu/packages/jami.scm ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/jami.go ice-9/eval.scm:293:34: error: jami: unbound variable hint: Did you forget a `use-modules' form? make[2]: *** [Makefile:6318: make-go] Error 1 make[2]: Leaving directory '/home/jackhill/repos/guix' make[1]: *** [Makefile:5366: all-recursive] Error 1 make[1]: Leaving directory '/home/jackhill/repos/guix' make: *** [Makefile:3697: all] Error 2 ``` Unfortunately, I don't see any place the old binding is referenced. Best, Jack
> [ 25%] LOAD gnu/packages/jami.scm > ;;; note: source file ./gnu/packages/jami.scm > ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/jami.go > ;;; note: source file ./gnu/packages/jami.scm > ;;; newer than compiled /home/jackhill/repos/guix/gnu/packages/jami.go > ice-9/eval.scm:293:34: error: jami: unbound variable > hint: Did you forget a `use-modules' form? > > make[2]: *** [Makefile:6318: make-go] Error 1 > make[2]: Leaving directory '/home/jackhill/repos/guix' > make[1]: *** [Makefile:5366: all-recursive] Error 1 > make[1]: Leaving directory '/home/jackhill/repos/guix' > make: *** [Makefile:3697: all] Error 2 > ``` > > Unfortunately, I don't see any place the old binding is referenced. Oops, this seems be be my mistake. A `make clean-go` fixed it. Sorry for the noise. Best, Jack
On Wed, 31 Mar 2021, Jack Hill wrote: >> [ 25%] LOAD gnu/packages/jami.scm >> ;;; note: source file ./gnu/packages/jami.scm >> ;;; newer than compiled >> /home/jackhill/repos/guix/gnu/packages/jami.go >> ;;; note: source file ./gnu/packages/jami.scm >> ;;; newer than compiled >> /home/jackhill/repos/guix/gnu/packages/jami.go >> ice-9/eval.scm:293:34: error: jami: unbound variable >> hint: Did you forget a `use-modules' form? >> >> make[2]: *** [Makefile:6318: make-go] Error 1 >> make[2]: Leaving directory '/home/jackhill/repos/guix' >> make[1]: *** [Makefile:5366: all-recursive] Error 1 >> make[1]: Leaving directory '/home/jackhill/repos/guix' >> make: *** [Makefile:3697: all] Error 2 >> ``` >> >> Unfortunately, I don't see any place the old binding is referenced. > > Oops, this seems be be my mistake. A `make clean-go` fixed it. Sorry for the > noise. Oops again. It seems like a spoke too soon. I'm still having the problem after a clean-go (I had forgotten that I was looking at something else in my guix repository and didn't have these patches applied at the moment).
Hi Jack! Jack Hill <jackhill@jackhill.us> writes: > On Wed, 31 Mar 2021, Jack Hill wrote: > >>> [ 25%] LOAD gnu/packages/jami.scm >>> ;;; note: source file ./gnu/packages/jami.scm >>> ;;; newer than compiled >>> /home/jackhill/repos/guix/gnu/packages/jami.go >>> ;;; note: source file ./gnu/packages/jami.scm >>> ;;; newer than compiled >>> /home/jackhill/repos/guix/gnu/packages/jami.go >>> ice-9/eval.scm:293:34: error: jami: unbound variable >>> hint: Did you forget a `use-modules' form? >>> make[2]: *** [Makefile:6318: make-go] Error 1 >>> make[2]: Leaving directory '/home/jackhill/repos/guix' >>> make[1]: *** [Makefile:5366: all-recursive] Error 1 >>> make[1]: Leaving directory '/home/jackhill/repos/guix' >>> make: *** [Makefile:3697: all] Error 2 >>> ``` >>> Unfortunately, I don't see any place the old binding is referenced. >> >> Oops, this seems be be my mistake. A `make clean-go` fixed it. Sorry >> for the noise. > > Oops again. It seems like a spoke too soon. I'm still having the > problem after a clean-go (I had forgotten that I was looking at > something else in my guix repository and didn't have these patches > applied at the moment). Sorry, there was a mistake in my git sendemail configuration, where I had mistakenly set assume8bitEncoding to yes instead of to some valid value such as 'utf-8'. I've fixed that along the missing jami variable binding and pushed as v2. Let me know if it works better! Maxim
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 41fa69dd48..79dbb39f5a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -507,44 +508,48 @@ decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -(define-public jami +(define-public jami-gnome (package - (inherit libring) - (name "jami") + (name "jami-gnome") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) + `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) + ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ("sqlite" ,sqlite))) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) + ("glib:bin" ,glib "bin"))) ;for glib-compile-resources (propagated-inputs - `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("evolution-data-server" ,evolution-data-server))) + `(("libring" ,libring) ; Contains 'dring', the daemon, which is + ; automatically started by DBus. + ("adwaita-icon-theme" ,adwaita-icon-theme))) (arguments `(#:tests? #f ; There is no testsuite. #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "client-gnome") - #t))))) - (synopsis "Distributed, privacy-respecting communication program") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides the Jami client for the GNOME desktop.") + (chdir "client-gnome")))))) + (synopsis "Jami client for GNOME") + (description "This package provides a Jami client for the GNOME desktop. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) + +;;; Keep this until the Qt client matures enough to become the +;;; main 'jami' client. +(deprecated-package jami jami-gnome)