From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sDHSLW7Hxl/AJQAA0tVLHw (envelope-from ) for ; Tue, 01 Dec 2020 22:45:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uHCFKW7Hxl/OeAAAbx9fmQ (envelope-from ) for ; Tue, 01 Dec 2020 22:45:02 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 70CC8940484 for ; Tue, 1 Dec 2020 22:45:01 +0000 (UTC) Received: from localhost ([::1]:45144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkEOK-0004MC-8u for larch@yhetil.org; Tue, 01 Dec 2020 17:45:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkENO-0004Lo-9a for guix-patches@gnu.org; Tue, 01 Dec 2020 17:44:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkENN-0006RG-NX for guix-patches@gnu.org; Tue, 01 Dec 2020 17:44:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkENN-00008r-M0 for guix-patches@gnu.org; Tue, 01 Dec 2020 17:44:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v4 References: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> In-Reply-To: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Dec 2020 22:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44957 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44957@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.1606862587474 (code B ref 44957); Tue, 01 Dec 2020 22:44:01 +0000 Received: (at 44957) by debbugs.gnu.org; 1 Dec 2020 22:43:07 +0000 Received: from localhost ([127.0.0.1]:33502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkEMK-000077-8G for submit@debbugs.gnu.org; Tue, 01 Dec 2020 17:43:06 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:56557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkEME-00006p-MK for 44957@debbugs.gnu.org; Tue, 01 Dec 2020 17:42:54 -0500 X-Originating-IP: 198.252.153.226 Received: from [172.27.0.55] (kite.riseup.net [198.252.153.226]) (Authenticated sender: rg@raghavgururajan.name) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 627F9FF807; Tue, 1 Dec 2020 22:42:41 +0000 (UTC) From: Raghav Gururajan Message-ID: Date: Tue, 1 Dec 2020 17:42:39 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.5.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RMoFrSrHWMDoa6wlemwLUN4XYs0fZXFsm" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.89 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 70CC8940484 X-Spam-Score: -2.89 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: Q757hWlwtZ3K This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --RMoFrSrHWMDoa6wlemwLUN4XYs0fZXFsm Content-Type: multipart/mixed; boundary="qnbfEwA7Ux3Dl9PEyokaVyqdNw4Vc3tO0"; protected-headers="v1" From: Raghav Gururajan To: 44957@debbugs.gnu.org Cc: Danny Milosavljevic Message-ID: Subject: [PIDGIN]: v4 --qnbfEwA7Ux3Dl9PEyokaVyqdNw4Vc3tO0 Content-Type: multipart/mixed; boundary="------------A3E2872B8291FB9CC8FF408F" Content-Language: en-CA This is a multi-part message in MIME format. --------------A3E2872B8291FB9CC8FF408F Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable @Danny I have include the author, date and url inside the patch. :-) Regards, RG. --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-pidgin-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-pidgin-Make-some-cosmetic-changes.patch" =46rom e4ab6260d80ef23b4f06fa37a0ad7e3fdf69e440 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 23 Nov 2020 23:41:21 -0500 Subject: [PATCH 01/14] gnu: pidgin: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin): Make some cosmetic changes. --- gnu/packages/messaging.scm | 58 +++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cb1cdc4b5c..dcafd2435b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -526,14 +526,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 patc= h. - "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 @@ -541,6 +544,18 @@ authentication.") (delete-file "configure") #t)))) (build-system glib-or-gtk-build-system) + (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=3D" + (assoc-ref %build-inputs "ncurses") + "/include")))) (native-inputs `(("pkg-config" ,pkg-config) ("check" ,check) @@ -548,7 +563,6 @@ authentication.") ("gconf" ,gconf) ("python" ,python-2) ("doxygen" ,doxygen) - ;; For bootstrapping after applying pidgin-libnm.patch. ("autoconf" ,autoconf) ("automake" ,automake) @@ -579,32 +593,24 @@ authentication.") ("libsm" ,libsm) ("libxscrnsaver" ,libxscrnsaver) ("startup-notification" ,startup-notification))) - (arguments - `(#:configure-flags - (list "--disable-gtkspell" - "--disable-tcl" - "--disable-meanwhile" - "--disable-vv" ; XXX remove when we have farstream and gst= reamer - "--disable-gstreamer" ; XXX patches needed to support gstre= amer-1.0 - "--enable-cyrus-sasl" - (string-append "--with-ncurses-headers=3D" - (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"))))) - (home-page "https://www.pidgin.im/") + (list + (search-path-specification + (variable "PURPLE_PLUGIN_PATH") + (files + (list + (string-append "lib/purple-" + (version-major version)) + "lib/pidgin"))))) (synopsis "Graphical multi-protocol instant messaging client") (description "Pidgin is a modular instant messaging client that supports many po= pular chat protocols.") + (home-page "https://www.pidgin.im/") (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/osca= r) ;; The following licenses cover the zephyr protocol plugin: (license:non-copyleft --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" =46rom 2f1af105a621398145a3a91a71292e28ac08f83a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 23 Nov 2020 23:58:08 -0500 Subject: [PATCH 02/14] gnu: pidgin: Re-arrange inputs in alphabetical ord= er. * gnu/packages/messaging.scm (pidgin) [native-inputs]: Re-order. [inputs]: Re-order. --- gnu/packages/messaging.scm | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index dcafd2435b..c3e1f029fc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -557,41 +557,40 @@ authentication.") (assoc-ref %build-inputs "ncurses") "/include")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) ;; For bootstrap + ("automake" ,automake) ;; For bootstrap ("check" ,check) - ("intltool" ,intltool) - ("gconf" ,gconf) - ("python" ,python-2) ("doxygen" ,doxygen) - ;; For bootstrapping after applying pidgin-libnm.patch. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + ("gconf" ,gconf) + ("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 la= ter - ;; 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))) (native-search-paths (list --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-Add-meanwhile.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-Add-meanwhile.patch" =46rom 431e6802aa1fd5533db7b7fb695b5c840ba4e289 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 00:17:22 -0500 Subject: [PATCH 03/14] gnu: Add meanwhile. * gnu/packages/messaging.scm (meanwhile): New variable. --- gnu/packages/messaging.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c3e1f029fc..93afe7f933 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -125,6 +125,39 @@ #:use-module (guix packages) #:use-module (guix utils)) =20 +(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 use= s a +protocol based in part off of the IMPP draft(*1), and in part off of tra= ces of +TCP sessions from existing clients.") + (home-page "https://github.com/obriencj/meanwhile") + (license license:lgpl3))) + (define-public poezio (package (name "poezio") --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-Add-silc-toolkit.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-Add-silc-toolkit.patch" =46rom df0cd86a37aee77b91ca38c1fb79deef14303a6d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 03:27:30 -0500 Subject: [PATCH 04/14] gnu: Add silc-toolkit. * gnu/packages/messaging.scm (silc-toolkit): New variable. --- gnu/packages/messaging.scm | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 93afe7f933..c4ffd39f50 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -125,6 +125,50 @@ #:use-module (guix packages) #:use-module (guix utils)) =20 +(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/s= ilc-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 a= nd secure +conferencing protocol. It provides all the common conferencing services= like +private messages, instant messages, channels and groups, and video and a= udio +conferencing.") + (home-page "https://silc.github.io/info") + (license + ;; Dual-licensed + (list + license:gpl2+ + license:bsd-2)))) + (define-public meanwhile (package (name "meanwhile") --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-Add-libgadu.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-Add-libgadu.patch" =46rom 577a476e8c947ff14a49f6b00d49034100ba91c4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 21:39:15 -0500 Subject: [PATCH 05/14] gnu: Add libgadu. * gnu/packages/messaging.scm (libgadu): New variable. --- gnu/packages/messaging.scm | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c4ffd39f50..6f57a537d5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -125,6 +125,59 @@ #:use-module (guix packages) #:use-module (guix utils)) =20 +(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 mess= enger +protocol. The library is written in C and aims to be operating system a= nd +environment independent.") + (home-page "https://libgadu.net/index.en.html") + (license license:lgpl2.1+))) + (define-public silc-toolkit (package (name "silc-toolkit") --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-Add-libgnt.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0006-gnu-Add-libgnt.patch" =46rom 3880462f5dbd1c43b8d717926e9a1ba77d645022 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 28 Nov 2020 22:57:11 -0500 Subject: [PATCH 06/14] gnu: Add libgnt. * gnu/packages/messaging.scm (libgnt): New variable. --- gnu/packages/messaging.scm | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6f57a537d5..695fca5f45 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -61,6 +61,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) @@ -125,6 +126,67 @@ #:use-module (guix packages) #:use-module (guix utils)) =20 +(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 graph= ical +user interfaces in a fast and easy way. It is based on GLib and ncurses= =2E") + (home-page "https://keep.imfreedom.org/libgnt/libgnt") + (license license:gpl2+))) + (define-public libgadu (package (name "libgadu") --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-pidgin-Enable-some-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-pidgin-Enable-some-features.patch" =46rom 1bd47c8d21bc1070186d638bdb884a06a0ab95d6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 24 Nov 2020 01:43:09 -0500 Subject: [PATCH 07/14] gnu: pidgin: Enable some features. * gnu/packages/messaging.scm (pidgin) [arguments]<#:configure-flags> [--enable-cap]: New flag. [--enable-mono]: New flag. [--with-tclconfig=3D]: New flag. [--with-tkconfig=3D]: New flag. [native-inputs]: Add graphviz. Remove python-2. [inputs]: Add libgadu, libgnt, libx11, libxext, meanwhile, mono, nspr, nss, pango, perl, python-2, silc-toolkit, tcl and tk. [propagated-inputs]: Add glib. --- gnu/packages/messaging.scm | 47 +++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 695fca5f45..69e33a3e69 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -71,6 +71,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) @@ -84,9 +85,11 @@ #: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) + #:use-module (gnu packages nss) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -740,50 +743,72 @@ authentication.") `(#:configure-flags (list "--disable-gtkspell" - "--disable-tcl" - "--disable-meanwhile" + ;; "--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=3D" (assoc-ref %build-inputs "ncurses") - "/include")))) + "/include") + (string-append "--with-tclconfig=3D" + (assoc-ref %build-inputs "tcl") + "/lib") + (string-append "--with-tkconfig=3D" + (assoc-ref %build-inputs "tk") + "/lib")))) (native-inputs `(("autoconf" ,autoconf) ;; For bootstrap ("automake" ,automake) ;; For bootstrap ("check" ,check) + ("dot" ,graphviz) ("doxygen" ,doxygen) ("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 + ("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 + ("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))) + ("startup-notification" ,startup-notification) + ("tcl" ,tcl) + ("tk" ,tk))) + (propagated-inputs + `(("glib" ,glib))) (native-search-paths (list (search-path-specification --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-pidgin-Upgrade-to-2.14.1.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-pidgin-Upgrade-to-2.14.1.patch" =46rom 1a11875402c5abb066a32143ef55a6a011d73b3e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:30:04 -0500 Subject: [PATCH 08/14] 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. --- 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 diff --git a/gnu/local.mk b/gnu/local.mk index 14b626c600..5f118874f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1461,7 +1461,6 @@ dist_patch_DATA =3D \ %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 69e33a3e69..0d5ab911d4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -717,25 +717,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.pa= tch. + ;; 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/patch= es/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=3Dpackages/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" =3D "xyes" ; then - if test "x$enable_nm" =3D "xyes" ; then -- PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >=3D 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=3Dno -- if test "x$force_deps" =3D "xyes" ; then -- AC_MSG_ERROR([ -+ PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >=3D 0.5.0], [ -+ AC_SUBST(NETWORKMANAGER_CFLAGS) -+ AC_SUBST(NETWORKMANAGER_LIBS) -+ AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager= =2E]) -+ ], [ -+ enable_nm=3Dno -+ if test "x$force_deps" =3D "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=3Dno -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 !=3D NM_STATE_CONNECTED_GLOBAL && prev !=3D NM_STATE_UNKNOW= N) -+ break; -+#else - if (prev !=3D NM_STATE_CONNECTED && prev !=3D NM_STATE_UNKNOWN) - break; -+#endif - if (ui_ops !=3D NULL && ui_ops->network_disconnected !=3D NULL) - ui_ops->network_disconnected(); - break; --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch" =46rom 71b1ec48170faeaed8261ee887b6751ab7dde702 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:45:19 -0500 Subject: [PATCH 09/14] 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, gstreamer and gst-plugins-base. * gnu/packages/patches/pidgin-vv-gst.patch: New file. * gnu/local.mk (dist_patch_DATA): Add entry. --- 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 diff --git a/gnu/local.mk b/gnu/local.mk index 5f118874f1..45a396368f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1461,6 +1461,7 @@ dist_patch_DATA =3D \ %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 0d5ab911d4..f1a44eb596 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -728,7 +728,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 @@ -739,12 +740,13 @@ authentication.") (arguments `(#:configure-flags (list + (string-append "CFLAGS=3D-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=3D" (assoc-ref %build-inputs "ncurses") @@ -771,10 +773,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) ;; gtkspell ("libgadu" ,libgadu) ("libgcrypt" ,libgcrypt) @@ -805,7 +806,8 @@ authentication.") ("tcl" ,tcl) ("tk" ,tk))) (propagated-inputs - `(("glib" ,glib))) + `(("glib" ,glib) + ("gtk+" ,gtk+-2))) (native-search-paths (list (search-path-specification diff --git a/gnu/packages/patches/pidgin-vv-gst.patch b/gnu/packages/patc= hes/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 @@ +=20 + g_free(name); + g_free(device_class); ++#endif /* USE_VV */ + } +=20 + 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; +=20 +@@ -2334,6 +2336,7 @@ + PurpleMediaElementType type) + { + GList *result =3D NULL; ++#ifdef USE_VV + GList *i; +=20 + for (i =3D manager->priv->elements; i; i =3D i->next) { +@@ -2347,6 +2350,7 @@ + result =3D g_list_prepend(result, info); + } + } ++#endif /* USE_VV */ +=20 + return result; + } --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-libotr-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-libotr-Make-some-cosmetic-changes.patch" =46rom a0aae0ca3a48de2e1d191ebdd04a28ab4f5baff3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:48:09 -0500 Subject: [PATCH 10/14] gnu: libotr: Make some cosmetic changes. * gnu/packages/messaging.scm (libotr): Make some cosmetic changes. --- gnu/packages/messaging.scm | 49 +++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f1a44eb596..214379882e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -377,32 +377,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 messagin= g 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= =2E (3) -Deniability: The messages you send do not have digital signatures that a= re -checkable by a third party. Anyone can forge messages after a conversat= ion 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 pr= ivate -keys, no previous conversation is compromised.") + (description "OTR allows you to have private conversations over inst= ant +messaging by providing: (1) Encryption: No one else can read your instan= t +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 messag= es +after a conversation to make them look like they came from you. However= , +during a conversation, your correspondent is assured the messages he see= s are +authentic and unmodified. (4) Perfect forward secrecy: If you lose cont= rol 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)))) =20 (define-public libsignal-protocol-c (package --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-libotr-Update-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-libotr-Update-license.patch" =46rom 55be50deefd0429b8cc6ecd10129c9997e50a016 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:49:38 -0500 Subject: [PATCH 11/14] gnu: libotr: Update license. * gnu/packages/messaging.scm (libotr) [license]: Modify. --- gnu/packages/messaging.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 214379882e..a5e394a0df 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -406,8 +406,10 @@ your private keys, no previous conversation is compr= omised.") (home-page "https://otr.cypherpunks.ca/") (license (list - license:lgpl2.1 - license:gpl2)))) + ;; Library + license:lgpl2.1+ + ;; Others + license:gpl2+)))) =20 (define-public libsignal-protocol-c (package --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-pidgin-otr-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-pidgin-otr-Make-some-cosmetic-changes.patch" =46rom 41242e77d95e287c1d15144b35715fe4a3765cea Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 01:12:11 -0500 Subject: [PATCH 12/14] gnu: pidgin-otr: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin-otr): Make some cosmetic changes. --- gnu/packages/messaging.scm | 51 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a5e394a0df..61796471d9 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -846,38 +846,37 @@ 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))) - (home-page "https://otr.cypherpunks.ca/") + ("libgpg-error" ,libgpg-error) + ("libotr" ,libotr) + ("pidgin" ,pidgin))) (synopsis "Off-the-Record Messaging plugin for Pidgin") - (description - "Pidgin-OTR is a plugin that adds support for OTR to the Pidgin ins= tant -messaging client. OTR (Off-the-Record) Messaging allows you to have pri= vate -conversations over instant messaging by providing: (1) Encryption: No on= e 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. Any= one + (description "Pidgin-OTR is a plugin that adds support for OTR to th= e Pidgin +instant messaging client. OTR (Off-the-Record) Messaging allows you to = have +private conversations over instant messaging by providing: (1) Encryptio= n: No +one else can read your instant messages. (2) Authentication: You are as= sured +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 secr= ecy: -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 y= ou lose +control of your private keys, no previous conversation is compromised.")= + (home-page "https://otr.cypherpunks.ca/") (license license:gpl2))) =20 (define-public znc --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-pidgin-otr-Update-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-pidgin-otr-Update-license.patch" =46rom 4a53a3f8e52969d9fce581156d90be07b9353f16 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 01:13:46 -0500 Subject: [PATCH 13/14] gnu: pidgin-otr: Update license. * gnu/packages/messaging.scm (pidgin-otr) [license]: Modify. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 61796471d9..2e405fb082 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -877,7 +877,7 @@ you. However, during a conversation, your correspond= ent is assured the messages he sees are authentic and unmodified. (4) Perfect forward secrecy: If y= ou lose control of your private keys, no previous conversation is compromised.")= (home-page "https://otr.cypherpunks.ca/") - (license license:gpl2))) + (license license:gpl2+))) =20 (define-public znc (package --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-pidgin-otr-Add-some-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-pidgin-otr-Add-some-inputs.patch" =46rom aa7d5298b7d6571bb875e972b1f38e44a2f6f3ad Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 01:18:51 -0500 Subject: [PATCH 14/14] gnu: pidgin-otr: Add some inputs. * gnu/packages/messaging.scm (pidgin-otr) [native-inputs]: Add gettext-minimal. [inputs]: Add perl. --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2e405fb082..ee9ccd2cad 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -856,14 +856,15 @@ 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) ("gtk+" ,gtk+-2) ("libgcrypt" ,libgcrypt) - ("libgpg-error" ,libgpg-error) ("libotr" ,libotr) + ("perl" ,perl) ("pidgin" ,pidgin))) (synopsis "Off-the-Record Messaging plugin for Pidgin") (description "Pidgin-OTR is a plugin that adds support for OTR to th= e Pidgin --=20 2.29.2 --------------A3E2872B8291FB9CC8FF408F-- --qnbfEwA7Ux3Dl9PEyokaVyqdNw4Vc3tO0-- --RMoFrSrHWMDoa6wlemwLUN4XYs0fZXFsm Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX8bG3wUDAAAAAAAKCRBfWBZkf4vlUVZh AP9C3KNdT+XlPpSUbMPiG9BMaMMjjTEOs4CgWe+ygBpMqQEAmZuKUCqw/xlW6tc5mus3MoDKVhXO +cuubuFYHNmOxQE= =0CSl -----END PGP SIGNATURE----- --RMoFrSrHWMDoa6wlemwLUN4XYs0fZXFsm--