From: Raghav Gururajan <rg@raghavgururajan.name>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: 44957@debbugs.gnu.org
Subject: [bug#44957] [PIDGIN]: v4
Date: Wed, 30 Dec 2020 16:08:49 -0500 [thread overview]
Message-ID: <0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name> (raw)
In-Reply-To: <20201228185058.0591ede5@scratchpost.org>
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
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.
[-- Attachment #2: 0001-gnu-pidgin-Make-some-cosmetic-changes.patch --]
[-- Type: text/x-patch, Size: 4176 bytes --]
From e17531589b5da1b2c8dce1a8fc80644ef7ea2885 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #3: 0002-gnu-pidgin-Re-arrange-inputs-in-alphabetical-order.patch --]
[-- Type: text/x-patch, Size: 2590 bytes --]
From fc7ce2f83d86ac05bc9f8a5c53a39cae0e4c5724 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #4: 0003-gnu-pidgin-Enable-some-features.patch --]
[-- Type: text/x-patch, Size: 4316 bytes --]
From 7b551da2dca1fc6c182580b7d71764b539170477 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #5: 0004-gnu-pidgin-Upgrade-to-2.14.1.patch --]
[-- Type: text/x-patch, Size: 4866 bytes --]
From 9cbedf2e7452708cac7253d5a63b81e1b3869230 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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]<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
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 <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
[-- Attachment #6: 0005-gnu-pidgin-Enable-MultiMedia-and-A-V-support.patch --]
[-- Type: text/x-patch, Size: 4477 bytes --]
From c954c91e1ff55b6ec7420ea37e95a40349a66228 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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]<search-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
[-- Attachment #7: 0006-gnu-libotr-Make-some-cosmetic-changes.patch --]
[-- Type: text/x-patch, Size: 3529 bytes --]
From 6f4dbf4638553a06f477a6ce59781eb6e6b1877f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
[-- Attachment #8: 0007-gnu-libotr-Update-license.patch --]
[-- Type: text/x-patch, Size: 886 bytes --]
From 366c6063922ef4fa1891038e7d2d9260c08092f3 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
[-- Attachment #9: 0008-gnu-pidgin-otr-Make-some-cosmetic-changes.patch --]
[-- Type: text/x-patch, Size: 3496 bytes --]
From d859d7b6c97e34b73daa698bc1cba58e46a27cc7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #10: 0009-gnu-pidgin-otr-Update-license.patch --]
[-- Type: text/x-patch, Size: 976 bytes --]
From c38c89f22e7604e9307697a1290c55dfcd4cf3b6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #11: 0010-gnu-pidgin-otr-Add-some-inputs.patch --]
[-- Type: text/x-patch, Size: 1255 bytes --]
From 9da370d9cbad01394dc16f19039503e755c60345 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
next prev parent reply other threads:[~2020-12-30 21:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 0:54 [bug#44957] Pidgin Raghav Gururajan
2020-11-30 3:46 ` [bug#44957] [PIDGIN]: v2 Raghav Gururajan
2020-11-30 6:22 ` [bug#44957] [PIDGIN]: v3 Raghav Gururajan
2020-11-30 9:16 ` Danny Milosavljevic
2020-11-30 23:45 ` Raghav Gururajan
2020-12-01 22:42 ` [bug#44957] [PIDGIN]: v4 Raghav Gururajan
2020-12-28 17:50 ` Danny Milosavljevic
2020-12-30 21:08 ` Raghav Gururajan [this message]
2020-12-31 0:54 ` Danny Milosavljevic
2020-12-31 5:37 ` Raghav Gururajan
2021-01-03 16:30 ` bug#44957: " Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f5a0572-1c6e-cd3b-2253-66d9fdfc2572@raghavgururajan.name \
--to=rg@raghavgururajan.name \
--cc=44957@debbugs.gnu.org \
--cc=dannym@scratchpost.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).