From 71cb686a029563e51afeb2605461adb5d4985bf8 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 2 Dec 2020 18:12:56 -0600 Subject: gnu: tdlib: Update to 1.7.0. * gnu/packages/messaging.scm (tdlib): Update to 1.7.0. --- gnu/packages/messaging.scm | 81 ++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 42 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 14172a13f5..09d931b4a0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2287,51 +2287,48 @@ Telegram messenger.") (license license:gpl2+))) (define-public tdlib - (let ((commit "f45d80fe16f99d112d545b7cd74ce46342fe3437") - (revision "0") - (version "1.6.6")) - (package - (name "tdlib") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdlib/td") - (commit commit))) - (sha256 - (base32 - "1q8zw26mqhpdzvqbgc7fmn8rzwm5amb8m7s6impin4342wj7h6nr")) - (file-name (git-file-name name version)))) - (build-system cmake-build-system) - (arguments - `(#:tests? #t - #:configure-flags - (list "-DCMAKE_BUILD_TYPE=Release" - "-DTD_ENABLE_LTO=OFF") ; FIXME: Get LTO to work. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-failing-tests - (lambda _ - (substitute* "test/CMakeLists.txt" - ;; The test cases are compiled into a distinct binary - ;; which uses mtproto.cpp to attempt to connect to - ;; a remote server. Removing this file from the sources - ;; list disables those specific test cases. - (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") "")) - #t))))) - (native-inputs - `(("gperf" ,gperf) - ("openssl" ,openssl) - ("zlib" ,zlib) - ("php" ,php) - ("doxygen" ,doxygen))) - (synopsis "Cross-platform library for building Telegram clients") - (description "Tdlib is a cross-platform library for creating custom + (package + (name "tdlib") + (version "1.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdlib/td") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0dfir57ljcn98mkg061c5642qb93wh2lm1n4nngpl3na9vvfk75i")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:configure-flags + (list "-DCMAKE_BUILD_TYPE=Release" + "-DTD_ENABLE_LTO=OFF") ; FIXME: Get LTO to work. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; The test cases are compiled into a distinct binary + ;; which uses mtproto.cpp to attempt to connect to + ;; a remote server. Removing this file from the sources + ;; list disables those specific test cases. + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") "")) + #t))))) + (native-inputs + `(("gperf" ,gperf) + ("openssl" ,openssl) + ("zlib" ,zlib) + ("php" ,php) + ("doxygen" ,doxygen))) + (synopsis "Cross-platform library for building Telegram clients") + (description "Tdlib is a cross-platform library for creating custom Telegram clients following the official Telegram API. It can be easily used from almost any programming language with a C-FFI and features first-class support for high performance Telegram Bot creation.") - (home-page "https://core.telegram.org/tdlib") - (license license:boost1.0)))) + (home-page "https://core.telegram.org/tdlib") + (license license:boost1.0))) (define-public purple-mm-sms (package -- cgit v1.2.3 From f5ba25ddffa6e315ccf42d391fbefd78b686926a Mon Sep 17 00:00:00 2001 From: Robert Karszniewicz Date: Mon, 30 Nov 2020 22:18:29 +0100 Subject: gnu: utox: Update to 0.18.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/messaging.scm (utox): Update to 0.18.0. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 09d931b4a0..6dd8cab0d3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020 Mason Hock ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 Robert Karszniewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -1202,7 +1203,7 @@ messenger protocol.") (define-public utox (package (name "utox") - (version "0.17.1") + (version "0.18.0") (source (origin (method git-fetch) @@ -1213,7 +1214,7 @@ messenger protocol.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "17kwqw24iqljp2icih9k6ikx12gzr8zzqr8y5h35bg8m5s8pasq5")))) + "0d0mwgxffg4nhai62irf8lyhd1whp9s4k892rsmqz1sra3pbjcg9")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DENABLE_TESTS=on") -- cgit v1.2.3 From 4f7698ba53da501d6ce9468eeff7b40e557aae86 Mon Sep 17 00:00:00 2001 From: Robert Karszniewicz Date: Mon, 30 Nov 2020 22:18:30 +0100 Subject: gnu: utox: Update home-page and description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (utox): Update home-page and description. [home-page]: Change to GitHub URL. [description]: Fix uTox naming style. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6dd8cab0d3..1393843e57 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1253,9 +1253,9 @@ messenger protocol.") ("pkg-config" ,pkg-config))) (synopsis "Lightweight Tox client") (description - "Utox is a lightweight Tox client. Tox is a distributed and secure + "uTox is a lightweight Tox client. Tox is a distributed and secure instant messenger with audio and video chat capabilities.") - (home-page "http://utox.org/") + (home-page "https://github.com/uTox/uTox") (license license:gpl3))) (define-public qtox -- cgit v1.2.3 From 30db113f9b6fd3989ee4744a9c07fe33cfa7e35d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 00:17:22 -0500 Subject: gnu: Add meanwhile. * gnu/packages/messaging.scm (meanwhile): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1393843e57..468bb5ddc1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -126,6 +126,39 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public meanwhile + (package + (name "meanwhile") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/obriencj/meanwhile.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1k1gvmx1ikm0y1mdmm495rzkb00pl170jfaf2dy0n5aiiknkk7q3")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("doxygen" ,doxygen) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Library for Lotus Instant Messaging") + (description "Meanwhile is a library for connecting to a LIM (Lotus Instant +Messaging, formerly Lotus Sametime, formerly VPBuddy) community. It uses a +protocol based in part off of the IMPP draft(*1), and in part off of traces of +TCP sessions from existing clients.") + (home-page "https://github.com/obriencj/meanwhile") + (license license:lgpl3))) + (define-public poezio (package (name "poezio") -- cgit v1.2.3 From e5eb4db813c89c5eeeb0f0b0767705d9547ad1dc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 03:27:30 -0500 Subject: gnu: Add silc-toolkit. * gnu/packages/messaging.scm (silc-toolkit): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 468bb5ddc1..a0b47982b4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -126,6 +126,50 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public silc-toolkit + (package + (name "silc-toolkit") + (version "1.1.12") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/silc/silc/toolkit/sources/silc-toolkit-" + version ".tar.gz")) + (sha256 + (base32 "0mnvf9n7qriadg0p7a8qmvcayhnns2g9fhmcymavlm0v8xrky33y")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static" + "--enable-ipv6" + "--enable-stack-trace") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'trigger-bootstrap + (lambda _ + (delete-file "configure") + (delete-file "Makefile.in") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (synopsis "SILC ToolKit") + (description "SILC (Secure Internet Live Conferencing) is a modern and secure +conferencing protocol. It provides all the common conferencing services like +private messages, instant messages, channels and groups, and video and audio +conferencing.") + (home-page "https://silc.github.io/info") + (license + ;; Dual-licensed + (list + license:gpl2+ + license:bsd-2)))) + (define-public meanwhile (package (name "meanwhile") -- cgit v1.2.3 From 4b8aa089f277720b1a1a2218dd5168ea72b3c73d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 21:39:15 -0500 Subject: gnu: Add libgadu. * gnu/packages/messaging.scm (libgadu): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a0b47982b4..0091ff8153 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -126,6 +126,59 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public libgadu + (package + (name "libgadu") + (version "1.12.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/wojtekka/libgadu.git") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "protobufgen.sh" + (("/bin/sh") + (string-append (assoc-ref inputs "bash") + "/bin/sh"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bash" ,bash) + ("doxygen" ,doxygen) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("expat" ,expat) + ("libprotobuf-c" ,protobuf-c) + ("libxml" ,libxml2) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (propagated-inputs + `(("gnutls" ,gnutls))) + (synopsis "Library for handling the protocol of Gadu-Gadu") + (description "LibGadu is library for handling Gadu-Gadu instant messenger +protocol. The library is written in C and aims to be operating system and +environment independent.") + (home-page "https://libgadu.net/index.en.html") + (license license:lgpl2.1+))) + (define-public silc-toolkit (package (name "silc-toolkit") -- cgit v1.2.3 From 2d20b230eaad9c6dbf4af650a444148852b2e61f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 22:57:11 -0500 Subject: gnu: Add libgnt. * gnu/packages/messaging.scm (libgnt): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0091ff8153..946be3bfa5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) #:use-module (gnu packages fontutils) @@ -126,6 +127,67 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public libgnt + (package + (name "libgnt") + (version "2.14.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/pidgin/libgnt/" + version "/libgnt-" version ".tar.xz")) + (sha256 + (base32 "1grs9fxl404rscscxk1ff55fzjnwjqrisjxbasbssmcp1h1s4zkb")))) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-ncurses-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("'/usr'") + (string-append "'" + (assoc-ref inputs "ncurses") + "'"))) + #t)) + (add-before 'configure 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "libgnt-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t)))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("ncurses" ,ncurses))) + (propagated-inputs + `(("glib" ,glib) + ("libxml" ,libxml2) + ("python" ,python-2))) + (synopsis "GLib Ncurses Toolkit") + (description "GNT is an ncurses toolkit for creating text-mode graphical +user interfaces in a fast and easy way. It is based on GLib and ncurses.") + (home-page "https://keep.imfreedom.org/libgnt/libgnt") + (license license:gpl2+))) + (define-public libgadu (package (name "libgadu") -- cgit v1.2.3 From 60e1fa208a0a91d7de9e786412d97638268b348c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 14:59:50 -0500 Subject: gnu: pidgin: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 57 +++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 26 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 946be3bfa5..2e3deee971 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -719,14 +719,17 @@ authentication.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/pidgin/Pidgin/" - version "/pidgin-" version ".tar.bz2")) + (uri + (string-append "mirror://sourceforge/pidgin/Pidgin/" + version "/pidgin-" version ".tar.bz2")) (sha256 (base32 "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7")) - (patches (search-patches "pidgin-add-search-path.patch" - ;; Remove the snippet and bootstrapping - ;; native-inputs together with this patch. - "pidgin-libnm.patch")) + (patches + (search-patches + "pidgin-add-search-path.patch" + ;; Remove the snippet and bootstrapping + ;; native-inputs together with this patch. + "pidgin-libnm.patch")) (modules '((guix build utils))) (snippet '(begin @@ -741,7 +744,6 @@ authentication.") ("gconf" ,gconf) ("python" ,python-2) ("doxygen" ,doxygen) - ;; For bootstrapping after applying pidgin-libnm.patch. ("autoconf" ,autoconf) ("automake" ,automake) @@ -774,30 +776,33 @@ authentication.") ("startup-notification" ,startup-notification))) (arguments `(#:configure-flags - (list "--disable-gtkspell" - "--disable-tcl" - "--disable-meanwhile" - "--disable-vv" ; XXX remove when we have farstream and gstreamer - "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 - "--enable-cyrus-sasl" - (string-append "--with-ncurses-headers=" - (assoc-ref %build-inputs "ncurses") - "/include")))) + (list + "--disable-gtkspell" + "--disable-tcl" + "--disable-meanwhile" + "--disable-vv" ; XXX remove when we have farstream and gstreamer + "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 + "--enable-cyrus-sasl" + (string-append "--with-ncurses-headers=" + (assoc-ref %build-inputs "ncurses") + "/include")))) (native-search-paths - (list (search-path-specification - (variable "PURPLE_PLUGIN_PATH") - (files (list (string-append "lib/purple-" - (version-major version)) - "lib/pidgin"))))) + (list + (search-path-specification + (variable "PURPLE_PLUGIN_PATH") + (files + (list + (string-append "lib/purple-" + (version-major version)) + "lib/pidgin"))))) (home-page "https://www.pidgin.im/") (synopsis "Graphical multi-protocol instant messaging client") - (description - "Pidgin is a modular instant messaging client that supports many popular -chat protocols.") + (description "Pidgin is a modular instant messaging client that supports +many popular chat protocols.") (license (list - license:gpl2+ ; Most of the code - license:lgpl2.1 ; GG protocol plugin (libpurple/protocols/gg/lib) + license:gpl2+ ; Most of the code + license:lgpl2.1 ; GG protocol plugin (libpurple/protocols/gg/lib) license:lgpl2.0+ ; OSCAR protocol plugin (libpurple/protocols/oscar) ;; The following licenses cover the zephyr protocol plugin: (license:non-copyleft -- cgit v1.2.3 From 7b1dccfb50a54a925998dc4e737e38d0d9a43927 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 15:08:25 -0500 Subject: gnu: pidgin: Re-arrange inputs in alphabetical order. * gnu/packages/messaging.scm (pidgin) [native-inputs]: Re-order. [inputs]: Re-order. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2e3deee971..8b11e2105f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -738,41 +738,39 @@ authentication.") #t)))) (build-system glib-or-gtk-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("check" ,check-0.14) - ("intltool" ,intltool) + `(("autoconf" ,autoconf) ;; For bootstrap + ("automake" ,automake) ;; For bootstrap + ("check" ,check) ("gconf" ,gconf) - ("python" ,python-2) - ("doxygen" ,doxygen) - ;; For bootstrapping after applying pidgin-libnm.patch. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + ("intltool" ,intltool) + ("libtool" ,libtool) ;; For bootstrap + ("pkg-config" ,pkg-config) + ("python" ,python-2))) (inputs - `(("gtk+" ,gtk+-2) - ("libgcrypt" ,libgcrypt) - ("gnutls" ,gnutls) + `(("avahi" ,avahi) ("cyrus-sasl" ,cyrus-sasl) ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) - ("python2-dbus" ,python2-dbus) + ;; farstream + ("gnutls" ,gnutls) + ;; gstreamer + ("gtk+" ,gtk+-2) + ;; gtkspell + ;; libgadu + ("libgcrypt" ,libgcrypt) + ("libice" ,libice) ("libidn" ,libidn) ("libltdl" ,libltdl) + ("libsm" ,libsm) + ;; libxephyr ("libxml2" ,libxml2) - ;; TODO: gstreamer: patches needed to support gstreamer-1.0 or later - ;; TODO: farstream - ;; TODO: meanwhile - ;; TODO: gtkspell - ;; TODO: libxephyr - ;; TODO: libgadu + ("libxscrnsaver" ,libxscrnsaver) ("libxslt" ,libxslt) - ("avahi" ,avahi) + ;; meanwhile ("ncurses" ,ncurses) ("network-manager" ,network-manager) + ("python2-dbus" ,python2-dbus) ("sqlite" ,sqlite) - ("libice" ,libice) - ("libsm" ,libsm) - ("libxscrnsaver" ,libxscrnsaver) ("startup-notification" ,startup-notification))) (arguments `(#:configure-flags -- cgit v1.2.3 From 10f32ae27f85a9c549e4dbb3b87773221915b492 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 23:57:17 -0500 Subject: gnu: pidgin: Add missing inputs. These new inputs are referenced by the package but was missing in the package definition. Some of these inputs might have been used by the package indirectly via propagation from other inputs. * gnu/packages/messaging.scm (pidgin) [native-inputs]: Add graphviz. Move python-2 to ... [inputs]: ... here. Add libgnt, libx11, libxext, nspr, nss, pango and perl. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8b11e2105f..62584dab59 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -72,6 +72,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -88,6 +89,7 @@ #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages nss) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -741,37 +743,50 @@ authentication.") `(("autoconf" ,autoconf) ;; For bootstrap ("automake" ,automake) ;; For bootstrap ("check" ,check) + ("dot" ,graphviz) ("gconf" ,gconf) ("intltool" ,intltool) ("libtool" ,libtool) ;; For bootstrap - ("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("pkg-config" ,pkg-config))) (inputs `(("avahi" ,avahi) ("cyrus-sasl" ,cyrus-sasl) ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) - ;; farstream + ;; ("evolution-data-server" ,evolution-data-server) + ;; ("farstream" ,farstream) ("gnutls" ,gnutls) - ;; gstreamer + ;; ("gstreamer" ,gstreamer) ("gtk+" ,gtk+-2) - ;; gtkspell - ;; libgadu + ;; ("gtkspell2" ,gtkspell2) + ;; ("libgadu" ,libgadu) ("libgcrypt" ,libgcrypt) + ("libgnt" ,libgnt) ("libice" ,libice) ("libidn" ,libidn) ("libltdl" ,libltdl) ("libsm" ,libsm) - ;; libxephyr + ("libx11" ,libx11) + ("libxext" ,libxext) ("libxml2" ,libxml2) ("libxscrnsaver" ,libxscrnsaver) ("libxslt" ,libxslt) - ;; meanwhile + ;; ("libzephyr" ,libzephyr) + ;; ("meanwhile" ,meanwhile) + ;; ("mono" ,mono) ("ncurses" ,ncurses) ("network-manager" ,network-manager) + ("nspr" ,nspr) + ("nss" ,nss) + ("pango" ,pango) + ("perl" ,perl) + ("python" ,python-2) ("python2-dbus" ,python2-dbus) + ;; ("silc" ,silc-toolkit) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification))) + (propagated-inputs + `(("glib" ,glib))) (arguments `(#:configure-flags (list -- cgit v1.2.3 From d02ada47f81353df544f7583d2a09173d5a66637 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:03:35 -0500 Subject: gnu: pidgin: Enable support for mono. * gnu/packages/messaging.scm (pidgin) [inputs]: Add mono. [arguments]<#:configure-flags>[--enable-mono]: New flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 62584dab59..7ae85aba49 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -86,6 +86,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages mono) #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -773,7 +774,7 @@ authentication.") ("libxslt" ,libxslt) ;; ("libzephyr" ,libzephyr) ;; ("meanwhile" ,meanwhile) - ;; ("mono" ,mono) + ("mono" ,mono) ("ncurses" ,ncurses) ("network-manager" ,network-manager) ("nspr" ,nspr) @@ -793,6 +794,7 @@ authentication.") "--disable-gtkspell" "--disable-tcl" "--disable-meanwhile" + "--enable-mono" "--disable-vv" ; XXX remove when we have farstream and gstreamer "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 "--enable-cyrus-sasl" -- cgit v1.2.3 From 80ecda973bbdc9d812958637599999bd66c19f8c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:05:14 -0500 Subject: gnu: pidgin: Enable meanwhile. * gnu/packages/messaging.scm (pidgin) [inputs]: Add meanwhile. [arguments]<#:configure-flags>[--disable-meanwhile]: Remove flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7ae85aba49..7a3ee030d4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -773,7 +773,7 @@ authentication.") ("libxscrnsaver" ,libxscrnsaver) ("libxslt" ,libxslt) ;; ("libzephyr" ,libzephyr) - ;; ("meanwhile" ,meanwhile) + ("meanwhile" ,meanwhile) ("mono" ,mono) ("ncurses" ,ncurses) ("network-manager" ,network-manager) @@ -793,7 +793,6 @@ authentication.") (list "--disable-gtkspell" "--disable-tcl" - "--disable-meanwhile" "--enable-mono" "--disable-vv" ; XXX remove when we have farstream and gstreamer "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 -- cgit v1.2.3 From 1b80f6703cedb0325c46edad87f27a44d67d17d0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:07:24 -0500 Subject: gnu: pidgin: Enable CAP. * gnu/packages/messaging.scm (pidgin) [arguments]<#:configure-flags> [--enable-cap]: New flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7a3ee030d4..eaeec90cdf 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -792,6 +792,8 @@ authentication.") `(#:configure-flags (list "--disable-gtkspell" + ;; "--enable-gevolution" + "--enable-cap" "--disable-tcl" "--enable-mono" "--disable-vv" ; XXX remove when we have farstream and gstreamer -- cgit v1.2.3 From 43ba7a9b1d1c123c43bd2ecb2f123a93b0fadbc6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:09:56 -0500 Subject: gnu: pidgin: Enable SILC protocol support. * gnu/packages/messaging.scm (pidgin) [inputs]: Add silc-toolkit. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eaeec90cdf..3208c5e671 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -783,7 +783,7 @@ authentication.") ("perl" ,perl) ("python" ,python-2) ("python2-dbus" ,python2-dbus) - ;; ("silc" ,silc-toolkit) + ("silc" ,silc-toolkit) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification))) (propagated-inputs -- cgit v1.2.3 From 823567803f5afd9edf663b29b4e62ac0581cbfec Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:11:49 -0500 Subject: gnu: pidgin: Enable support for Tcl. * gnu/packages/messaging.scm (pidgin) [inputs]: Add Tcl. [arguments]<#:configure-flags>[--disable-tcl]: Remove flag. [--with-tclconfig]: New flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3208c5e671..7f6b2df834 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -785,7 +785,8 @@ authentication.") ("python2-dbus" ,python2-dbus) ("silc" ,silc-toolkit) ("sqlite" ,sqlite) - ("startup-notification" ,startup-notification))) + ("startup-notification" ,startup-notification) + ("tcl" ,tcl))) (propagated-inputs `(("glib" ,glib))) (arguments @@ -801,7 +802,10 @@ authentication.") "--enable-cyrus-sasl" (string-append "--with-ncurses-headers=" (assoc-ref %build-inputs "ncurses") - "/include")))) + "/include") + (string-append "--with-tclconfig=" + (assoc-ref %build-inputs "tcl") + "/lib")))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From f0e429a21809d5e5722cd1638ba3f666b3b1edb2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:14:25 -0500 Subject: gnu: pidgin: Enable support for Tk. * gnu/packages/messaging.scm (pidgin) [inputs]: Add tk. [arguments]<#:configure-flags>[--with-tkconfig]: New flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7f6b2df834..bb449b5c0f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -786,7 +786,8 @@ authentication.") ("silc" ,silc-toolkit) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) - ("tcl" ,tcl))) + ("tcl" ,tcl) + ("tk" ,tk))) (propagated-inputs `(("glib" ,glib))) (arguments @@ -795,7 +796,6 @@ authentication.") "--disable-gtkspell" ;; "--enable-gevolution" "--enable-cap" - "--disable-tcl" "--enable-mono" "--disable-vv" ; XXX remove when we have farstream and gstreamer "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 @@ -805,6 +805,9 @@ authentication.") "/include") (string-append "--with-tclconfig=" (assoc-ref %build-inputs "tcl") + "/lib") + (string-append "--with-tkconfig=" + (assoc-ref %build-inputs "tk") "/lib")))) (native-search-paths (list -- cgit v1.2.3 From 89f4f0baa9ff956ba0efe9ec20e1805f01230a54 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:30:04 -0500 Subject: gnu: pidgin: Upgrade to 2.14.1. * gnu/packages/messaging.scm (pidgin) [version]: Modify. [source][sha256]: Modify base32. [patches][pidgin-libnm.patch]: Remove obsolete patch. * gnu/packages/patches/pidgin-libnm.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove entry. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 1 - gnu/packages/messaging.scm | 13 +++---- gnu/packages/patches/pidgin-libnm.patch | 60 --------------------------------- 3 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/pidgin-libnm.patch (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/local.mk b/gnu/local.mk index c03a8b9f51..0aad15740c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1471,7 +1471,6 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ - %D%/packages/patches/pidgin-libnm.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index bb449b5c0f..45b6c5e8d0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -718,25 +718,22 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.13.0") + (version "2.14.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pidgin/Pidgin/" - version "/pidgin-" version ".tar.bz2")) + version "/pidgin-" version ".tar.gz")) (sha256 - (base32 "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7")) + (base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11")) (patches (search-patches - "pidgin-add-search-path.patch" - ;; Remove the snippet and bootstrapping - ;; native-inputs together with this patch. - "pidgin-libnm.patch")) + "pidgin-add-search-path.patch")) (modules '((guix build utils))) (snippet '(begin - ;; Remove stale generated file after applying pidgin-libnm.patch. + ;; Remove stale generated file after applying patches. (delete-file "configure") #t)))) (build-system glib-or-gtk-build-system) diff --git a/gnu/packages/patches/pidgin-libnm.patch b/gnu/packages/patches/pidgin-libnm.patch deleted file mode 100644 index d34af749af..0000000000 --- a/gnu/packages/patches/pidgin-libnm.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Sun, 24 May 2020 16:11:01 +0200 -Subject: [PATCH] gnu: pidgin: Find libnm. - -Copied verbatim from[0]. - -[0]: https://git.archlinux.org/svntogit/packages.git/plain/trunk/pidgin-nm-1.0.patch?h=packages/pidgin - -diff --git a/configure.ac b/configure.ac -index 04836fa..0a2d451 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1423,18 +1423,24 @@ fi - dnl Check for NetworkManager.h; if we don't have it, oh well - if test "x$enable_dbus" = "xyes" ; then - if test "x$enable_nm" = "xyes" ; then -- PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ -+ PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [ - AC_SUBST(NETWORKMANAGER_CFLAGS) - AC_SUBST(NETWORKMANAGER_LIBS) - AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) - ], [ -- enable_nm=no -- if test "x$force_deps" = "xyes" ; then -- AC_MSG_ERROR([ -+ PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ -+ AC_SUBST(NETWORKMANAGER_CFLAGS) -+ AC_SUBST(NETWORKMANAGER_LIBS) -+ AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) -+ ], [ -+ enable_nm=no -+ if test "x$force_deps" = "xyes" ; then -+ AC_MSG_ERROR([ - NetworkManager development headers not found. - Use --disable-nm if you do not need NetworkManager support. - ]) -- fi]) -+ fi]) -+ ]) - fi - else - enable_nm=no -diff --git a/libpurple/network.c b/libpurple/network.c -index c43e3c7..b17e439 100644 ---- a/libpurple/network.c -+++ b/libpurple/network.c -@@ -939,8 +939,13 @@ nm_update_state(NMState state) - #if NM_CHECK_VERSION(0,8,992) - case NM_STATE_DISCONNECTING: - #endif -+#if NM_CHECK_VERSION(1,0,0) -+ if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN) -+ break; -+#else - if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) - break; -+#endif - if (ui_ops != NULL && ui_ops->network_disconnected != NULL) - ui_ops->network_disconnected(); - break; -- cgit v1.2.3 From 554120687687a022e4604ae8a9e33ea5dffeb15c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:20:56 -0500 Subject: gnu: pidgin: Enable Gadu-Gadu protocol support. * gnu/packages/messaging.scm (pidgin) [inputs]: Add libgadu. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 45b6c5e8d0..99cb3e8f1a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -757,7 +757,7 @@ authentication.") ;; ("gstreamer" ,gstreamer) ("gtk+" ,gtk+-2) ;; ("gtkspell2" ,gtkspell2) - ;; ("libgadu" ,libgadu) + ("libgadu" ,libgadu) ("libgcrypt" ,libgcrypt) ("libgnt" ,libgnt) ("libice" ,libice) -- cgit v1.2.3 From 3fd4477809caaeb6681999941f21baac14d87e84 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:30:09 -0500 Subject: gnu: pidgin: Enable MultiMedia and A/V support. * gnu/packages/messaging.scm (pidgin) [patches] [pidgin-vv-gst.patch]: New patch. [arguments]<#:configure-flags>[--diable-vv]: Remove flag. [--disable-gstreamer]: Remove flag. [CFLAGS]: New flag. [inputs]: Add farstream and gstreamer. Move gtk+-2 to ... [propagated-inputs]: ... here. * gnu/packages/patches/pidgin-vv-gst.patch: New file. * gnu/local.mk (dist_patch_DATA): Add entry. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 1 + gnu/packages/messaging.scm | 16 ++++++----- gnu/packages/patches/pidgin-vv-gst.patch | 48 ++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/pidgin-vv-gst.patch (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 0aad15740c..53a67e6ffe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1471,6 +1471,7 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ + %D%/packages/patches/pidgin-vv-gst.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 99cb3e8f1a..4a368c0be4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -729,7 +729,8 @@ authentication.") (base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11")) (patches (search-patches - "pidgin-add-search-path.patch")) + "pidgin-add-search-path.patch" + "pidgin-vv-gst.patch")) (modules '((guix build utils))) (snippet '(begin @@ -752,10 +753,9 @@ authentication.") ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) ;; ("evolution-data-server" ,evolution-data-server) - ;; ("farstream" ,farstream) + ("farstream" ,farstream) ("gnutls" ,gnutls) - ;; ("gstreamer" ,gstreamer) - ("gtk+" ,gtk+-2) + ("gstreamer" ,gstreamer) ;; ("gtkspell2" ,gtkspell2) ("libgadu" ,libgadu) ("libgcrypt" ,libgcrypt) @@ -786,16 +786,18 @@ authentication.") ("tcl" ,tcl) ("tk" ,tk))) (propagated-inputs - `(("glib" ,glib))) + `(("glib" ,glib) + ("gtk+" ,gtk+-2))) (arguments `(#:configure-flags (list + (string-append "CFLAGS=-I" + (assoc-ref %build-inputs "gst-plugins-base") + "/include/gstreamer-1.0") "--disable-gtkspell" ;; "--enable-gevolution" "--enable-cap" "--enable-mono" - "--disable-vv" ; XXX remove when we have farstream and gstreamer - "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 "--enable-cyrus-sasl" (string-append "--with-ncurses-headers=" (assoc-ref %build-inputs "ncurses") diff --git a/gnu/packages/patches/pidgin-vv-gst.patch b/gnu/packages/patches/pidgin-vv-gst.patch new file mode 100644 index 0000000000..e0553dd119 --- /dev/null +++ b/gnu/packages/patches/pidgin-vv-gst.patch @@ -0,0 +1,48 @@ +Name: Gary Kramlich +Date: 2020-07-12 +Source: https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb + +diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c +--- a/libpurple/mediamanager.c ++++ b/libpurple/mediamanager.c +@@ -2231,6 +2231,7 @@ + purple_media_manager_unregister_gst_device(PurpleMediaManager *manager, + GstDevice *device) + { ++#ifdef USE_VV + GList *i; + gchar *name; + gchar *device_class; +@@ -2277,6 +2278,7 @@ + + g_free(name); + g_free(device_class); ++#endif /* USE_VV */ + } + + static gboolean +@@ -2304,7 +2306,7 @@ + static void + purple_media_manager_init_device_monitor(PurpleMediaManager *manager) + { +-#if GST_CHECK_VERSION(1, 4, 0) ++#if GST_CHECK_VERSION(1, 4, 0) && defined(USE_VV) + GstBus *bus; + GList *i; + +@@ -2334,6 +2336,7 @@ + PurpleMediaElementType type) + { + GList *result = NULL; ++#ifdef USE_VV + GList *i; + + for (i = manager->priv->elements; i; i = i->next) { +@@ -2347,6 +2350,7 @@ + result = g_list_prepend(result, info); + } + } ++#endif /* USE_VV */ + + return result; + } -- cgit v1.2.3 From 844da71612eb53920c4cc2911ab93d8c9abb3f71 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:48:09 -0500 Subject: gnu: libotr: Make some cosmetic changes. * gnu/packages/messaging.scm (libotr): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 49 +++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4a368c0be4..1d89850088 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -378,32 +378,37 @@ powerful, standard and open protocol.") (package (name "libotr") (version "4.1.1") - (source (origin - (method url-fetch) - (uri (string-append "https://otr.cypherpunks.ca/libotr-" - version ".tar.gz")) - (sha256 - (base32 - "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb")) - (patches (search-patches "libotr-test-auth-fix.patch")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://otr.cypherpunks.ca/libotr-" + version ".tar.gz")) + (sha256 + (base32 "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb")) + (patches + (search-patches "libotr-test-auth-fix.patch")))) (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl))) ; for the test suite + (inputs + `(("libgpg-error" ,libgpg-error))) (propagated-inputs - `(("libgcrypt" ,libgcrypt))) ; libotr headers include gcrypt.h - (inputs `(("libgpg-error" ,libgpg-error))) - (native-inputs `(("perl" ,perl))) ; for the test suite + `(("libgcrypt" ,libgcrypt))) ; libotr headers include gcrypt.h (synopsis "Off-the-Record (OTR) Messaging Library and Toolkit") - (description - "OTR allows you to have private conversations over instant messaging by -providing: (1) Encryption: No one else can read your instant messages. (2) -Authentication: You are assured the correspondent is who you think it is. (3) -Deniability: The messages you send do not have digital signatures that are -checkable by a third party. Anyone can forge messages after a conversation to -make them look like they came from you. However, during a conversation, your -correspondent is assured the messages he sees are authentic and -unmodified. (4) Perfect forward secrecy: If you lose control of your private -keys, no previous conversation is compromised.") + (description "OTR allows you to have private conversations over instant +messaging by providing: (1) Encryption: No one else can read your instant +messages. (2) Authentication: You are assured the correspondent is who you +think it is. (3) Deniability: The messages you send do not have digital +signatures that are checkable by a third party. Anyone can forge messages +after a conversation to make them look like they came from you. However, +during a conversation, your correspondent is assured the messages he sees are +authentic and unmodified. (4) Perfect forward secrecy: If you lose control of +your private keys, no previous conversation is compromised.") (home-page "https://otr.cypherpunks.ca/") - (license (list license:lgpl2.1 license:gpl2)))) + (license + (list + license:lgpl2.1 + license:gpl2)))) (define-public libsignal-protocol-c (package -- cgit v1.2.3 From d3fb65a83794584b6c59995a6d569d18fc7bfff3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:49:38 -0500 Subject: gnu: libotr: Update license. * gnu/packages/messaging.scm (libotr) [license]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1d89850088..d202dcef76 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -407,8 +407,10 @@ your private keys, no previous conversation is compromised.") (home-page "https://otr.cypherpunks.ca/") (license (list - license:lgpl2.1 - license:gpl2)))) + ;; Library + license:lgpl2.1+ + ;; Others + license:gpl2+)))) (define-public libsignal-protocol-c (package -- cgit v1.2.3 From 4f1f51898fd6b933328a9c1587c99d780801d972 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:02:17 -0500 Subject: gnu: pidgin-otr: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin-otr): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 49 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d202dcef76..3ed0f51ac3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -845,38 +845,37 @@ many popular chat protocols.") (package (name "pidgin-otr") (version "4.0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://otr.cypherpunks.ca/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl")))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://otr.cypherpunks.ca/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (inputs - `(("pidgin" ,pidgin) - ("libotr" ,libotr) - ("libgpg-error" ,libgpg-error) + `(("glib" ,glib) + ("gtk+" ,gtk+-2) ("libgcrypt" ,libgcrypt) - ("glib" ,glib) - ("gtk+" ,gtk+-2))) + ("libgpg-error" ,libgpg-error) + ("libotr" ,libotr) + ("pidgin" ,pidgin))) (home-page "https://otr.cypherpunks.ca/") (synopsis "Off-the-Record Messaging plugin for Pidgin") - (description - "Pidgin-OTR is a plugin that adds support for OTR to the Pidgin instant -messaging client. OTR (Off-the-Record) Messaging allows you to have private -conversations over instant messaging by providing: (1) Encryption: No one else -can read your instant messages. (2) Authentication: You are assured the -correspondent is who you think it is. (3) Deniability: The messages you send -do not have digital signatures that are checkable by a third party. Anyone + (description "Pidgin-OTR is a plugin that adds support for OTR to the Pidgin +instant messaging client. OTR (Off-the-Record) Messaging allows you to have +private conversations over instant messaging by providing: (1) Encryption: No +one else can read your instant messages. (2) Authentication: You are assured +the correspondent is who you think it is. (3) Deniability: The messages you +send do not have digital signatures that are checkable by a third party. Anyone can forge messages after a conversation to make them look like they came from -you. However, during a conversation, your correspondent is assured the -messages he sees are authentic and unmodified. (4) Perfect forward secrecy: -If you lose control of your private keys, no previous conversation is -compromised.") +you. However, during a conversation, your correspondent is assured the messages +he sees are authentic and unmodified. (4) Perfect forward secrecy: If you lose +control of your private keys, no previous conversation is compromised.") (license license:gpl2))) (define-public znc -- cgit v1.2.3 From 3fd6fd7283de1ca879a2f7e6cd297244c1ccc2dc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:03:35 -0500 Subject: gnu: pidgin-otr: Update license. * gnu/packages/messaging.scm (pidgin-otr) [license]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3ed0f51ac3..de99e5e256 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -876,7 +876,7 @@ can forge messages after a conversation to make them look like they came from you. However, during a conversation, your correspondent is assured the messages he sees are authentic and unmodified. (4) Perfect forward secrecy: If you lose control of your private keys, no previous conversation is compromised.") - (license license:gpl2))) + (license license:gpl2+))) (define-public znc (package -- cgit v1.2.3 From f2f7395e3e1b8fe0d140c4de547f31b333c92477 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:05:42 -0500 Subject: gnu: pidgin-otr: Add some inputs. * gnu/packages/messaging.scm (pidgin-otr) [native-inputs]: Add gettext-minimal. [inputs]: Add perl. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index de99e5e256..89d7b8ca83 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -855,7 +855,8 @@ many popular chat protocols.") (base32 "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl")))) (build-system gnu-build-system) (native-inputs - `(("intltool" ,intltool) + `(("gettext" ,gettext-minimal) + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -863,6 +864,7 @@ many popular chat protocols.") ("libgcrypt" ,libgcrypt) ("libgpg-error" ,libgpg-error) ("libotr" ,libotr) + ("perl" ,perl) ("pidgin" ,pidgin))) (home-page "https://otr.cypherpunks.ca/") (synopsis "Off-the-Record Messaging plugin for Pidgin") -- cgit v1.2.3 From 84ea98d6114a040b0da3bbd0f808ea44dc71942f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Jan 2021 01:36:01 +0100 Subject: gnu: ngircd: Update to 26.1. * gnu/packages/messaging.scm (ngircd): Update to 26.1. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 89d7b8ca83..c585326124 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017, 2018, 2020 Arun Isaac -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018 Leo Famulari @@ -659,14 +659,14 @@ dictionaries. HexChat can be extended with multiple addons.") (define-public ngircd (package (name "ngircd") - (version "26") + (version "26.1") (source (origin (method url-fetch) (uri (string-append "https://arthur.barton.de/pub/ngircd/ngircd-" version ".tar.xz")) (sha256 (base32 - "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n")) + "0m32v0c7mq96rshws4h6d0pi4bm0hynfzx3x01mgrxh9c396zham")) (patches (search-patches "ngircd-handle-zombies.patch")))) (build-system gnu-build-system) ;; Needed for the test suite. -- cgit v1.2.3