From 554169f5cb4434873c60843ecfe63a7ad85f7530 Mon Sep 17 00:00:00 2001 From: Chris Dorman Date: Sun, 29 Nov 2020 16:37:12 -0800 Subject: [PATCH] Added bitchx patches due to less bloated dependencies over irssi --- build-extensions | 30 +++++++++++++++--------------- patches/bitchx-configure.in.patch | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 patches/bitchx-configure.in.patch diff --git a/build-extensions b/build-extensions index 615f200..9e56cda 100755 --- a/build-extensions +++ b/build-extensions @@ -21,7 +21,7 @@ zlibmirror="https://zlib.net" termcapmirror="https://ftp.gnu.org/gnu/termcap" htopmirror="https://github.com/htop-dev/htop/archive" islmirror="http://isl.gforge.inria.fr" -irssimirror="https://github.com/irssi/irssi/releases/download/1.2.2" +bitchxmirror="git://git.code.sf.net/p/bitchx/git" # filenames gcc="gcc-9.2.0.tar.xz" @@ -36,7 +36,6 @@ gmp="gmp-6.1.2.tar.xz" mpfr="mpfr-4.0.2.tar.xz" mpc="mpc-1.1.0.tar.gz" isl="isl-0.19.tar.xz" -irssi="irssi-1.2.2.tar.xz" # work directories tmpdir="`pwd`/pkgsrc" @@ -56,7 +55,6 @@ mpfrsrcdir=${mpfr//.tar.xz} binutilssrcdir=${binutils//.tar.xz} gmpsrcdir=${gmp//.tar.xz} islsrcdir=${isl//.tar.xz} -irssisrcdir=${irssi//.tar.xz} if [ ! -d "$tmpdir" ]; then echo "Warning: package source directory not found, creating." @@ -386,26 +384,28 @@ isl() # IRC clients / servers # Because why not! :D -irssi() +bitchx() { cd $tmpdir - # Downloading IRSSI sources - if [ ! -f "$irssi" ]; then - echo "Downloading IRSSI sources..." - wget $irssimirror/$irssi - tar -xf $irssi + # Grab latest sources of community devel BitchX + if [ ! -d "bitchx" ]; then + git clone $bitchxmirror BitchX fi - - cd $irssisrcdir + cd BitchX + + # Configure patch: checks if ncurses calls tputs compile / with later ncurses libraries + # Patch from: http://www.mit.edu/afs.new/sipb/user/ssen/src/BitchX/contrib/BitchX-configure.patch + # Patch BitchX + patch -u configure.in -i ../../patches/bitchx-configure.in.patch + + # Configure and build + install ./configure --prefix=$freondir - - make -j$corecount + make -j20 make install - + cd $tmpdir - } case $1 in diff --git a/patches/bitchx-configure.in.patch b/patches/bitchx-configure.in.patch new file mode 100644 index 0000000..3a38d3d --- /dev/null +++ b/patches/bitchx-configure.in.patch @@ -0,0 +1,19 @@ +diff -ru BitchX/configure.in BitchX.AX/configure.in +--- BitchX/configure.in Tue Jan 4 07:43:35 2000 ++++ BitchX.AX/configure.in Wed Jan 19 17:54:30 2000 +@@ -290,6 +290,15 @@ + + if test x"$blahhack" = x"1"; then + blahhack=0 ++ AC_MSG_CHECKING(for tputs in ncurses/termcap.h) ++ AC_EGREP_CPP([tputs( | |\()],[#include ++ ], [ AC_DEFINE(HAVE_TERMCAP_H) ++ AC_MSG_RESULT(yes) ++ havetputs=1 AC_CHECK_HEADER(ncurses/termcap.h)], blahhack=1; AC_MSG_RESULT(no)) ++ fi ++ ++ if test x"$blahhack" = x"1"; then ++ blahhack=0 + AC_MSG_CHECKING(for tputs in curses.h) + AC_EGREP_CPP([tputs( | |\()],[#include + ], [ AC_DEFINE(USING_CURSES)