summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2016-07-27 02:43:33 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-13 07:22:55 +0700
commita1e310615835f1972488f442d068b76df04c3e47 (patch)
treee7721e72a7afd474e930510c6452fd32f6ec71e1 /network
parent808480393e804d6ffcb304e70b1a30691d6e2d7b (diff)
downloadslackbuilds-a1e310615835f1972488f442d068b76df04c3e47.tar.gz
network/irssi_otr: Updated for version 1.0.1.
Diffstat (limited to 'network')
-rw-r--r--network/irssi_otr/irssi_abi_check.diff14
-rw-r--r--network/irssi_otr/irssi_otr.SlackBuild13
-rw-r--r--network/irssi_otr/irssi_otr.info6
3 files changed, 26 insertions, 7 deletions
diff --git a/network/irssi_otr/irssi_abi_check.diff b/network/irssi_otr/irssi_abi_check.diff
new file mode 100644
index 0000000000..cb5f990ff7
--- /dev/null
+++ b/network/irssi_otr/irssi_abi_check.diff
@@ -0,0 +1,14 @@
+diff -Naur irssi-otr-1.0.1.orig/src/module.c irssi-otr-1.0.1/src/module.c
+--- irssi-otr-1.0.1.orig/src/module.c 2015-01-03 11:57:09.000000000 -0500
++++ irssi-otr-1.0.1/src/module.c 2016-07-27 02:34:27.505864619 -0400
+@@ -371,3 +371,10 @@
+
+ theme_unregister();
+ }
++
++#ifdef IRSSI_ABI_VERSION
++void otr_abicheck(int *version)
++{
++ *version = IRSSI_ABI_VERSION;
++}
++#endif
diff --git a/network/irssi_otr/irssi_otr.SlackBuild b/network/irssi_otr/irssi_otr.SlackBuild
index 9f10a9ca5c..25fca7ce0e 100644
--- a/network/irssi_otr/irssi_otr.SlackBuild
+++ b/network/irssi_otr/irssi_otr.SlackBuild
@@ -15,8 +15,13 @@
# 20150907 bkw:
# - handle case where file was saved as v1.0.0.tar.gz
+# 20160727 bkw:
+# - updated for 1.0.1.
+# - use --with-irssi-module-dir now that it exists.
+# - add patch to deal with newer irssi's module ABI version check.
+
PRGNAM=irssi_otr
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -64,14 +69,14 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# irssi module dir is hardcoded to lib.
-sed -i "/^IRSSI_MODULE_DIR/s,lib,lib$LIBDIRSUFFIX," configure.ac
+patch -p1 < $CWD/irssi_abi_check.diff
./bootstrap
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
+ --with-irssi-module-dir=/usr/lib$LIBDIRSUFFIX/irssi/modules \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -80,7 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
-make
+make V=1
make install-strip DESTDIR=$PKG
# AUTHORS is a 0-byte placeholder.
diff --git a/network/irssi_otr/irssi_otr.info b/network/irssi_otr/irssi_otr.info
index f9ef9d576b..863b88590b 100644
--- a/network/irssi_otr/irssi_otr.info
+++ b/network/irssi_otr/irssi_otr.info
@@ -1,8 +1,8 @@
PRGNAM="irssi_otr"
-VERSION="1.0.0"
+VERSION="1.0.1"
HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
-DOWNLOAD="https://github.com/cryptodotis/irssi-otr/archive/v1.0.0.tar.gz"
-MD5SUM="5af78a07cae1b6082145416928c41a23"
+DOWNLOAD="https://github.com/cryptodotis/irssi-otr/archive/v1.0.1.tar.gz"
+MD5SUM="42ed0c513b20b0f82d720228e488d0ad"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libotr"