(address . guix-patches@gnu.org)
46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name
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.
From e4ab6260d80ef23b4f06fa37a0ad7e3fdf69e440 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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(-)
Toggle diff (101 lines)
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 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
@@ -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="
+ (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 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")))))
- (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 popular
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/oscar)
;; The following licenses cover the zephyr protocol plugin:
(license:non-copyleft
--
2.29.2
From 2f1af105a621398145a3a91a71292e28ac08f83a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 23 Nov 2020 23:58:08 -0500
Subject: [PATCH 2/9] gnu: pidgin: Re-arrange inputs in alphabetical order.
* gnu/packages/messaging.scm (pidgin) [native-inputs]: Re-order.
[inputs]: Re-order.
---
gnu/packages/messaging.scm | 43 +++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 22 deletions(-)
Toggle diff (69 lines)
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 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)))
(native-search-paths
(list
--
2.29.2
From 431e6802aa1fd5533db7b7fb695b5c840ba4e289 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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(+)
Toggle diff (46 lines)
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))
+(define-public meanwhile
+ (package
+ (name "meanwhile")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/obriencj/meanwhile.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1k1gvmx1ikm0y1mdmm495rzkb00pl170jfaf2dy0n5aiiknkk7q3"))))
+ (build-system glib-or-gtk-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("doxygen" ,doxygen)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ `(("glib" ,glib)))
+ (synopsis "Library for Lotus Instant Messaging")
+ (description "Meanwhile is a library for connecting to a LIM (Lotus Instant
+Messaging, formerly Lotus Sametime, formerly VPBuddy) community. It uses a
+protocol based in part off of the IMPP draft(*1), and in part off of traces of
+TCP sessions from existing clients.")
+ (home-page "https://github.com/obriencj/meanwhile")
+ (license license:lgpl3)))
+
(define-public poezio
(package
(name "poezio")
--
2.29.2
From df0cd86a37aee77b91ca38c1fb79deef14303a6d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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(+)
Toggle diff (57 lines)
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))
+(define-public silc-toolkit
+ (package
+ (name "silc-toolkit")
+ (version "1.1.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://sourceforge/silc/silc/toolkit/sources/silc-toolkit-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "0mnvf9n7qriadg0p7a8qmvcayhnns2g9fhmcymavlm0v8xrky33y"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "--disable-static"
+ "--enable-ipv6"
+ "--enable-stack-trace")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'trigger-bootstrap
+ (lambda _
+ (delete-file "configure")
+ (delete-file "Makefile.in")
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "SILC ToolKit")
+ (description "SILC (Secure Internet Live Conferencing) is a modern and secure
+conferencing protocol. It provides all the common conferencing services like
+private messages, instant messages, channels and groups, and video and audio
+conferencing.")
+ (home-page "https://silc.github.io/info")
+ (license
+ ;; Dual-licensed
+ (list
+ license:gpl2+
+ license:bsd-2))))
+
(define-public meanwhile
(package
(name "meanwhile")
--
2.29.2
From 577a476e8c947ff14a49f6b00d49034100ba91c4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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(+)
Toggle diff (66 lines)
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))
+(define-public libgadu
+ (package
+ (name "libgadu")
+ (version "1.12.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/wojtekka/libgadu.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "--disable-static")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-shebangs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "protobufgen.sh"
+ (("/bin/sh")
+ (string-append (assoc-ref inputs "bash")
+ "/bin/sh")))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("bash" ,bash)
+ ("doxygen" ,doxygen)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("libprotobuf-c" ,protobuf-c)
+ ("libxml" ,libxml2)
+ ("openssl" ,openssl)
+ ("zlib" ,zlib)))
+ (propagated-inputs
+ `(("gnutls" ,gnutls)))
+ (synopsis "Library for handling the protocol of Gadu-Gadu")
+ (description "LibGadu is library for handling Gadu-Gadu instant messenger
+protocol. The library is written in C and aims to be operating system and
+environment independent.")
+ (home-page "https://libgadu.net/index.en.html")
+ (license license:lgpl2.1+)))
+
(define-public silc-toolkit
(package
(name "silc-toolkit")
--
2.29.2
From 3880462f5dbd1c43b8d717926e9a1ba77d645022 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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(+)
Toggle diff (82 lines)
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))
+(define-public libgnt
+ (package
+ (name "libgnt")
+ (version "2.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://sourceforge/pidgin/libgnt/"
+ version "/libgnt-" version ".tar.xz"))
+ (sha256
+ (base32 "1grs9fxl404rscscxk1ff55fzjnwjqrisjxbasbssmcp1h1s4zkb"))))
+ (build-system meson-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-ncurses-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "meson.build"
+ (("'/usr'")
+ (string-append "'"
+ (assoc-ref inputs "ncurses")
+ "'")))
+ #t))
+ (add-before 'configure 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "doc"
+ (substitute* "libgnt-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t))))))
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.1.2)
+ ("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("ncurses" ,ncurses)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("libxml" ,libxml2)
+ ("python" ,python-2)))
+ (synopsis "GLib Ncurses Toolkit")
+ (description "GNT is an ncurses toolkit for creating text-mode graphical
+user interfaces in a fast and easy way. It is based on GLib and ncurses.")
+ (home-page "https://keep.imfreedom.org/libgnt/libgnt")
+ (license license:gpl2+)))
+
(define-public libgadu
(package
(name "libgadu")
--
2.29.2
From 1bd47c8d21bc1070186d638bdb884a06a0ab95d6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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=]: 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(-)
Toggle diff (110 lines)
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="
(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-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
--
2.29.2
From 1a11875402c5abb066a32143ef55a6a011d73b3e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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]<origin>[sha256]: Modify base32.
[patches]<search-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
Toggle diff (115 lines)
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 = \
%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.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 <me@tobias.gr>
-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