irssi: bump to version 0.8.18

Also remove no longer needed patch (merged upstream).

Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Rodrigo Rebello 2016-03-06 23:50:05 -03:00 committed by Thomas Petazzoni
parent 68578be550
commit 1a3c8498ab
3 changed files with 4 additions and 51 deletions

View file

@ -1,46 +0,0 @@
From a9d2f9ca6edb7a958ecb606f7db2055caad26a1e Mon Sep 17 00:00:00 2001
From: Rodrigo Rebello <rprebello@gmail.com>
Date: Wed, 28 Oct 2015 13:38:21 -0200
Subject: [PATCH 1/1] Fix quote around macro argument
In m4/curses.m4, line 134, the 5th argument passed to AC_NCURSES was
surrounded by '"' instead of '[' and ']'. Because of that, the expansion
of AC_NCURSES in that case would produce the following line inside the
configure script (note the repeated double quotes):
screen_manager=""ncurses on $withval/include""
That would cause the following error when configure was executed with
the "--with-ncurses=dir" argument:
./configure: line 13468: on: command not found
Although in the case above the error doesn't actually influence the
build process ('screen_manager' isn't used anywhere in the script),
trying to execute 'on' might be harmful if it corresponded to an
existing command in the user's environment.
Upstream-status: accepted, not yet released.
https://github.com/irssi/irssi/pull/344
Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
---
m4/curses.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/curses.m4 b/m4/curses.m4
index 82b110f..41c0e6c 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -131,7 +131,7 @@ AC_DEFUN([AC_CHECK_CURSES],[
if test x$withval = xno ; then
search_ncurses=false
elif test x$withval != xyes ; then
- AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
+ AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, [ncurses on $withval/include])
fi
)
--
2.1.4

View file

@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 3c9600cad2edf58f1d012febc1a0ba844274df6e331c01a9e935467705166807 irssi-0.8.17.tar.bz2
sha256 c0a177f749757c2d171ebe49ab0f0dd9cf9374dea81ab01904d0549bcb057840 irssi-0.8.18.tar.xz

View file

@ -4,15 +4,14 @@
#
################################################################################
IRSSI_VERSION = 0.8.17
IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.bz2
IRSSI_VERSION = 0.8.18
IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz
# Do not use the github helper here. The generated tarball is *NOT* the
# same as the one uploaded by upstream for the release.
IRSSI_SITE = https://github.com/irssi-import/irssi/releases/download/$(IRSSI_VERSION)
IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION)
IRSSI_LICENSE = GPLv2+
IRSSI_LICENSE_FILES = COPYING
IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses
IRSSI_AUTORECONF = YES
IRSSI_CONF_OPTS = \
--disable-glibtest \