diff options
| author | Shea Levy <shea@shealevy.com> | 2011-11-02 00:19:19 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-11-02 00:19:19 +0000 |
| commit | 3447d62e640c18fc46340114ee728f29d6062923 (patch) | |
| tree | f3c5092e194002e114ab6de6404228fa55d9b118 /pkgs/applications/networking/instant-messengers/pidgin-plugins | |
| parent | 3419ae4fdd046d24836b53c73cbe5b929193d83e (diff) | |
pidgin-sipe: Bump to 1.12.0
svn path=/nixpkgs/trunk/; revision=30177
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/pidgin-plugins')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch | 27 |
2 files changed, 3 insertions, 32 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 02fbc9643b714..e8afdb37cbc4a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, pidgin, intltool, libxml2 }: -let version = "1.10.0"; in +let version = "1.12.0"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { - url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz"; - sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np"; + url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; + sha256 = "12ki6n360v2ja961fzw4mwpgb8jdp9k21y5mbiab151867c862r6"; }; - 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 deleted file mode 100644 index cecfa8a18e49e..0000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - |