From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] Pidgin Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 00:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44957 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44957@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160669772922364 (code B ref -1); Mon, 30 Nov 2020 00:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Nov 2020 00:55:29 +0000 Received: from localhost ([127.0.0.1]:52941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjXTO-0005oV-0g for submit@debbugs.gnu.org; Sun, 29 Nov 2020 19:55:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:39924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjXTG-0005oI-NA for submit@debbugs.gnu.org; Sun, 29 Nov 2020 19:55:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjXTG-0005Qn-ER for guix-patches@gnu.org; Sun, 29 Nov 2020 19:55:14 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:44277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjXTA-0003VX-St for guix-patches@gnu.org; Sun, 29 Nov 2020 19:55:14 -0500 X-Originating-IP: 198.252.153.226 Received: from [172.27.0.33] (kite.riseup.net [198.252.153.226]) (Authenticated sender: rg@raghavgururajan.name) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 0B1AE20007 for ; Mon, 30 Nov 2020 00:55:02 +0000 (UTC) From: Raghav Gururajan Message-ID: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> Date: Sun, 29 Nov 2020 19:54:59 -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="v5bealV3mUJ3aKayjwrHwjwidECeza4ls" Received-SPF: permerror client-ip=217.70.183.200; envelope-from=rg@raghavgururajan.name; helo=relay7-d.mail.gandi.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --v5bealV3mUJ3aKayjwrHwjwidECeza4ls Content-Type: multipart/mixed; boundary="dlpPubhV24CzhWoqrJHLgrDgj0Zc1oAus"; protected-headers="v1" From: Raghav Gururajan To: guix-patches@gnu.org Message-ID: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> Subject: Pidgin --dlpPubhV24CzhWoqrJHLgrDgj0Zc1oAus Content-Type: multipart/mixed; boundary="------------08997BEF48A47F77ED998118" Content-Language: en-CA This is a multi-part message in MIME format. --------------08997BEF48A47F77ED998118 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Guix! This patch series is to make Pidgin awesome again for users. Objectives: [1] Clean up package-definition. [2] Package missing inputs to Guix and add them to pidgin. [3] Enable missing features. [4] Upgrade to 2.14.X [5] Enable A/V support. Regards, RG. --------------08997BEF48A47F77ED998118 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 1/9] 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 --------------08997BEF48A47F77ED998118 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 2/9] gnu: pidgin: Re-arrange inputs in alphabetical order= =2E * 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 --------------08997BEF48A47F77ED998118 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 3/9] 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 --------------08997BEF48A47F77ED998118 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 4/9] 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 --------------08997BEF48A47F77ED998118 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 5/9] 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 --------------08997BEF48A47F77ED998118 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 6/9] 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 --------------08997BEF48A47F77ED998118 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 7/9] 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 --------------08997BEF48A47F77ED998118 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 8/9] 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 --------------08997BEF48A47F77ED998118-- --dlpPubhV24CzhWoqrJHLgrDgj0Zc1oAus-- --v5bealV3mUJ3aKayjwrHwjwidECeza4ls Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX8RC4wUDAAAAAAAKCRBfWBZkf4vlUc+v AQD1ZmCEyn6r/V/f51vf/ek+G57lsC2axin7E+vZUfkbfwEAs45VDXCCAgN/tARHS/yPZKWcCTzE IjJKWsXJwbLi8ws= =sCH4 -----END PGP SIGNATURE----- --v5bealV3mUJ3aKayjwrHwjwidECeza4ls-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v2 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: Mon, 30 Nov 2020 03:47:02 +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 Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.16067080005650 (code B ref 44957); Mon, 30 Nov 2020 03:47:02 +0000 Received: (at 44957) by debbugs.gnu.org; 30 Nov 2020 03:46:40 +0000 Received: from localhost ([127.0.0.1]:53116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kja90-0001St-MG for submit@debbugs.gnu.org; Sun, 29 Nov 2020 22:46:40 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:52085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kja8v-0001SP-2L for 44957@debbugs.gnu.org; Sun, 29 Nov 2020 22:46:29 -0500 X-Originating-IP: 198.252.153.226 Received: from [172.27.0.33] (kite.riseup.net [198.252.153.226]) (Authenticated sender: rg@raghavgururajan.name) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id A2A0120005 for <44957@debbugs.gnu.org>; Mon, 30 Nov 2020 03:46:15 +0000 (UTC) From: Raghav Gururajan Message-ID: Date: Sun, 29 Nov 2020 22:46:12 -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="ZHE0urJbbiktCLE1Eb95VZOHZBP0ef3jh" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ZHE0urJbbiktCLE1Eb95VZOHZBP0ef3jh Content-Type: multipart/mixed; boundary="LCk0MpJWnh2CDUOwCPc7txIkwOHCAEcQS"; protected-headers="v1" From: Raghav Gururajan To: 44957@debbugs.gnu.org Message-ID: Subject: [PIDGIN]: v2 --LCk0MpJWnh2CDUOwCPc7txIkwOHCAEcQS Content-Type: multipart/mixed; boundary="------------D2E4D60A5113490C692D7F78" Content-Language: en-CA This is a multi-part message in MIME format. --------------D2E4D60A5113490C692D7F78 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Revised patch-set. --------------D2E4D60A5113490C692D7F78 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 1/9] 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 --------------D2E4D60A5113490C692D7F78 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 2/9] gnu: pidgin: Re-arrange inputs in alphabetical order= =2E * 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 --------------D2E4D60A5113490C692D7F78 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 3/9] 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 --------------D2E4D60A5113490C692D7F78 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 4/9] 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 --------------D2E4D60A5113490C692D7F78 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 5/9] 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 --------------D2E4D60A5113490C692D7F78 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 6/9] 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 --------------D2E4D60A5113490C692D7F78 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 7/9] 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 --------------D2E4D60A5113490C692D7F78 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 8/9] 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 --------------D2E4D60A5113490C692D7F78 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 6e3a0f648f4ce427187d20cc7e52c4723056df1d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:45:19 -0500 Subject: [PATCH 9/9] 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 | 44 ++++++++++++++++++++++++ 3 files changed, 54 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..c30f1f9b6c --- /dev/null +++ b/gnu/packages/patches/pidgin-vv-gst.patch @@ -0,0 +1,44 @@ +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 --------------D2E4D60A5113490C692D7F78-- --LCk0MpJWnh2CDUOwCPc7txIkwOHCAEcQS-- --ZHE0urJbbiktCLE1Eb95VZOHZBP0ef3jh Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX8RrBAUDAAAAAAAKCRBfWBZkf4vlUUUc AQCSm2JY3+K8q51DLjobfBgWVH0uHiJz3+hflzdqp9J34AEA4R5sYelMMK6X06NAefwSobbJtj+6 76pFAHWXTvgtPwM= =Yam/ -----END PGP SIGNATURE----- --ZHE0urJbbiktCLE1Eb95VZOHZBP0ef3jh-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v3 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: Mon, 30 Nov 2020 06:24: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 Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.160671739129199 (code B ref 44957); Mon, 30 Nov 2020 06:24:01 +0000 Received: (at 44957) by debbugs.gnu.org; 30 Nov 2020 06:23:11 +0000 Received: from localhost ([127.0.0.1]:53223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjcaT-0007aD-Dr for submit@debbugs.gnu.org; Mon, 30 Nov 2020 01:23:11 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:43067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjcaN-0007Zu-Vb for 44957@debbugs.gnu.org; Mon, 30 Nov 2020 01:22:59 -0500 Received: from [172.27.0.33] (kite.riseup.net [198.252.153.226]) (Authenticated sender: rg@raghavgururajan.name) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 79C1B240008 for <44957@debbugs.gnu.org>; Mon, 30 Nov 2020 06:22:47 +0000 (UTC) From: Raghav Gururajan Message-ID: <76718c32-df1f-0420-c14b-59076bdb90d3@raghavgururajan.name> Date: Mon, 30 Nov 2020 01:22:44 -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="aaPmmYOELH8vSaPubkYFGfOFetqj75Xbz" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --aaPmmYOELH8vSaPubkYFGfOFetqj75Xbz Content-Type: multipart/mixed; boundary="VeyYkfbZjuRUydapJIeAa8fMjmGBsWcS1"; protected-headers="v1" From: Raghav Gururajan To: 44957@debbugs.gnu.org Message-ID: <76718c32-df1f-0420-c14b-59076bdb90d3@raghavgururajan.name> Subject: [PIDGIN]: v3 --VeyYkfbZjuRUydapJIeAa8fMjmGBsWcS1 Content-Type: multipart/mixed; boundary="------------A80785D3C492BF4EE6EEDB68" Content-Language: en-CA This is a multi-part message in MIME format. --------------A80785D3C492BF4EE6EEDB68 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Patch-set v3 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 --------------A80785D3C492BF4EE6EEDB68 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 6e3a0f648f4ce427187d20cc7e52c4723056df1d 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 | 44 ++++++++++++++++++++++++ 3 files changed, 54 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..c30f1f9b6c --- /dev/null +++ b/gnu/packages/patches/pidgin-vv-gst.patch @@ -0,0 +1,44 @@ +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 --------------A80785D3C492BF4EE6EEDB68 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 db49addd88a3f2352df75d7a12a51e6d174c83e8 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 --------------A80785D3C492BF4EE6EEDB68 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 c3b7d2497f24bc29dc3fe0210def2ff99577510a 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 --------------A80785D3C492BF4EE6EEDB68 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 83d9d39952d1bfc9fb5f83b065f3838d76968696 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 --------------A80785D3C492BF4EE6EEDB68 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 5951e01fc258a7153fc649b3adaa8e4e77da47dc 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 --------------A80785D3C492BF4EE6EEDB68 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 f5de9c69d385a75b7f4c6c311dccc2af7f3a0023 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 --------------A80785D3C492BF4EE6EEDB68-- --VeyYkfbZjuRUydapJIeAa8fMjmGBsWcS1-- --aaPmmYOELH8vSaPubkYFGfOFetqj75Xbz Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX8SPtAUDAAAAAAAKCRBfWBZkf4vlUT/v AP0Ypx+TJYgNdBk3G+vjvABb11mqmmVTpG5dcjIQHNXLRwD/RNabYXBzda+bjuxQwe+HYQnu72pt ypUHEQ5KGobiXwY= =iljy -----END PGP SIGNATURE----- --aaPmmYOELH8vSaPubkYFGfOFetqj75Xbz-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v3 Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 09:17: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: Raghav Gururajan Cc: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.160672781822982 (code B ref 44957); Mon, 30 Nov 2020 09:17:01 +0000 Received: (at 44957) by debbugs.gnu.org; 30 Nov 2020 09:16:58 +0000 Received: from localhost ([127.0.0.1]:53422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjfIo-0005yb-DW for submit@debbugs.gnu.org; Mon, 30 Nov 2020 04:16:58 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:43330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjfIm-0005yQ-En for 44957@debbugs.gnu.org; Mon, 30 Nov 2020 04:16:57 -0500 Received: from localhost (80-110-127-97.cgn.dynamic.surfer.at [80.110.127.97]) by dd26836.kasserver.com (Postfix) with ESMTPSA id A286933657D0; Mon, 30 Nov 2020 10:16:53 +0100 (CET) Date: Mon, 30 Nov 2020 10:16:45 +0100 From: Danny Milosavljevic Message-ID: <20201130101645.01d2fba2@scratchpost.org> In-Reply-To: <76718c32-df1f-0420-c14b-59076bdb90d3@raghavgururajan.name> References: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> <76718c32-df1f-0420-c14b-59076bdb90d3@raghavgururajan.name> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/aRCBEXlPa9NzyGuWFta+a98"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/aRCBEXlPa9NzyGuWFta+a98 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Could you add author, date etc to b/gnu/packages/patches/pidgin-vv-gst.patc= h ? --Sig_/aRCBEXlPa9NzyGuWFta+a98 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/EuH0ACgkQ5xo1VCww uqW6ogf6A6gXzl88CF6rhfEUq/S57fKyX4EGldv28fHTIdmUybqooKhxIjPIcNaw pkMrdUcDFcRH47mUc9biKD/FXY4r/AQkbddSMQcmYuze9Rc5gJVHNF4xIJYMyxbU OWNXUKQoblFwRJ4aUay1puyAO6EZ2LzZUDlRYJg0jLTb6uHWPaGAjwdGCKFSxs7E zNNmuVwEBKuU1GpMW0V0+c1RN4j0WjOQbBnj2Ss8TT7WBpmT1ncCQfI5qlFyCdUG p8sh+KnNVcGbwY/zdMigB4CUunTMHrwEPex61G+cv1CLsjil25UIokhG33NjLEPL B4V7vHrpzQP85Ia5xGU/EOwWNBzbhw== =rdVz -----END PGP SIGNATURE----- --Sig_/aRCBEXlPa9NzyGuWFta+a98-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v3 Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 23:46:02 +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: Danny Milosavljevic Cc: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.160677993610269 (code B ref 44957); Mon, 30 Nov 2020 23:46:02 +0000 Received: (at 44957) by debbugs.gnu.org; 30 Nov 2020 23:45:36 +0000 Received: from localhost ([127.0.0.1]:57087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjsrP-0002fZ-NW for submit@debbugs.gnu.org; Mon, 30 Nov 2020 18:45:36 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:48009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjsrN-0002fK-Cx for 44957@debbugs.gnu.org; Mon, 30 Nov 2020 18:45:34 -0500 Received: from [192.168.2.62] (bras-vprn-ckvlon0125w-lp130-03-174-89-21-249.dsl.bell.ca [174.89.21.249]) (Authenticated sender: rg@raghavgururajan.name) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 2EEFB240002; Mon, 30 Nov 2020 23:45:25 +0000 (UTC) References: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> <76718c32-df1f-0420-c14b-59076bdb90d3@raghavgururajan.name> <20201130101645.01d2fba2@scratchpost.org> From: Raghav Gururajan Message-ID: Date: Mon, 30 Nov 2020 18:45:23 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.5.0 MIME-Version: 1.0 In-Reply-To: <20201130101645.01d2fba2@scratchpost.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yhxwzjBEX9fkuEBhFA2bHxw4mquX97uAI" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --yhxwzjBEX9fkuEBhFA2bHxw4mquX97uAI Content-Type: multipart/mixed; boundary="XjXpgTsffVpUnj68plYiynYbiNNGWJR0l"; protected-headers="v1" From: Raghav Gururajan To: Danny Milosavljevic Cc: 44957@debbugs.gnu.org Message-ID: Subject: Re: [bug#44957] [PIDGIN]: v3 References: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> <76718c32-df1f-0420-c14b-59076bdb90d3@raghavgururajan.name> <20201130101645.01d2fba2@scratchpost.org> In-Reply-To: <20201130101645.01d2fba2@scratchpost.org> --XjXpgTsffVpUnj68plYiynYbiNNGWJR0l Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-CA Content-Transfer-Encoding: quoted-printable Hi Danny! > Could you add author, date etc to b/gnu/packages/patches/pidgin-vv-gst.= patch ? I used the upstream patch=20 (https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb). But the=20 upstream does not use git. So I was unable to get the patch in=20 'format-patch' way and only in 'diff' way. Is it okay if mention the=20 author and date in commit message and/or as comment inside package=20 definition? Regards, RG. --XjXpgTsffVpUnj68plYiynYbiNNGWJR0l-- --yhxwzjBEX9fkuEBhFA2bHxw4mquX97uAI Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX8WEEwUDAAAAAAAKCRBfWBZkf4vlUToe AQCML1PCd7n8lSSVfoLtks4gUaYzy/MCO6rEL8sD5GQp6QD/cb7QsxW4ivqEexBUL9JYTT060H8R v7cbNf1ytokhrwc= =3OES -----END PGP SIGNATURE----- --yhxwzjBEX9fkuEBhFA2bHxw4mquX97uAI-- From unknown Mon Aug 18 21:17:00 2025 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v4 Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 17:52: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: Raghav Gururajan Cc: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.160917786830974 (code B ref 44957); Mon, 28 Dec 2020 17:52:01 +0000 Received: (at 44957) by debbugs.gnu.org; 28 Dec 2020 17:51:08 +0000 Received: from localhost ([127.0.0.1]:36786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktwfj-00083V-Bu for submit@debbugs.gnu.org; Mon, 28 Dec 2020 12:51:08 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:49090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktwfe-000838-BG for 44957@debbugs.gnu.org; Mon, 28 Dec 2020 12:51:06 -0500 Received: from localhost (80-110-127-104.cgn.dynamic.surfer.at [80.110.127.104]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 96F4B336521B; Mon, 28 Dec 2020 18:51:00 +0100 (CET) Date: Mon, 28 Dec 2020 18:50:58 +0100 From: Danny Milosavljevic Message-ID: <20201228185058.0591ede5@scratchpost.org> In-Reply-To: References: X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HVfDPj0.3=Sp7FSA1bBtW5Z"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/HVfDPj0.3=Sp7FSA1bBtW5Z Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi RG, applied patches 4,5,6 (the ones adding packages). The other patches (especially patch 2) currently do not apply to guix maste= r, with or without cosmetic changes. Please update those. --Sig_/HVfDPj0.3=Sp7FSA1bBtW5Z Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/qGwIACgkQ5xo1VCww uqXWRAgApzN0fAUtcsf3T/EQ3pTe3zGc6Ea+2Qk9AXnyU42Gqk7WaVajvWO0qDY4 JN9qx0ufTj7RoImOjjU9a+lxyYRyEBIth6DNHIxUlpNergndmp7VKJ67QmlmA1fc kLh6mnpvUoQ3UVQDDy/cqHF9Su2qRqTSQbZ2ReQKaM99uJUmdEKxUGEJHvSJrElY 92i+y3NvCUhcVxC8L/rSwZLxiySuT/MTMT0OOHcmz4P3aqdQhWYHSofAQ0VikUTc a1dBUryQ69CxcJsOi+aeLTcMO69eClPGpQzVH4WwZdc88t25+wYgLmG3kDJPjsxS hTh36RbYIuOcAcX7g/rqMsl8xgZr1g== =zEl2 -----END PGP SIGNATURE----- --Sig_/HVfDPj0.3=Sp7FSA1bBtW5Z-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v4 Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Dec 2020 21:10:02 +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: Danny Milosavljevic Cc: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.160936255127817 (code B ref 44957); Wed, 30 Dec 2020 21:10:02 +0000 Received: (at 44957) by debbugs.gnu.org; 30 Dec 2020 21:09:11 +0000 Received: from localhost ([127.0.0.1]:51184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kuiiN-0007EU-OL for submit@debbugs.gnu.org; Wed, 30 Dec 2020 16:09:11 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:60715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kuiiI-0007Du-M9 for 44957@debbugs.gnu.org; Wed, 30 Dec 2020 16:09:02 -0500 Received: from [192.168.2.62] (bras-vprn-ckvlon0125w-lp130-02-174-89-20-211.dsl.bell.ca [174.89.20.211]) (Authenticated sender: rg@raghavgururajan.name) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 24576100002; Wed, 30 Dec 2020 21:08:50 +0000 (UTC) References: <20201228185058.0591ede5@scratchpost.org> From: Raghav Gururajan Message-ID: <0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name> Date: Wed, 30 Dec 2020 16:08:49 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 MIME-Version: 1.0 In-Reply-To: <20201228185058.0591ede5@scratchpost.org> Content-Type: multipart/mixed; boundary="------------645169FC556DB796D5CC8E2C" Content-Language: en-US X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This is a multi-part message in MIME format. --------------645169FC556DB796D5CC8E2C Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Hi Danny! > applied patches 4,5,6 (the ones adding packages). Thanks! > The other patches (especially patch 2) currently do not apply to guix master, > with or without cosmetic changes. Please update those. Please find the updated patches attached with this email. Regards, RG. --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-pidgin-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-pidgin-Make-some-cosmetic-changes.patch" >From e17531589b5da1b2c8dce1a8fc80644ef7ea2885 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 14:59:50 -0500 Subject: [PATCH 01/10] gnu: pidgin: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin): Make some cosmetic changes. --- gnu/packages/messaging.scm | 57 +++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1393843e57..4bee2ded23 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -527,14 +527,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 @@ -549,7 +552,6 @@ authentication.") ("gconf" ,gconf) ("python" ,python-2) ("doxygen" ,doxygen) - ;; For bootstrapping after applying pidgin-libnm.patch. ("autoconf" ,autoconf) ("automake" ,automake) @@ -582,30 +584,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 -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" >From fc7ce2f83d86ac05bc9f8a5c53a39cae0e4c5724 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 15:08:25 -0500 Subject: [PATCH 02/10] gnu: pidgin: Re-arrange inputs in alphabetical order. * gnu/packages/messaging.scm (pidgin) [native-inputs]: Re-order. [inputs]: Re-order. --- gnu/packages/messaging.scm | 44 ++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4bee2ded23..759a432fb1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -546,41 +546,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 -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-pidgin-Enable-some-features.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-pidgin-Enable-some-features.patch" >From 7b551da2dca1fc6c182580b7d71764b539170477 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 15:36:00 -0500 Subject: [PATCH 03/10] gnu: pidgin: Enable some features. * gnu/packages/messaging.scm (pidgin) [arguments]<#:configure-flags> [--enable-cap]: New flag. [--enable-mono]: New flag. [--with-tclconfig=]: New flag. [--with-tkconfig=]: 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 759a432fb1..e7ad3851ec 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) @@ -549,49 +552,71 @@ 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 + ("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))) + ("startup-notification" ,startup-notification) + ("tcl" ,tcl) + ("tk" ,tk))) + (propagated-inputs + `(("glib" ,glib))) (arguments `(#: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=" (assoc-ref %build-inputs "ncurses") - "/include")))) + "/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 (search-path-specification -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-pidgin-Upgrade-to-2.14.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-pidgin-Upgrade-to-2.14.1.patch" >From 9cbedf2e7452708cac7253d5a63b81e1b3869230 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:30:04 -0500 Subject: [PATCH 04/10] 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 204850c4e6..1c61b7a3c1 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 e7ad3851ec..19346c8b99 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -526,25 +526,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; -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch" >From c954c91e1ff55b6ec7420ea37e95a40349a66228 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 15:58:42 -0500 Subject: [PATCH 05/10] 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 | 15 +++++--- gnu/packages/patches/pidgin-vv-gst.patch | 48 ++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/pidgin-vv-gst.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1c61b7a3c1..8acc74a456 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 19346c8b99..678501dc40 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -537,7 +537,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 @@ -560,9 +561,9 @@ authentication.") ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) ;; ("evolution-data-server" ,evolution-data-server) - ;; ("farstream" ,farstream) + ("farstream" ,farstream) ("gnutls" ,gnutls) - ;; ("gstreamer" ,gstreamer) + ("gstreamer" ,gstreamer) ("gtk+" ,gtk+-2) ;; gtkspell ("libgadu" ,libgadu) @@ -594,16 +595,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; + } -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-libotr-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0006-gnu-libotr-Make-some-cosmetic-changes.patch" >From 6f4dbf4638553a06f477a6ce59781eb6e6b1877f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:48:09 -0500 Subject: [PATCH 06/10] 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 678501dc40..b68b21d044 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -186,32 +186,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 -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-libotr-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0007-gnu-libotr-Update-license.patch" >From 366c6063922ef4fa1891038e7d2d9260c08092f3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:49:38 -0500 Subject: [PATCH 07/10] 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 b68b21d044..b16c1a79db 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -215,8 +215,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 -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-pidgin-otr-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0008-gnu-pidgin-otr-Make-some-cosmetic-changes.patch" >From d859d7b6c97e34b73daa698bc1cba58e46a27cc7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:02:17 -0500 Subject: [PATCH 08/10] gnu: pidgin-otr: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin-otr): Make some cosmetic changes. --- gnu/packages/messaging.scm | 49 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b16c1a79db..ecbde17568 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -654,38 +654,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 -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-pidgin-otr-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0009-gnu-pidgin-otr-Update-license.patch" >From c38c89f22e7604e9307697a1290c55dfcd4cf3b6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:03:35 -0500 Subject: [PATCH 09/10] 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 ecbde17568..ebc88e5c3d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -685,7 +685,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 -- 2.29.2 --------------645169FC556DB796D5CC8E2C Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-pidgin-otr-Add-some-inputs.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0010-gnu-pidgin-otr-Add-some-inputs.patch" >From 9da370d9cbad01394dc16f19039503e755c60345 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:05:42 -0500 Subject: [PATCH 10/10] gnu: pidgin-otr: Add some inputs. * gnu/packages/messaging.scm (pidgin-otr) [native-inputs]: Add gettext-minimal. [inputs]: Add perl. --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ebc88e5c3d..8b1481513d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -664,7 +664,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) @@ -672,6 +673,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") -- 2.29.2 --------------645169FC556DB796D5CC8E2C-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v4 Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 00:55: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: Raghav Gururajan Cc: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.160937609816814 (code B ref 44957); Thu, 31 Dec 2020 00:55:01 +0000 Received: (at 44957) by debbugs.gnu.org; 31 Dec 2020 00:54:58 +0000 Received: from localhost ([127.0.0.1]:51545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kumF0-0004N8-1t for submit@debbugs.gnu.org; Wed, 30 Dec 2020 19:54:58 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:55642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kumEy-0004Mx-Ce for 44957@debbugs.gnu.org; Wed, 30 Dec 2020 19:54:56 -0500 Received: from localhost (80-110-127-104.cgn.dynamic.surfer.at [80.110.127.104]) by dd26836.kasserver.com (Postfix) with ESMTPSA id A06983362CB9; Thu, 31 Dec 2020 01:54:53 +0100 (CET) Date: Thu, 31 Dec 2020 01:54:49 +0100 From: Danny Milosavljevic Message-ID: <20201231015449.6c0ee43d@scratchpost.org> In-Reply-To: <0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name> References: <20201228185058.0591ede5@scratchpost.org> <0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/fkUrIYh4D1Z_E63MmhvfyLF"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/fkUrIYh4D1Z_E63MmhvfyLF Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi RG, please, when enabling features, add one feature per patch here and mention = the feature by name per patch. Also, please keep in mind the issues raised in '"questionable changes" comm= its' mailing list thread. --Sig_/fkUrIYh4D1Z_E63MmhvfyLF Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/tIVkACgkQ5xo1VCww uqUluQf/WeSsgHZselRpFEEIv3otMVV9euRV8i/h6vnmp1IEx3VgQQCm2mhsi39M qfj510HpdkluORqILQ54afWmgEvhMT3HxruIi9L7lpudIUFkkd8UOiLM4qwrKW32 8jFY7MwSw5iYkfWghsyZFFXWbsYOFHbmzNs2Vu8aEMtMmUnfnQwzISE2n5JUKfXb CI0ctEbEVP01WOEFpiOWVLDqi7Zjz3vLtAgv5Nk9lMCCWmhJ6PyQBKfryr/6PmG1 rov740taINsZgxTnNOxNLoIYK+DKLcVIa6pM8MD8uwjle5Cf9f3Ig3dCj7O8JqTr yVdU9hh7adm0u0DL9MyBL6aQthgAKg== =6zQJ -----END PGP SIGNATURE----- --Sig_/fkUrIYh4D1Z_E63MmhvfyLF-- From unknown Mon Aug 18 21:17:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v4 Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 05:38: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: Danny Milosavljevic Cc: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.16093930621793 (code B ref 44957); Thu, 31 Dec 2020 05:38:01 +0000 Received: (at 44957) by debbugs.gnu.org; 31 Dec 2020 05:37:42 +0000 Received: from localhost ([127.0.0.1]:51712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kuqeU-0000Si-2f for submit@debbugs.gnu.org; Thu, 31 Dec 2020 00:37:41 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:39703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kuqeP-0000SR-Il for 44957@debbugs.gnu.org; Thu, 31 Dec 2020 00:37:33 -0500 Received: from [192.168.2.62] (bras-vprn-ckvlon0125w-lp130-02-174-89-20-211.dsl.bell.ca [174.89.20.211]) (Authenticated sender: rg@raghavgururajan.name) by relay10.mail.gandi.net (Postfix) with ESMTPSA id D2FB3240003; Thu, 31 Dec 2020 05:37:21 +0000 (UTC) References: <20201228185058.0591ede5@scratchpost.org> <0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name> <20201231015449.6c0ee43d@scratchpost.org> From: Raghav Gururajan Message-ID: <49baefba-7afb-ae6f-a161-c149c3c9da42@raghavgururajan.name> Date: Thu, 31 Dec 2020 00:37:19 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 MIME-Version: 1.0 In-Reply-To: <20201231015449.6c0ee43d@scratchpost.org> Content-Type: multipart/mixed; boundary="------------361E3B362E8C1D421431258D" Content-Language: en-US X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This is a multi-part message in MIME format. --------------361E3B362E8C1D421431258D Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Hi Danny! > please, when enabling features, add one feature per patch here and mention the > feature by name per patch. Please find the revised patch attached with this email. > Also, please keep in mind the issues raised in '"questionable changes" commits' > mailing list thread. Yes, I have not removed any comments or moved the fields around. I will soon be not doing cosmetic changes at all, as I am working on my OCD. Regards, RG. --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-pidgin-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-pidgin-Make-some-cosmetic-changes.patch" >From e9abb81da9753026ed5e9228d91ccded74f3a161 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 14:59:50 -0500 Subject: [PATCH 01/17] gnu: pidgin: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin): Make some cosmetic changes. --- gnu/packages/messaging.scm | 57 +++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1393843e57..4bee2ded23 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -527,14 +527,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 @@ -549,7 +552,6 @@ authentication.") ("gconf" ,gconf) ("python" ,python-2) ("doxygen" ,doxygen) - ;; For bootstrapping after applying pidgin-libnm.patch. ("autoconf" ,autoconf) ("automake" ,automake) @@ -582,30 +584,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" >From c15039b7fb7b6a5daa29340f1afd2cf550669134 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 15:08:25 -0500 Subject: [PATCH 02/17] gnu: pidgin: Re-arrange inputs in alphabetical order. * gnu/packages/messaging.scm (pidgin) [native-inputs]: Re-order. [inputs]: Re-order. --- gnu/packages/messaging.scm | 44 ++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4bee2ded23..759a432fb1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -546,41 +546,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-pidgin-Add-missing-inputs.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-pidgin-Add-missing-inputs.patch" >From 9d305107a5395a8decae13425f1bea8b80eb489c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 23:57:17 -0500 Subject: [PATCH 03/17] 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. --- gnu/packages/messaging.scm | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 759a432fb1..8c069c08cf 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) @@ -87,6 +88,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) @@ -549,37 +551,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-pidgin-Enable-support-for-mono.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-pidgin-Enable-support-for-mono.patch" >From 2805e08eed9e3d60af0b0e949c24936cffdaa407 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:03:35 -0500 Subject: [PATCH 04/17] gnu: pidgin: Enable support for mono. * gnu/packages/messaging.scm (pidgin) [inputs]: Add mono. [arguments]<#:configure-flags>[--enable-mono]: New flag. --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8c069c08cf..e422f27233 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -85,6 +85,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) @@ -581,7 +582,7 @@ authentication.") ("libxslt" ,libxslt) ;; ("libzephyr" ,libzephyr) ;; ("meanwhile" ,meanwhile) - ;; ("mono" ,mono) + ("mono" ,mono) ("ncurses" ,ncurses) ("network-manager" ,network-manager) ("nspr" ,nspr) @@ -601,6 +602,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" -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-pidgin-Enable-meanwhile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-gnu-pidgin-Enable-meanwhile.patch" >From 74e4c033ce86a1ad73d7d4bc59a1f53f5bd08ccf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:05:14 -0500 Subject: [PATCH 05/17] gnu: pidgin: Enable meanwhile. * gnu/packages/messaging.scm (pidgin) [inputs]: Add meanwhile. [arguments]<#:configure-flags>[--disable-meanwhile]: Remove flag. --- gnu/packages/messaging.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e422f27233..cd1d992897 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -581,7 +581,7 @@ authentication.") ("libxscrnsaver" ,libxscrnsaver) ("libxslt" ,libxslt) ;; ("libzephyr" ,libzephyr) - ;; ("meanwhile" ,meanwhile) + ("meanwhile" ,meanwhile) ("mono" ,mono) ("ncurses" ,ncurses) ("network-manager" ,network-manager) @@ -601,7 +601,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-pidgin-Enable-CAP.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0006-gnu-pidgin-Enable-CAP.patch" >From c02edbd0d1d13b866547c02813aa5a0f4faf13fc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:07:24 -0500 Subject: [PATCH 06/17] gnu: pidgin: Enable CAP. * gnu/packages/messaging.scm (pidgin) [arguments]<#:configure-flags> [--enable-cap]: New flag. --- gnu/packages/messaging.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cd1d992897..1fc117273d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -600,6 +600,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-pidgin-Enable-SILC-protocol-support.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0007-gnu-pidgin-Enable-SILC-protocol-support.patch" >From 6d356e247f922e17efe4b377b9324ee80f8b1ba2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:09:56 -0500 Subject: [PATCH 07/17] gnu: pidgin: Enable SILC protocol support. * gnu/packages/messaging.scm (pidgin) [inputs]: Add silc-toolkit. --- 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 1fc117273d..1484ce3c39 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -591,7 +591,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-pidgin-Enable-support-for-Tcl.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0008-gnu-pidgin-Enable-support-for-Tcl.patch" >From 43921e941819f949c4d04ab3420aa703c234157e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:11:49 -0500 Subject: [PATCH 08/17] 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. --- gnu/packages/messaging.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1484ce3c39..b068c9c5d2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -593,7 +593,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 @@ -609,7 +610,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-pidgin-Enable-support-for-Tk.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0009-gnu-pidgin-Enable-support-for-Tk.patch" >From 2d041c74b2288f73a235f4e6b5b629013db96303 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:14:25 -0500 Subject: [PATCH 09/17] gnu: pidgin: Enable support for Tk. * gnu/packages/messaging.scm (pidgin) [inputs]: Add tk. [arguments]<#:configure-flags>[--with-tkconfig]: New flag. --- gnu/packages/messaging.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b068c9c5d2..b28dcf329c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -594,7 +594,8 @@ authentication.") ("silc" ,silc-toolkit) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) - ("tcl" ,tcl))) + ("tcl" ,tcl) + ("tk" ,tk))) (propagated-inputs `(("glib" ,glib))) (arguments @@ -603,7 +604,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 @@ -613,6 +613,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-pidgin-Upgrade-to-2.14.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0010-gnu-pidgin-Upgrade-to-2.14.1.patch" >From 731b277ff17be54cd823898aaf8ac1f21965c606 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:30:04 -0500 Subject: [PATCH 10/17] 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 204850c4e6..1c61b7a3c1 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 b28dcf329c..5f50643f45 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -526,25 +526,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; -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-pidgin-Enable-Gadu-Gadu-protocol-support.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0011-gnu-pidgin-Enable-Gadu-Gadu-protocol-support.patch" >From 5024f4c20fa97edbf3d8d7e2c24592c089a9c7af Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:20:56 -0500 Subject: [PATCH 11/17] gnu: pidgin: Enable Gadu-Gadu protocol support. * gnu/packages/messaging.scm (pidgin) [inputs]: Add libgadu. --- 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 5f50643f45..deecfc6f7e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -565,7 +565,7 @@ authentication.") ;; ("gstreamer" ,gstreamer) ("gtk+" ,gtk+-2) ;; ("gtkspell2" ,gtkspell2) - ;; ("libgadu" ,libgadu) + ("libgadu" ,libgadu) ("libgcrypt" ,libgcrypt) ("libgnt" ,libgnt) ("libice" ,libice) -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0012-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch" >From d9355a55ad32ff7a534005bb59c3afe44c990d8f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 31 Dec 2020 00:30:09 -0500 Subject: [PATCH 12/17] 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. --- 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 1c61b7a3c1..8acc74a456 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 deecfc6f7e..ddd1e87c71 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -537,7 +537,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 @@ -560,10 +561,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) @@ -594,16 +594,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; + } -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-libotr-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0013-gnu-libotr-Make-some-cosmetic-changes.patch" >From c3ec0f582abad2b6b40ca16f46f6cfc4947a670a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:48:09 -0500 Subject: [PATCH 13/17] 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 ddd1e87c71..f07ee9da28 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -186,32 +186,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-libotr-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0014-gnu-libotr-Update-license.patch" >From 86f2d8a03316491b960c352ef01c7dae4ac2a594 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 30 Nov 2020 00:49:38 -0500 Subject: [PATCH 14/17] 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 f07ee9da28..33ee8e760f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -215,8 +215,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-pidgin-otr-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0015-gnu-pidgin-otr-Make-some-cosmetic-changes.patch" >From 21f94ff6148a810479ca6578a1b481f5ad14ef08 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:02:17 -0500 Subject: [PATCH 15/17] gnu: pidgin-otr: Make some cosmetic changes. * gnu/packages/messaging.scm (pidgin-otr): Make some cosmetic changes. --- gnu/packages/messaging.scm | 49 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 33ee8e760f..4018cae5fc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -653,38 +653,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-pidgin-otr-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0016-gnu-pidgin-otr-Update-license.patch" >From 8ed7a58bbf7890830126c9d8871024aa8f382a79 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:03:35 -0500 Subject: [PATCH 16/17] 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 4018cae5fc..cf63cf76ff 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -684,7 +684,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 -- 2.29.2 --------------361E3B362E8C1D421431258D Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-pidgin-otr-Add-some-inputs.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0017-gnu-pidgin-otr-Add-some-inputs.patch" >From 4bdf865574fa41ecb8aee96f7a1283974febd89c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Dec 2020 16:05:42 -0500 Subject: [PATCH 17/17] gnu: pidgin-otr: Add some inputs. * gnu/packages/messaging.scm (pidgin-otr) [native-inputs]: Add gettext-minimal. [inputs]: Add perl. --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cf63cf76ff..41c45dcf78 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -663,7 +663,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) @@ -671,6 +672,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") -- 2.29.2 --------------361E3B362E8C1D421431258D-- From unknown Mon Aug 18 21:17:00 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Raghav Gururajan Subject: bug#44957: closed (Re: [PIDGIN]: v4) Message-ID: References: <20210103173044.3a2d8e6c@scratchpost.org> <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> X-Gnu-PR-Message: they-closed 44957 X-Gnu-PR-Package: guix-patches Reply-To: 44957@debbugs.gnu.org Date: Sun, 03 Jan 2021 16:31:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1609691461-23653-1" This is a multi-part message in MIME format... ------------=_1609691461-23653-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #44957: Pidgin which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 44957@debbugs.gnu.org. --=20 44957: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44957 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1609691461-23653-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 44957-done) by debbugs.gnu.org; 3 Jan 2021 16:30:48 +0000 Received: from localhost ([127.0.0.1]:38483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kw6HI-000695-JX for submit@debbugs.gnu.org; Sun, 03 Jan 2021 11:30:48 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:37318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kw6HG-00068w-Nx for 44957-done@debbugs.gnu.org; Sun, 03 Jan 2021 11:30:47 -0500 Received: from localhost (80-110-127-104.cgn.dynamic.surfer.at [80.110.127.104]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 188EA3365742; Sun, 3 Jan 2021 17:30:45 +0100 (CET) Date: Sun, 3 Jan 2021 17:30:44 +0100 From: Danny Milosavljevic To: Raghav Gururajan Subject: Re: [PIDGIN]: v4 Message-ID: <20210103173044.3a2d8e6c@scratchpost.org> In-Reply-To: <49baefba-7afb-ae6f-a161-c149c3c9da42@raghavgururajan.name> References: <20201228185058.0591ede5@scratchpost.org> <0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name> <20201231015449.6c0ee43d@scratchpost.org> <49baefba-7afb-ae6f-a161-c149c3c9da42@raghavgururajan.name> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/mjfR__F1/mvHwb5VcvIEQGx"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44957-done Cc: 44957-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/mjfR__F1/mvHwb5VcvIEQGx Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi RG, pushed to guix master. Thanks! --Sig_/mjfR__F1/mvHwb5VcvIEQGx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/x8TQACgkQ5xo1VCww uqV2Igf/Ruhb8nyqfoU1Qndq+uloLrpVJ2tMTSi+XRaiq1Fzg7Op4++wLs6VKMCV XmFDTukUL9vUcPBY28uyD5S2yDFIF3yrnGVW1RQPQ8Kfs59fws5voiUX304QxOFm J8PIGuVv/nYK+MMsq6OlodIvQg6c9Bm9jhlitEmGtAloyraM9PeOin+tBL4Wn8iI uENbrcyL3z506RJKswfctF6EHEhAMn8dt/YL9nGiFBXIOJgRcEqmJVeQqsH/Cqm5 5aGE+oJUWdV7VdqS2H/ZMfKXwnV9/pANG1tjfBARkSJnBLmz4ZERGalr/TvIYmZW KVCbuyBrVjzWIPHiz/R33jPKkq3dMQ== =hvHq -----END PGP SIGNATURE----- --Sig_/mjfR__F1/mvHwb5VcvIEQGx-- ------------=_1609691461-23653-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Nov 2020 00:55:29 +0000 Received: from localhost ([127.0.0.1]:52941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjXTO-0005oV-0g for submit@debbugs.gnu.org; Sun, 29 Nov 2020 19:55:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:39924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjXTG-0005oI-NA for submit@debbugs.gnu.org; Sun, 29 Nov 2020 19:55:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjXTG-0005Qn-ER for guix-patches@gnu.org; Sun, 29 Nov 2020 19:55:14 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:44277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjXTA-0003VX-St for guix-patches@gnu.org; Sun, 29 Nov 2020 19:55:14 -0500 X-Originating-IP: 198.252.153.226 Received: from [172.27.0.33] (kite.riseup.net [198.252.153.226]) (Authenticated sender: rg@raghavgururajan.name) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 0B1AE20007 for ; Mon, 30 Nov 2020 00:55:02 +0000 (UTC) To: guix-patches@gnu.org From: Raghav Gururajan Subject: Pidgin Message-ID: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> Date: Sun, 29 Nov 2020 19:54:59 -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="v5bealV3mUJ3aKayjwrHwjwidECeza4ls" Received-SPF: permerror client-ip=217.70.183.200; envelope-from=rg@raghavgururajan.name; helo=relay7-d.mail.gandi.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --v5bealV3mUJ3aKayjwrHwjwidECeza4ls Content-Type: multipart/mixed; boundary="dlpPubhV24CzhWoqrJHLgrDgj0Zc1oAus"; protected-headers="v1" From: Raghav Gururajan To: guix-patches@gnu.org Message-ID: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> Subject: Pidgin --dlpPubhV24CzhWoqrJHLgrDgj0Zc1oAus Content-Type: multipart/mixed; boundary="------------08997BEF48A47F77ED998118" Content-Language: en-CA This is a multi-part message in MIME format. --------------08997BEF48A47F77ED998118 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Guix! This patch series is to make Pidgin awesome again for users. Objectives: [1] Clean up package-definition. [2] Package missing inputs to Guix and add them to pidgin. [3] Enable missing features. [4] Upgrade to 2.14.X [5] Enable A/V support. Regards, RG. --------------08997BEF48A47F77ED998118 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 1/9] 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 --------------08997BEF48A47F77ED998118 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 2/9] gnu: pidgin: Re-arrange inputs in alphabetical order= =2E * 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 --------------08997BEF48A47F77ED998118 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 3/9] 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 --------------08997BEF48A47F77ED998118 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 4/9] 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 --------------08997BEF48A47F77ED998118 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 5/9] 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 --------------08997BEF48A47F77ED998118 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 6/9] 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 --------------08997BEF48A47F77ED998118 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 7/9] 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 --------------08997BEF48A47F77ED998118 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 8/9] 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 --------------08997BEF48A47F77ED998118-- --dlpPubhV24CzhWoqrJHLgrDgj0Zc1oAus-- --v5bealV3mUJ3aKayjwrHwjwidECeza4ls Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX8RC4wUDAAAAAAAKCRBfWBZkf4vlUc+v AQD1ZmCEyn6r/V/f51vf/ek+G57lsC2axin7E+vZUfkbfwEAs45VDXCCAgN/tARHS/yPZKWcCTzE IjJKWsXJwbLi8ws= =sCH4 -----END PGP SIGNATURE----- --v5bealV3mUJ3aKayjwrHwjwidECeza4ls-- ------------=_1609691461-23653-1--