gnu: gajim: Update to 1.0.1.
* gnu/packages/messaging.scm (gajim): Update to 1.0.1. [build-system]: Change to PYTHON-BUILD-SYSTEM. [arguments]: Remove the PYTHONPATH wrapper. Don't override "APP". Add a GI_TYPELIB_PATH wrapper. Add 'remove-test-resolver, 'start-xserver and 'install-icons phases. [native-inputs]: Add XORG-SERVER. [inputs]: Remove PYTHON2-AXOLOTL, PYTHON2-NBXMPP, PYTHON2-PYOPENSSL, PYTHON2-GNUPG, PYTHON2-PYGTK, PYTHON-2. Add ADWAITA-ICON-THEME, GNOME-KEYRING, GTK+, GTKSPELL3, HICOLOR-ICON-THEME, LIBSECRET, PYTHON-AXOLOTL, PYTHON-DBUS, PYTHON-DOCUTILS, PYTHON-GNUPG, PYTHON-NBXMPP, PYTHON-PILLOW, PYTHON-PYASN1, PYTHON-PYCAIRO, PYTHON-PYGOBJECT, PYTHON-PYOPENSSL, PYTHON-QRCODE.
This commit is contained in:
parent
bc5fa18ba1
commit
e2d8b4a883
|
@ -510,7 +510,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.")
|
||||||
(define-public gajim
|
(define-public gajim
|
||||||
(package
|
(package
|
||||||
(name "gajim")
|
(name "gajim")
|
||||||
(version "0.16.9")
|
(version "1.0.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://gajim.org/downloads/"
|
(uri (string-append "https://gajim.org/downloads/"
|
||||||
|
@ -518,36 +518,74 @@ was initially a fork of xmpppy, but uses non-blocking sockets.")
|
||||||
"/gajim-" version ".tar.bz2"))
|
"/gajim-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0v08zdvpqaig0wxpxn1l8rsj3wr3fqvnagn8cnvch17vfqv9gcr1"))))
|
"16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"))))
|
||||||
(build-system gnu-build-system)
|
(build-system python-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'install 'wrap-program
|
(add-after 'install 'wrap-program
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
;; Make sure all Python scripts run with the correct PYTHONPATH.
|
(let ((out (assoc-ref outputs "out")))
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(for-each
|
||||||
(path (getenv "PYTHONPATH")))
|
(lambda (name)
|
||||||
(for-each (lambda (name)
|
(let ((file (string-append out "/bin/" name))
|
||||||
(let ((file (string-append out "/bin/" name)))
|
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
|
||||||
;; Wrapping destroys identification of intended
|
(wrap-program file
|
||||||
;; application, so we need to override "APP".
|
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
|
||||||
(substitute* file
|
'("gajim" "gajim-remote" "gajim-history-manager")))
|
||||||
(("APP=`basename \\$0`")
|
#t))
|
||||||
(string-append "APP=" name)))
|
(add-before 'check 'remove-test-resolver
|
||||||
(wrap-program file
|
;; This test requires network access.
|
||||||
`("PYTHONPATH" ":" prefix (,path)))))
|
(lambda _
|
||||||
'("gajim" "gajim-remote" "gajim-history-manager")))
|
(substitute* "test/runtests.py"
|
||||||
|
(("'integration.test_resolver',") ""))
|
||||||
|
#t))
|
||||||
|
(add-before 'check 'start-xserver
|
||||||
|
;; Tests require a running X server.
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(let ((xorg-server (assoc-ref inputs "xorg-server"))
|
||||||
|
(display ":1"))
|
||||||
|
(setenv "DISPLAY" display)
|
||||||
|
(zero? (system (string-append xorg-server "/bin/Xvfb "
|
||||||
|
display " &"))))))
|
||||||
|
(add-after 'install 'install-icons
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
(adwaita (string-append
|
||||||
|
(assoc-ref inputs "adwaita-icon-theme")
|
||||||
|
"/share/icons/Adwaita"))
|
||||||
|
(hicolor (string-append
|
||||||
|
(assoc-ref inputs "hicolor-icon-theme")
|
||||||
|
"/share/icons/hicolor"))
|
||||||
|
(icons (string-append
|
||||||
|
out "/lib/python"
|
||||||
|
,(version-major+minor (package-version python))
|
||||||
|
"/site-packages/gajim/data/icons")))
|
||||||
|
(with-directory-excursion icons
|
||||||
|
(symlink adwaita "Adwaita")
|
||||||
|
(copy-recursively hicolor "hicolor")))
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("intltool" ,intltool)))
|
`(("intltool" ,intltool)
|
||||||
|
("xorg-server" ,xorg-server)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("python2-axolotl" ,python2-axolotl)
|
`(("adwaita-icon-theme" ,adwaita-icon-theme)
|
||||||
("python2-nbxmpp" ,python2-nbxmpp)
|
("gnome-keyring" ,gnome-keyring)
|
||||||
("python2-pyopenssl" ,python2-pyopenssl)
|
("gtk+" ,gtk+)
|
||||||
("python2-gnupg" ,python2-gnupg)
|
("gtkspell3" ,gtkspell3)
|
||||||
("python2-pygtk" ,python2-pygtk)
|
("hicolor-icon-theme" ,hicolor-icon-theme)
|
||||||
("python" ,python-2)))
|
("libsecret" ,libsecret)
|
||||||
|
("python-axolotl" ,python-axolotl)
|
||||||
|
("python-dbus" ,python-dbus)
|
||||||
|
("python-docutils" ,python-docutils)
|
||||||
|
("python-gnupg" ,python-gnupg)
|
||||||
|
("python-nbxmpp" ,python-nbxmpp)
|
||||||
|
("python-pillow" ,python-pillow)
|
||||||
|
("python-pyasn1" ,python-pyasn1)
|
||||||
|
("python-pycairo" ,python-pycairo)
|
||||||
|
("python-pygobject" ,python-pygobject)
|
||||||
|
("python-pyopenssl" ,python-pyopenssl)
|
||||||
|
("python-qrcode" ,python-qrcode)))
|
||||||
(home-page "https://gajim.org/")
|
(home-page "https://gajim.org/")
|
||||||
(synopsis "Jabber (XMPP) client")
|
(synopsis "Jabber (XMPP) client")
|
||||||
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
|
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
|
||||||
|
|
Loading…
Reference in New Issue