Author: raskin Date: Wed Dec 29 19:20:55 2010 New Revision: 25323 URL: https://svn.nixos.org/websvn/nix/?rev=25323&sc=1
Log: Adding freetalk Added: nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/ nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/default.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Added: nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff Wed Dec 29 19:20:55 2010 (r25323) @@ -0,0 +1,25 @@ +Description: Patch to fix FTBFS due to a modified const in src/callbacks.cc +Forwarded: yes +Origin: Ubuntu, +https://bugs.launchpad.net/ubuntu/+source/freetalk/+bug/443241 +Bug-Debian: http://bugs.debian.org/560535 +Author: Jon Bernard <[email protected]> +--- 3.2-1.orig/src/callbacks.cc 2008-11-15 10:41:22.000000000 +0000 ++++ 3.2-1/src/callbacks.cc 2009-10-21 15:50:49.000000000 +0100 +@@ -116,13 +116,13 @@ ft_msg_msg_handler (LmMessageHandler *ha + LmMessage *msg, gpointer user_data) + { + LmMessageNode *root, *body, *x; +- const char *from, *msg_str, *type; +- char *ts = NULL; ++ const char *msg_str, *type; ++ char *from, *ts = NULL; + + root = lm_message_get_node (msg); + body = lm_message_node_get_child (root, "body"); + +- from = lm_message_node_get_attribute (msg->node, "from"); ++ from = (char *) lm_message_node_get_attribute (msg->node, "from"); + + /* since the file-transfer happens in-band with messages, we can no longer + * ignore messages with no 'body' */ Added: nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/default.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/applications/networking/instant-messengers/freetalk/default.nix Wed Dec 29 19:20:55 2010 (r25323) @@ -0,0 +1,51 @@ +...@{builderdefspackage + , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool + , libunwind, ncurses + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="freetalk"; + version="3.2"; + name="${baseName}-${version}"; + url="mirror://savannah/${baseName}/${name}.tar.gz"; + hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + patches = [./01_callbacks_const_fix.diff]; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + + meta = { + description = "Console XMPP client"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.gpl3Plus; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.gnu.org/software/freetalk/";; + }; + }; +}) x + Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Dec 29 19:19:56 2010 (r25322) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Dec 29 19:20:55 2010 (r25323) @@ -632,6 +632,8 @@ withX11 = true; }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk {}; + ftgl = callPackage ../development/libraries/ftgl { }; dos2unix = callPackage ../tools/text/dos2unix { }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
