diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
commit | 415856bdd4f48ab4f2732996f0bae58595092bbe (patch) | |
tree | ede2018b591f6dfb477fe9341ba17b9bc000fab9 /community/ircii-pana |
Tue Apr 5 14:26:38 UTC 2011
Diffstat (limited to 'community/ircii-pana')
-rw-r--r-- | community/ircii-pana/PKGBUILD | 52 | ||||
-rw-r--r-- | community/ircii-pana/bitchx-1.1-64bit.diff | 24 | ||||
-rw-r--r-- | community/ircii-pana/bitchx-1.1-freenode.diff | 31 | ||||
-rw-r--r-- | community/ircii-pana/bitchx-1.1-gcc43.diff | 118 | ||||
-rw-r--r-- | community/ircii-pana/bitchx-1.1-inline.diff | 12 | ||||
-rw-r--r-- | community/ircii-pana/bitchx-1.1-latin1.diff | 12 |
6 files changed, 249 insertions, 0 deletions
diff --git a/community/ircii-pana/PKGBUILD b/community/ircii-pana/PKGBUILD new file mode 100644 index 000000000..ebbd841a0 --- /dev/null +++ b/community/ircii-pana/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 22406 2010-07-21 18:30:48Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@seznam.cz> +# inspired by Gentoo: http://kambing.ui.edu/gentoo-portage/net-irc/bitchx/files/ + +pkgname=ircii-pana +pkgver=1.1 +pkgrel=4 +pkgdesc="A console-based IRC client - AKA BitchX." +arch=('i686' 'x86_64') +url="http://www.bitchx.org" +license=('GPL2') +depends=('ncurses') +makedepends=('patch') +source=(http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz \ + bitchx-${pkgver}-gcc43.diff \ + bitchx-${pkgver}-inline.diff \ + bitchx-${pkgver}-freenode.diff \ + bitchx-${pkgver}-latin1.diff \ + bitchx-${pkgver}-64bit.diff) + +md5sums=('611d2dda222f00c10140236f4c331572' + 'e1efc5e52658e6651918e07a116bce18' + '4824ffd55d51099dd9ee035f4b78d6bf' + '741e91dd6267d3436c43756429342217' + '9316105f23a67a9bb7ecfc7485dcd098' + 'c86f7758db7f438d726fd447dd4a83b0') + +build() { + cd ${srcdir}/BitchX + + patch -Np1 -i ${srcdir}/bitchx-${pkgver}-gcc43.diff || return 1 + patch -Np1 -i ${srcdir}/bitchx-${pkgver}-inline.diff || return 1 + patch -Np1 -i ${srcdir}/bitchx-${pkgver}-freenode.diff || return 1 + patch -Np1 -i ${srcdir}/bitchx-${pkgver}-latin1.diff || return 1 + + if [ "$CARCH" == "x86_64" ] ; then + patch -Np1 -i ${srcdir}/bitchx-${pkgver}-64bit.diff || return 1 + fi + + ./configure --prefix=/usr + make || return 1 + make prefix=${pkgdir}/usr install + +#we don't want to link to ${pkgdir}, correcting it then + cd ${pkgdir}/usr/bin || return 1 + rm -f BitchX && ln -s BitchX-${pkgver}-final BitchX || return 1 + +#correcting man page + rm -rf ${pkgdir}/usr/man || return 1 + install -D -m644 ${srcdir}/BitchX/doc/BitchX.1 ${pkgdir}/usr/share/man/man1/BitchX.1 || return 1 +} diff --git a/community/ircii-pana/bitchx-1.1-64bit.diff b/community/ircii-pana/bitchx-1.1-64bit.diff new file mode 100644 index 000000000..ec3155f04 --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-64bit.diff @@ -0,0 +1,24 @@ +diff -ruN BitchX-orig/include/module.h BitchX/include/module.h +--- BitchX-orig/include/module.h 2003-04-11 03:09:07.000000000 +0200 ++++ BitchX/include/module.h 2008-10-04 19:28:13.000000000 +0200 +@@ -15,7 +15,7 @@ + + #include "struct.h" + +-typedef int (*Function_ptr)(); ++typedef long (*Function_ptr)(); + + #ifdef WANT_DLL + #ifdef HPUX +diff -ruN BitchX-orig/include/modval.h BitchX/include/modval.h +--- BitchX-orig/include/modval.h 2003-04-11 03:09:07.000000000 +0200 ++++ BitchX/include/modval.h 2008-10-04 19:28:13.000000000 +0200 +@@ -318,7 +318,7 @@ + #define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x))) + #define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y))) + #define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x))) +-#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x))) ++#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x))) + #define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x))) + #define get_window_by_name(x) ((Window *) (global[GET_WINDOW_BY_NAME]((char *)x))) + #define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y))) diff --git a/community/ircii-pana/bitchx-1.1-freenode.diff b/community/ircii-pana/bitchx-1.1-freenode.diff new file mode 100644 index 000000000..1040b598f --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-freenode.diff @@ -0,0 +1,31 @@ +diff -ruN BitchX-orig/include/config.h BitchX/include/config.h +--- BitchX-orig/include/config.h 2003-07-26 09:00:32.000000000 +0200 ++++ BitchX/include/config.h 2008-10-04 19:25:45.000000000 +0200 +@@ -37,7 +37,26 @@ + * + * List last updated: 03/24/01. -dialtone. + */ +-#define DEFAULT_SERVER "[efnet] "\ ++#define DEFAULT_SERVER "[freenode] "\ ++ "irc.freenode.net "\ ++ "vinge.freenode.net "\ ++ "truong.freenode.net "\ ++ "stephenson.freenode.net "\ ++ "orwell.freenode.net "\ ++ "leguin.freenode.net "\ ++ "kornbluth.freenode.net "\ ++ "jordan.freenode.net "\ ++ "herbert.freenode.net "\ ++ "goethe.freenode.net "\ ++ "gibson.freenode.net "\ ++ "gerrold.freenode.net "\ ++ "carter.freenode.net "\ ++ "carneiro.freenode.net "\ ++ "capek.freenode.net "\ ++ "calkins.freenode.net "\ ++ "brin.freenode.net "\ ++ "adams.freenode.net "\ ++ "[efnet] "\ + "irc.foxlink.net "\ + "irc.weblook2k.com "\ + "irc.wh.verio.net "\ diff --git a/community/ircii-pana/bitchx-1.1-gcc43.diff b/community/ircii-pana/bitchx-1.1-gcc43.diff new file mode 100644 index 000000000..b83ccfd45 --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-gcc43.diff @@ -0,0 +1,118 @@ +diff -ruN BitchX-orig/dll/aim/toc/server.c BitchX/dll/aim/toc/server.c +--- BitchX-orig/dll/aim/toc/server.c 2003-04-11 03:09:06.000000000 +0200 ++++ BitchX/dll/aim/toc/server.c 2008-10-04 19:17:25.000000000 +0200 +@@ -7,14 +7,14 @@ + #include <unistd.h> + #include "toc.h" + +-static time_t lastsent = 0; ++time_t lastsent = 0; + time_t login_time = 0; + int my_evil; + int is_idle = 0; + int lag_ms = 0; + int time_to_idle = 600; + int is_away = 0; +-static struct timeval lag_tv; ++struct timeval lag_tv; + + void serv_add_buddy(char *name) + { +diff -ruN BitchX-orig/dll/aim/toc/toc.c BitchX/dll/aim/toc/toc.c +--- BitchX-orig/dll/aim/toc/toc.c 2003-04-11 03:09:06.000000000 +0200 ++++ BitchX/dll/aim/toc/toc.c 2008-10-04 19:17:25.000000000 +0200 +@@ -39,9 +39,9 @@ + #include "toc.h" + + /* descriptor for talking to TOC */ +-static int toc_fd; +-static int seqno; +-static unsigned int peer_ver=0; ++int toc_fd; ++int seqno; ++unsigned int peer_ver=0; + int state; + /* static int inpa=-1; */ + int permdeny = PERMIT_PERMITALL; +diff -ruN BitchX-orig/include/modval.h BitchX/include/modval.h +--- BitchX-orig/include/modval.h 2003-04-11 03:09:07.000000000 +0200 ++++ BitchX/include/modval.h 2008-10-04 19:17:25.000000000 +0200 +@@ -650,7 +650,7 @@ + #define start_time ((time_t) *((time_t *)global[START_TIME])) + #define idle_time() ((time_t) *((time_t *)global[IDLE_TIME]())) + +-#define loading_global ((int) *((int *)global[LOADING_GLOBAL])) ++#define loading_global (*((int *)global[LOADING_GLOBAL])) + #define target_window (*((Window **)global[TARGET_WINDOW])) + #define current_window (*((Window **)global[CURRENT_WINDOW])) + #define invisible_list (*((Window **)global[INVISIBLE_LIST])) +@@ -665,12 +665,12 @@ + #define dll_variable (*((IrcVariableDll **)global[DLL_VARIABLE])) + #define dll_ctcp (*((CtcpEntryDll **)global[DLL_CTCP])) + #define dll_window (*((WindowDll **)global[DLL_WINDOW])) +-#define window_display ((int) *((int *)global[WINDOW_DISPLAY])) +-#define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG])) ++#define window_display (*((int *)global[WINDOW_DISPLAY])) ++#define status_update_flag (*((int *)global[STATUS_UPDATE_FLAG])) + #define tabkey_array (*((NickTab **)global[TABKEY_ARRAY])) + #define autoreply_array (*((NickTab *)global[AUTOREPLY_ARRAY])) +-#define identd ((int) *((int *)global[IDENTD_SOCKET])) +-#define doing_notice ((int) *((int *)global[DOING_NOTICE])) ++#define identd (*((int *)global[IDENTD_SOCKET])) ++#define doing_notice (*((int *)global[DOING_NOTICE])) + #define last_sent_msg_body (*((char **)global[LAST_SENT_MSG_BODY])) + #define sent_nick (*((char **)global[SENT_NICK])) + +@@ -698,9 +698,9 @@ + #ifdef GUI + #ifndef MAIN_SOURCE + #define lastclicklinedata ((char *) *global[LASTCLICKLINEDATA]) +-#define contextx ((int) *((int *)global[CONTEXTX])) +-#define contexty ((int) *((int *)global[CONTEXTY])) +-#define guiipc ((int) *((int *)global[GUIIPC])) ++#define contextx (*((int *)global[CONTEXTX])) ++#define contexty (*((int *)global[CONTEXTY])) ++#define guiipc (*((int *)global[GUIIPC])) + #endif + #define gui_mutex_lock() ((void (*)(void)) global[GUI_MUTEX_LOCK])() + #define gui_mutex_unlock() ((void (*)(void))global[GUI_MUTEX_UNLOCK])() +diff -ruN BitchX-orig/source/ctcp.c BitchX/source/ctcp.c +--- BitchX-orig/source/ctcp.c 2003-05-27 09:00:22.000000000 +0200 ++++ BitchX/source/ctcp.c 2008-10-04 19:17:25.000000000 +0200 +@@ -176,7 +176,7 @@ + + /* CDE do ops and unban logging */ + +-static char *ctcp_type[] = ++char *ctcp_type[] = + { + "PRIVMSG", + "NOTICE" +diff -ruN BitchX-orig/source/term.c BitchX/source/term.c +--- BitchX-orig/source/term.c 2003-04-11 03:09:07.000000000 +0200 ++++ BitchX/source/term.c 2008-10-04 19:17:25.000000000 +0200 +@@ -91,8 +91,10 @@ + #define Tgetflag(x) tgetflag(x.tname) + #endif + +-extern char *getenv(); +-extern char *tparm(); ++extern char *getenv(const char *name); ++#ifndef TPARM_DECLARED ++extern char *tparm(char *str, ...); ++#endif + + /* + * The old code assumed termcap. termcap is almost always present, but on +diff -ruN BitchX-orig/source/timer.c BitchX/source/timer.c +--- BitchX-orig/source/timer.c 2003-04-11 03:09:07.000000000 +0200 ++++ BitchX/source/timer.c 2008-10-04 19:17:25.000000000 +0200 +@@ -148,7 +148,7 @@ + * This is put here on purpose -- we dont want any of the above functions + * to have any knowledge of this struct. + */ +-static TimerList *PendingTimers; ++TimerList *PendingTimers; + static char *schedule_timer (TimerList *ntimer); + + static char *current_exec_timer = empty_string; diff --git a/community/ircii-pana/bitchx-1.1-inline.diff b/community/ircii-pana/bitchx-1.1-inline.diff new file mode 100644 index 000000000..0ad417678 --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-inline.diff @@ -0,0 +1,12 @@ +diff -ruN BitchX-orig/include/irc_std.h BitchX/include/irc_std.h +--- BitchX-orig/include/irc_std.h 2003-04-11 03:09:07.000000000 +0200 ++++ BitchX/include/irc_std.h 2008-10-04 19:27:29.000000000 +0200 +@@ -98,7 +98,7 @@ + # define __N + # define __inline__ + #else +-# if (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 7) ++# if (__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)) + # define __A(x) __attribute__ ((format (printf, x, x + 1))) + # define __N __attribute__ ((noreturn)) + # else diff --git a/community/ircii-pana/bitchx-1.1-latin1.diff b/community/ircii-pana/bitchx-1.1-latin1.diff new file mode 100644 index 000000000..2a1532daa --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-latin1.diff @@ -0,0 +1,12 @@ +diff -ruN BitchX-orig/include/config.h BitchX/include/config.h +--- BitchX-orig/include/config.h 2003-07-26 09:00:32.000000000 +0200 ++++ BitchX/include/config.h 2008-10-04 19:46:29.000000000 +0200 +@@ -330,7 +330,7 @@ + * + * Is here there any solution to use both fonts nethertheless ? + */ +-#undef LATIN1 ++#define LATIN1 + + /* + * If you use LINUX and non ISO8859-1 fonts with custom screen mapping, |