[arch-commits] Commit in freetalk/repos (14 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Aug 25 13:09:31 UTC 2014
Date: Monday, August 25, 2014 @ 15:09:30
Author: spupykin
Revision: 117871
archrelease: copy trunk to community-i686, community-x86_64
Added:
freetalk/repos/community-i686/ChangeLog
(from rev 117870, freetalk/trunk/ChangeLog)
freetalk/repos/community-i686/PKGBUILD
(from rev 117870, freetalk/trunk/PKGBUILD)
freetalk/repos/community-i686/freetalk.install
(from rev 117870, freetalk/trunk/freetalk.install)
freetalk/repos/community-x86_64/ChangeLog
(from rev 117870, freetalk/trunk/ChangeLog)
freetalk/repos/community-x86_64/PKGBUILD
(from rev 117870, freetalk/trunk/PKGBUILD)
freetalk/repos/community-x86_64/freetalk.install
(from rev 117870, freetalk/trunk/freetalk.install)
Deleted:
freetalk/repos/community-i686/ChangeLog
freetalk/repos/community-i686/PKGBUILD
freetalk/repos/community-i686/freetalk-3.2-glibc210.patch
freetalk/repos/community-i686/freetalk.install
freetalk/repos/community-x86_64/ChangeLog
freetalk/repos/community-x86_64/PKGBUILD
freetalk/repos/community-x86_64/freetalk-3.2-glibc210.patch
freetalk/repos/community-x86_64/freetalk.install
----------------------------------------------+
/ChangeLog | 6 ++
/PKGBUILD | 56 ++++++++++++++++++++
/freetalk.install | 38 +++++++++++++
community-i686/ChangeLog | 3 -
community-i686/PKGBUILD | 36 -------------
community-i686/freetalk-3.2-glibc210.patch | 68 -------------------------
community-i686/freetalk.install | 19 ------
community-x86_64/ChangeLog | 3 -
community-x86_64/PKGBUILD | 36 -------------
community-x86_64/freetalk-3.2-glibc210.patch | 68 -------------------------
community-x86_64/freetalk.install | 19 ------
11 files changed, 100 insertions(+), 252 deletions(-)
Deleted: community-i686/ChangeLog
===================================================================
--- community-i686/ChangeLog 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-i686/ChangeLog 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,3 +0,0 @@
-2007-07-02 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-
Copied: freetalk/repos/community-i686/ChangeLog (from rev 117870, freetalk/trunk/ChangeLog)
===================================================================
--- community-i686/ChangeLog (rev 0)
+++ community-i686/ChangeLog 2014-08-25 13:09:30 UTC (rev 117871)
@@ -0,0 +1,3 @@
+2007-07-02 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-i686/PKGBUILD 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=freetalk
-pkgver=3.2
-pkgrel=6
-pkgdesc="A console based Jabber client"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/freetalk"
-license=('GPL')
-depends=('loudmouth' 'guile1.8')
-install=freetalk.install
-source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz
- freetalk-3.2-glibc210.patch)
-md5sums=('ab09bd07dde158551f151d281b14642c'
- '0da1d0a0f606d2b279fe676a80a3eb32')
-
-prepare(){
- cd $pkgname-$pkgver
- patch -Np1 -i ../freetalk-3.2-glibc210.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --disable-rpath \
- GUILE=/usr/bin/guile1.8 \
- GUILE_CONFIG=/usr/bin/guile-config1.8
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- rm "$pkgdir/usr/share/info/dir"
-}
Copied: freetalk/repos/community-i686/PKGBUILD (from rev 117870, freetalk/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-25 13:09:30 UTC (rev 117871)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=freetalk
+pkgver=4.0rc5
+pkgrel=1
+pkgdesc="A console based Jabber client"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/freetalk"
+license=('GPL')
+depends=('loudmouth' 'guile' 'jansson' 'curl')
+install=freetalk.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/GNUFreetalk/freetalk/archive/v$pkgver.tar.gz")
+md5sums=('a19a6025a13ef9f922606a843f892b4d')
+
+build() {
+ cd $pkgname-$pkgver
+ [ -x configure ] || ./autogen.sh
+ ./configure --prefix=/usr --disable-rpath
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm "$pkgdir/usr/share/info/dir"
+}
Deleted: community-i686/freetalk-3.2-glibc210.patch
===================================================================
--- community-i686/freetalk-3.2-glibc210.patch 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-i686/freetalk-3.2-glibc210.patch 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,68 +0,0 @@
-diff -urNp freetalk-3.2.orig/src/callbacks.cc freetalk-3.2/src/callbacks.cc
---- freetalk-3.2.orig/src/callbacks.cc 2009-02-25 01:31:29.826691032 +0530
-+++ freetalk-3.2/src/callbacks.cc 2009-02-25 02:56:04.323962193 +0530
-@@ -1,7 +1,7 @@
- /*
- callbacks.c: Callback functions
-
-- Copyright (c) 2005, 2006, 2007 Freetalk Core Team
-+ Copyright (c) 2005, 2006, 2007, 2009 Freetalk Core Team
- This file is part of GNU Freetalk.
-
- Freetalk is free software; you can redistribute it and/or modify
-@@ -20,6 +20,7 @@
- */
-
- #include <stdio.h>
-+#include <string>
- #include <string.h>
- #include <stdlib.h>
- #include <glib.h>
-@@ -116,8 +117,9 @@ ft_msg_msg_handler (LmMessageHandler *ha
- LmMessage *msg, gpointer user_data)
- {
- LmMessageNode *root, *body, *x;
-- const char *from, *msg_str, *type;
-+ const char *msg_str, *type;
- char *ts = NULL;
-+ std::string from;
-
- root = lm_message_get_node (msg);
- body = lm_message_node_get_child (root, "body");
-@@ -152,11 +154,12 @@ ft_msg_msg_handler (LmMessageHandler *ha
- set_hook_return (0);
- /* TBD : make the below stripping of /Resource configurable */
- if (1) {
-- if (strchr (from, '/'))
-- *strchr (from, '/') = '\0';
-+ const size_t pos = from.find("/");
-+ if (pos != std::string::npos)
-+ from.replace(pos, from.size() - pos, "");
- }
- {
-- FtRosterItem *item = ft_roster_lookup (from);
-+ FtRosterItem *item = ft_roster_lookup (from.c_str());
- char *nickname;
-
- if (!item)
-@@ -166,17 +169,17 @@ ft_msg_msg_handler (LmMessageHandler *ha
-
- scm_run_hook (ex_message_receive_hook,
- scm_list_n (ts ? scm_from_locale_string (ts) : scm_from_locale_string (""),
-- scm_from_locale_string (from),
-+ scm_from_locale_string (from.c_str()),
- nickname ? scm_from_locale_string (nickname) : scm_from_locale_string (""),
- scm_from_locale_string (msg_str),
- SCM_UNDEFINED));
- }
- if (ts) g_free (ts);
-
-- if (get_hook_return () == 1)
-+ if (get_hook_return () == 1)
- return LM_HANDLER_RESULT_REMOVE_MESSAGE;
-
-- PRINTF ("%s: %s", from, msg_str);
-+ PRINTF ("%s: %s", from.c_str(), msg_str);
- } else {
- /* This logic should be looked into : FIXME */
- ft_send_file_message_data (msg);
Deleted: community-i686/freetalk.install
===================================================================
--- community-i686/freetalk.install 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-i686/freetalk.install 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,19 +0,0 @@
-info_dir=/usr/share/info
-info_files=(freetalk)
-
-post_install() {
- for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
- done
-}
-
Copied: freetalk/repos/community-i686/freetalk.install (from rev 117870, freetalk/trunk/freetalk.install)
===================================================================
--- community-i686/freetalk.install (rev 0)
+++ community-i686/freetalk.install 2014-08-25 13:09:30 UTC (rev 117871)
@@ -0,0 +1,19 @@
+info_dir=/usr/share/info
+info_files=(freetalk)
+
+post_install() {
+ for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
+ done
+}
+
Deleted: community-x86_64/ChangeLog
===================================================================
--- community-x86_64/ChangeLog 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-x86_64/ChangeLog 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,3 +0,0 @@
-2007-07-02 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-
Copied: freetalk/repos/community-x86_64/ChangeLog (from rev 117870, freetalk/trunk/ChangeLog)
===================================================================
--- community-x86_64/ChangeLog (rev 0)
+++ community-x86_64/ChangeLog 2014-08-25 13:09:30 UTC (rev 117871)
@@ -0,0 +1,3 @@
+2007-07-02 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-x86_64/PKGBUILD 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=freetalk
-pkgver=3.2
-pkgrel=6
-pkgdesc="A console based Jabber client"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/freetalk"
-license=('GPL')
-depends=('loudmouth' 'guile1.8')
-install=freetalk.install
-source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz
- freetalk-3.2-glibc210.patch)
-md5sums=('ab09bd07dde158551f151d281b14642c'
- '0da1d0a0f606d2b279fe676a80a3eb32')
-
-prepare(){
- cd $pkgname-$pkgver
- patch -Np1 -i ../freetalk-3.2-glibc210.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --disable-rpath \
- GUILE=/usr/bin/guile1.8 \
- GUILE_CONFIG=/usr/bin/guile-config1.8
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- rm "$pkgdir/usr/share/info/dir"
-}
Copied: freetalk/repos/community-x86_64/PKGBUILD (from rev 117870, freetalk/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-25 13:09:30 UTC (rev 117871)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=freetalk
+pkgver=4.0rc5
+pkgrel=1
+pkgdesc="A console based Jabber client"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/freetalk"
+license=('GPL')
+depends=('loudmouth' 'guile' 'jansson' 'curl')
+install=freetalk.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/GNUFreetalk/freetalk/archive/v$pkgver.tar.gz")
+md5sums=('a19a6025a13ef9f922606a843f892b4d')
+
+build() {
+ cd $pkgname-$pkgver
+ [ -x configure ] || ./autogen.sh
+ ./configure --prefix=/usr --disable-rpath
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm "$pkgdir/usr/share/info/dir"
+}
Deleted: community-x86_64/freetalk-3.2-glibc210.patch
===================================================================
--- community-x86_64/freetalk-3.2-glibc210.patch 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-x86_64/freetalk-3.2-glibc210.patch 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,68 +0,0 @@
-diff -urNp freetalk-3.2.orig/src/callbacks.cc freetalk-3.2/src/callbacks.cc
---- freetalk-3.2.orig/src/callbacks.cc 2009-02-25 01:31:29.826691032 +0530
-+++ freetalk-3.2/src/callbacks.cc 2009-02-25 02:56:04.323962193 +0530
-@@ -1,7 +1,7 @@
- /*
- callbacks.c: Callback functions
-
-- Copyright (c) 2005, 2006, 2007 Freetalk Core Team
-+ Copyright (c) 2005, 2006, 2007, 2009 Freetalk Core Team
- This file is part of GNU Freetalk.
-
- Freetalk is free software; you can redistribute it and/or modify
-@@ -20,6 +20,7 @@
- */
-
- #include <stdio.h>
-+#include <string>
- #include <string.h>
- #include <stdlib.h>
- #include <glib.h>
-@@ -116,8 +117,9 @@ ft_msg_msg_handler (LmMessageHandler *ha
- LmMessage *msg, gpointer user_data)
- {
- LmMessageNode *root, *body, *x;
-- const char *from, *msg_str, *type;
-+ const char *msg_str, *type;
- char *ts = NULL;
-+ std::string from;
-
- root = lm_message_get_node (msg);
- body = lm_message_node_get_child (root, "body");
-@@ -152,11 +154,12 @@ ft_msg_msg_handler (LmMessageHandler *ha
- set_hook_return (0);
- /* TBD : make the below stripping of /Resource configurable */
- if (1) {
-- if (strchr (from, '/'))
-- *strchr (from, '/') = '\0';
-+ const size_t pos = from.find("/");
-+ if (pos != std::string::npos)
-+ from.replace(pos, from.size() - pos, "");
- }
- {
-- FtRosterItem *item = ft_roster_lookup (from);
-+ FtRosterItem *item = ft_roster_lookup (from.c_str());
- char *nickname;
-
- if (!item)
-@@ -166,17 +169,17 @@ ft_msg_msg_handler (LmMessageHandler *ha
-
- scm_run_hook (ex_message_receive_hook,
- scm_list_n (ts ? scm_from_locale_string (ts) : scm_from_locale_string (""),
-- scm_from_locale_string (from),
-+ scm_from_locale_string (from.c_str()),
- nickname ? scm_from_locale_string (nickname) : scm_from_locale_string (""),
- scm_from_locale_string (msg_str),
- SCM_UNDEFINED));
- }
- if (ts) g_free (ts);
-
-- if (get_hook_return () == 1)
-+ if (get_hook_return () == 1)
- return LM_HANDLER_RESULT_REMOVE_MESSAGE;
-
-- PRINTF ("%s: %s", from, msg_str);
-+ PRINTF ("%s: %s", from.c_str(), msg_str);
- } else {
- /* This logic should be looked into : FIXME */
- ft_send_file_message_data (msg);
Deleted: community-x86_64/freetalk.install
===================================================================
--- community-x86_64/freetalk.install 2014-08-25 13:09:14 UTC (rev 117870)
+++ community-x86_64/freetalk.install 2014-08-25 13:09:30 UTC (rev 117871)
@@ -1,19 +0,0 @@
-info_dir=/usr/share/info
-info_files=(freetalk)
-
-post_install() {
- for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
- done
-}
-
Copied: freetalk/repos/community-x86_64/freetalk.install (from rev 117870, freetalk/trunk/freetalk.install)
===================================================================
--- community-x86_64/freetalk.install (rev 0)
+++ community-x86_64/freetalk.install 2014-08-25 13:09:30 UTC (rev 117871)
@@ -0,0 +1,19 @@
+info_dir=/usr/share/info
+info_files=(freetalk)
+
+post_install() {
+ for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.info ${info_dir}/dir 2> /dev/null
+ done
+}
+
More information about the arch-commits
mailing list