From d03eee3fc8603eb677f94e476d1eea98110810ac Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Tue, 6 Dec 2016 16:40:05 -0500 Subject: irssi-otr-1.0.1-1.3: implement ABI check for irssi --- pcr/irssi-otr/4ad3b7b.patch | 22 ---------------------- pcr/irssi-otr/PKGBUILD | 8 ++++---- pcr/irssi-otr/d03ab59.patch | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 pcr/irssi-otr/4ad3b7b.patch create mode 100644 pcr/irssi-otr/d03ab59.patch diff --git a/pcr/irssi-otr/4ad3b7b.patch b/pcr/irssi-otr/4ad3b7b.patch deleted file mode 100644 index f310ad583..000000000 --- a/pcr/irssi-otr/4ad3b7b.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- irssi-otr-1.0.1.orig/configure.ac 2015-01-03 11:50:28.000000000 -0500 -+++ irssi-otr-1.0.1/configure.ac 2016-12-06 15:53:26.433619013 -0500 -@@ -31,7 +31,7 @@ - - AM_PATH_LIBGCRYPT(1:1.2.0,,AC_MSG_ERROR(libgcrypt 1.2.0 or newer is required.)) - --AM_PATH_LIBOTR(4.0.0, [], [AC_MSG_ERROR([libotr 4.0.0 or newer is required.])]) -+AM_PATH_LIBOTR(4.1.0, [], [AC_MSG_ERROR([libotr 4.1.0 or newer is required.])]) - - pkg_modules="gmodule-2.0 >= 2.0.0" - PKG_CHECK_MODULES(GMODULE, [$pkg_modules]) ---- irssi-otr-1.0.1.orig/irssi-otr.spec.in 2014-03-10 16:35:11.000000000 -0500 -+++ irssi-otr-1.0.1/irssi-otr.spec.in 2016-12-06 15:53:47.552677700 -0500 -@@ -9,7 +9,7 @@ - - BuildRequires: glib2-devel >= 2.13 - BuildRequires: irssi-devel --BuildRequires: libotr-devel >= 4.0.0 -+BuildRequires: libotr-devel >= 4.1.0 - BuildRequires: pkgconfig - Requires: irssi - diff --git a/pcr/irssi-otr/PKGBUILD b/pcr/irssi-otr/PKGBUILD index a56d0cb23..aebe8b534 100644 --- a/pcr/irssi-otr/PKGBUILD +++ b/pcr/irssi-otr/PKGBUILD @@ -5,20 +5,20 @@ pkgname=irssi-otr pkgver=1.0.1 -pkgrel=1.2 +pkgrel=1.3 pkgdesc="Off-the-Record Messaging (OTR) for the Irssi IRC client" url="https://github.com/cryptodotis/irssi-otr" arch=('i686' 'x86_64') license=('GPL2') depends=('irssi' 'libotr' 'glib2') source=(${pkgname}-${pkgver}.tar.bz2::https://www.otr.im/dist/irssi-otr/irssi-otr-${pkgver}.tar.bz2 - 4ad3b7b.patch) + d03ab59.patch) sha512sums=('f7a2b04a1bd43b2436abe3592d8110acbe719575e295e789fd7ad92c87d4dbd99155439a6b1da349a3f86418a451fba2bfb1b085915e85688b5e214c1e9de0e2' - '8afaba9c59cff7f8043d559e2617df2f5f415a1a0e19f9b0c002433e246845502336b42034ef8a7e5c01f205c432eed26592bac763d5a7d3ad6e92526bd346ed') + 'ad8d6c37c8acea0c30aae41b82289ffbadee2b4af09b57b0bad0855aff1390cc9ecc31f69379d8bf2e06cac439b284608d2f3e909964a58e204d928e49b51270') prepare() { cd ${pkgname}-${pkgver} - patch -Np1 -i "$srcdir/4ad3b7b.patch" + patch -Np1 -i "$srcdir/d03ab59.patch" autoreconf -fiv } diff --git a/pcr/irssi-otr/d03ab59.patch b/pcr/irssi-otr/d03ab59.patch new file mode 100644 index 000000000..fb2200322 --- /dev/null +++ b/pcr/irssi-otr/d03ab59.patch @@ -0,0 +1,16 @@ +--- irssi-otr-1.0.1.orig/src/module.c 2014-09-29 15:11:07.000000000 -0500 ++++ irssi-otr-1.0.1/src/module.c 2016-12-06 16:21:49.970197487 -0500 +@@ -371,3 +371,13 @@ + + theme_unregister(); + } ++ ++#ifdef IRSSI_ABI_VERSION ++/* ++ * irssi abicheck() ++ */ ++void otr_abicheck(int *version) ++{ ++ *version = IRSSI_ABI_VERSION; ++} ++#endif -- cgit v1.2.3