about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2010-06-03 15:14:29 +0000
committerMarc Weber <marco-oweber@gmx.de>2010-06-03 15:14:29 +0000
commitcfec54817471863141c89eec58f12b094f4ee265 (patch)
tree477d239ab4c20c0d667f175d7a401443eb5f4c8f /pkgs/applications/networking/instant-messengers
parente8fc7c3d9e2f059180a67f687ba6e4d29850ba4d (diff)
downloadnixlib-cfec54817471863141c89eec58f12b094f4ee265.tar
nixlib-cfec54817471863141c89eec58f12b094f4ee265.tar.gz
nixlib-cfec54817471863141c89eec58f12b094f4ee265.tar.bz2
nixlib-cfec54817471863141c89eec58f12b094f4ee265.tar.lz
nixlib-cfec54817471863141c89eec58f12b094f4ee265.tar.xz
nixlib-cfec54817471863141c89eec58f12b094f4ee265.tar.zst
nixlib-cfec54817471863141c89eec58f12b094f4ee265.zip
[PATCH] Fix pidgin-sipe plugin to build with latest pidgin - contributed
by David Brown

svn path=/nixpkgs/trunk/; revision=22129
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch27
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index b80f81010da6..d842dc9364b0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
   };
 
+  patches = [ ./fix-2.7.0.patch ];
+
   meta = {
     description = "SIPE plugin for Pidgin IM.";
     homepage = http://sipe.sourceforge.net/;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
new file mode 100644
index 000000000000..cecfa8a18e49
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch
@@ -0,0 +1,27 @@
+From 8ad28171ac5c3fbd1917a2f52e75423c4d357b24 Mon Sep 17 00:00:00 2001
+From: David Brown <nix@davidb.org>
+Date: Thu, 3 Jun 2010 06:40:04 -0700
+Subject: [PATCH] Fix initializer for 2.7.0 release
+
+The release of 2.7.0 of pidgin/purple gained two extra fields in a
+structure.
+---
+ src/core/sipe.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/core/sipe.c b/src/core/sipe.c
+index 45a9015..19f4237 100644
+--- a/src/core/sipe.c
++++ b/src/core/sipe.c
+@@ -10683,6 +10683,8 @@ PurplePluginProtocolInfo prpl_info =
+ 	NULL,					/* get_media_caps */
+ #if PURPLE_VERSION_CHECK(2,7,0)
+ 	NULL,					/* get_moods */
++	NULL,					/* set_public_alias */
++	NULL,					/* get_public_alias */
+ #endif
+ #endif
+ #endif
+-- 
+1.7.1
+