main/irssi: upgrade to 0.8.17

4 files changed, 8 insertions, 180 deletions

diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index ab47d43c9f..b17705098e 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman at gmail.com>
 pkgname=irssi
-pkgver=0.8.16
-pkgrel=1
+pkgver=0.8.17
+pkgrel=0
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="http://irssi.org/"
 arch="all"
@@ -9,10 +9,7 @@ license="GPL2+"
 depends=
 makedepends="glib-dev openssl-dev ncurses-dev perl-dev automake autoconf libtool"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl"
-source="http://irssi.org/files/irssi-$pkgver.tar.bz2
-	$pkgname-italics.patch
-	irssi-0.8.15-man-fix.patch
-	irssi-0.8.15-no-static-unload.patch"
+source="http://irssi.org/files/irssi-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -27,7 +24,6 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	autoreconf -i
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,6 +31,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--with-perl=module \
+		--with-perl-lib=vendor \
 		--with-proxy \
 		|| return 1
 	make || return 1
@@ -60,7 +57,7 @@ perl() {
 	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
 	#need write permission when stripping
 	for i in TextUI/TextUI.so Irssi.so Irc/Irc.so UI/UI.so; do
-		chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/$1 || return 1
+		chmod +w "$subpkgdir"/usr/lib/perl5/vendor_perl/auto/Irssi/$1 || return 1
 	done
 }
 
@@ -71,15 +68,6 @@ proxy() {
 	mv "$pkgdir"/usr/lib/irssi/modules/libirc_proxy.* "$subpkgdir"/usr/lib/irssi/modules/
 }
 
-md5sums="4346119c4c000d0198cda17666ff1f06  irssi-0.8.16.tar.bz2
-bb8b9f8b960837ad061a8e5b9b19824b  irssi-italics.patch
-6e776c1c5a8dd4a8d03e710ff783f919  irssi-0.8.15-man-fix.patch
-96aec1545b531e2a378ae0e38ccbe6e9  irssi-0.8.15-no-static-unload.patch"
-sha256sums="3f7afed2a2754f1f5bf5cf2c87476f3c4d4aa5d71f9f4f68d05f927220d19f97  irssi-0.8.16.tar.bz2
-3e65898551e89e99ddce83ab69a8a37209181a1e6ae09bd9412805c9bf8cffa5  irssi-italics.patch
-3c504ba356b2e0d53a767b8194b6b31b2ee41a15c6bc27ae4c31f782f41a1411  irssi-0.8.15-man-fix.patch
-ce57e741311b7335cded9da4d7f7f3f68b3b367fbe457043d0e06674c76d48d9  irssi-0.8.15-no-static-unload.patch"
-sha512sums="47ad923cc91d5eee3f402126f4da396544cef943f6313af3fd102953939224e97c1bba31af3ac93e67fc84f089b0cfc73e8e7dd7b46b81abe1326567fef33de0  irssi-0.8.16.tar.bz2
-cc46ee115cbad0a1df55f4d6fff31b0dddc526c29b49108338c16baf4b632627a818b8fb0ab4b6a51cf1c0e1b5da26eaecf3ecf087bdedcc1b7a80e21d0e5c08  irssi-italics.patch
-7e081427c84df33a27d083e7c43ba34af7059e1344b0d6131c586affb9515c19adbcadb32ff5dc8a10824a59a88da46e40fd8074a856ea247c7f0a19115b8ac8  irssi-0.8.15-man-fix.patch
-1dd5f2d622d825daaab29e9ef19edc44e890a7e7ba82623c0e090b7828051ec5a97faf03a5a755e966b53c891dd645076e8a50a69c2abb15998ca3b42a117479  irssi-0.8.15-no-static-unload.patch"
+md5sums="ecf64be47978d89a742b435a81cb47db  irssi-0.8.17.tar.bz2"
+sha256sums="3c9600cad2edf58f1d012febc1a0ba844274df6e331c01a9e935467705166807  irssi-0.8.17.tar.bz2"
+sha512sums="e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953  irssi-0.8.17.tar.bz2"
diff --git a/main/irssi/irssi-0.8.15-man-fix.patch b/main/irssi/irssi-0.8.15-man-fix.patch
deleted file mode 100644
index 30bb28e881..0000000000
--- a/main/irssi/irssi-0.8.15-man-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up irssi-0.8.15/docs/irssi.1.orig irssi-0.8.15/docs/irssi.1
---- irssi-0.8.15/docs/irssi.1.orig	2010-04-03 18:19:55.000000000 +0200
-+++ irssi-0.8.15/docs/irssi.1	2012-08-03 16:34:19.684160994 +0200
-@@ -59,9 +59,6 @@ display the version of Irssi.
- .TP
- .BI "\-?, \-\-help"
- show a help message.
--.TP
--.BI "\-\-usage"
--display brief usage message.
- .SH SEE ALSO
- .B Irssi
- has been supplied with a huge amount of documentation. Check /help or look
diff --git a/main/irssi/irssi-0.8.15-no-static-unload.patch b/main/irssi/irssi-0.8.15-no-static-unload.patch
deleted file mode 100644
index c583f1c372..0000000000
--- a/main/irssi/irssi-0.8.15-no-static-unload.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- irssi-0.8.15/src/fe-common/core/fe-modules.c.old	2010-04-03 18:19:24.000000000 +0200
-+++ irssi-0.8.15/src/fe-common/core/fe-modules.c	2010-10-12 14:43:52.586315553 +0200
-@@ -195,6 +195,8 @@
-         MODULE_FILE_REC *file;
-         char *rootmodule, *submodule;
- 	void *free_arg;
-+	GSList *tmp;
-+	int all_dynamic;
- 
- 	g_return_if_fail(data != NULL);
- 
-@@ -204,12 +206,19 @@
- 
- 	module = module_find(rootmodule);
- 	if (module != NULL) {
--		if (*submodule == '\0')
--			module_unload(module);
-+		if (*submodule == '\0') {
-+			all_dynamic = 1;
-+			for (tmp = module->files; tmp != NULL; tmp = tmp->next)
-+				all_dynamic &= !MODULE_IS_STATIC((MODULE_FILE_REC*) tmp->data);
-+			if (all_dynamic)
-+				module_unload(module);
-+		}
- 		else {
- 			file = module_file_find(module, submodule);
--                        if (file != NULL)
--				module_file_unload(file);
-+                        if (file != NULL) {
-+				if (!MODULE_IS_STATIC(file))
-+					module_file_unload(file);
-+			}
- 			else
-                                 module = NULL;
- 		}
diff --git a/main/irssi/irssi-italics.patch b/main/irssi/irssi-italics.patch
deleted file mode 100644
index 27763bd9ef..0000000000
--- a/main/irssi/irssi-italics.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- irssi-0.8.15/src/fe-common/core/fe-messages.c
-+++ irssi-b/src/fe-common/core/fe-messages.c
-@@ -64,8 +64,12 @@
- 
- 		if (*bgn == '*') 
- 			type = 2; /* bold */
--		else if (*bgn == '_') 
-+		else if (*bgn == '_')
- 			type = 31; /* underlined */
-+                /* XXX: irssi does not support 'true' italics at this time. */
-+                else if (settings_get_bool("emphasis_underline_slashes") &&
-+                        (*bgn == '/'))
-+                        type = 31; /* italics */
- 		else
- 			continue;
- 
-@@ -76,7 +80,8 @@
- 		if ((end = strchr(bgn+1, *bgn)) == NULL)
- 			continue;
- 		if (!ishighalnum(end[-1]) || ishighalnum(end[1]) ||
--		    end[1] == type || end[1] == '*' || end[1] == '_')
-+		    end[1] == type || end[1] == '*' || end[1] == '_' ||
-+                    end[1] == '/')
- 			continue;
- 
- 		if (IS_CHANNEL(item)) {
-@@ -643,6 +648,7 @@
- 	settings_add_bool("lookandfeel", "emphasis", TRUE);
- 	settings_add_bool("lookandfeel", "emphasis_replace", FALSE);
- 	settings_add_bool("lookandfeel", "emphasis_multiword", FALSE);
-+        settings_add_bool("lookandfeel", "emphasis_underline_slashes", FALSE);
- 	settings_add_bool("lookandfeel", "show_nickmode", TRUE);
- 	settings_add_bool("lookandfeel", "show_nickmode_empty", TRUE);
- 	settings_add_bool("lookandfeel", "print_active_channel", FALSE);
---- irssi-0.8.15/src/fe-common/core/formats.c
-+++ irssi-b/src/fe-common/core/formats.c
-@@ -118,6 +118,10 @@
- 		g_string_append_c(out, 4);
- 		g_string_append_c(out, FORMAT_STYLE_UNDERLINE);
- 		break;
-+        case 'I':
-+                /* italics on/off */
-+                g_string_append_c(out, 4);
-+                g_string_append_c(out, FORMAT_STYLE_ITALIC);
- 	case '9':
- 	case '_':
- 		/* bold on/off */
-@@ -832,7 +836,7 @@
- 
- #define IS_COLOR_CODE(c) \
- 	((c) == 2 || (c) == 3 || (c) == 4 || (c) == 6 || (c) == 7 || \
--	(c) == 15 || (c) == 22 || (c) == 27 || (c) == 31)
-+	(c) == 15 || (c) == 22 || (c) == 27 || (c) == 29 || (c) == 31)
- 
- /* Return how many characters in `str' must be skipped before `len'
-    characters of text is skipped. */
-@@ -1001,6 +1005,9 @@
- 			case FORMAT_STYLE_UNDERLINE:
- 				flags ^= GUI_PRINT_FLAG_UNDERLINE;
- 				break;
-+                        case FORMAT_STYLE_ITALIC:
-+                                flags ^= GUI_PRINT_FLAG_ITALIC;
-+                                break;
- 			case FORMAT_STYLE_BOLD:
- 				flags ^= GUI_PRINT_FLAG_BOLD;
- 				break;
-@@ -1050,6 +1057,7 @@
- 			if (!hide_text_style)
- 				flags ^= GUI_PRINT_FLAG_REVERSE;
- 			break;
-+                case 29: /* italics */
- 		case 31:
- 			/* underline */
- 			if (!hide_text_style)
---- irssi-0.8.15/src/fe-common/core/formats.h
-+++ irssi-b/src/fe-common/core/formats.h
-@@ -7,9 +7,10 @@
- #define GUI_PRINT_FLAG_BOLD          0x0001
- #define GUI_PRINT_FLAG_REVERSE       0x0002
- #define GUI_PRINT_FLAG_UNDERLINE     0x0004
--#define GUI_PRINT_FLAG_BLINK         0x0008
--#define GUI_PRINT_FLAG_MIRC_COLOR    0x0010
--#define GUI_PRINT_FLAG_INDENT        0x0020
-+#define GUI_PRINT_FLAG_ITALIC        0x0008
-+#define GUI_PRINT_FLAG_BLINK         0x0010
-+#define GUI_PRINT_FLAG_MIRC_COLOR    0x0020
-+#define GUI_PRINT_FLAG_INDENT        0x0040
- #define GUI_PRINT_FLAG_NEWLINE       0x0080
- #define GUI_PRINT_FLAG_CLRTOEOL      0x0100
- #define GUI_PRINT_FLAG_MONOSPACE     0x0200
-@@ -126,8 +127,9 @@
- #define FORMAT_STYLE_BLINK	(0x01 + FORMAT_STYLE_SPECIAL)
- #define FORMAT_STYLE_UNDERLINE	(0x02 + FORMAT_STYLE_SPECIAL)
- #define FORMAT_STYLE_BOLD	(0x03 + FORMAT_STYLE_SPECIAL)
--#define FORMAT_STYLE_REVERSE	(0x04 + FORMAT_STYLE_SPECIAL)
--#define FORMAT_STYLE_INDENT	(0x05 + FORMAT_STYLE_SPECIAL)
-+#define FORMAT_STYLE_ITALIC     (0x04 + FORMAT_STYLE_SPECIAL)
-+#define FORMAT_STYLE_REVERSE	(0x05 + FORMAT_STYLE_SPECIAL)
-+#define FORMAT_STYLE_INDENT	(0x06 + FORMAT_STYLE_SPECIAL)
- #define FORMAT_STYLE_DEFAULTS	(0x07 + FORMAT_STYLE_SPECIAL)
- #define FORMAT_STYLE_CLRTOEOL	(0x08 + FORMAT_STYLE_SPECIAL)
- #define FORMAT_STYLE_MONOSPACE	(0x09 + FORMAT_STYLE_SPECIAL)
---- irssi-0.8.15/src/fe-text/gui-printtext.c
-+++ irssi-b/src/fe-text/gui-printtext.c
-@@ -157,6 +157,7 @@
- 	if (flags & GUI_PRINT_FLAG_REVERSE) *attr |= ATTR_REVERSE;
- 	if (flags & GUI_PRINT_FLAG_BOLD) *attr |= ATTR_BOLD;
- 	if (flags & GUI_PRINT_FLAG_UNDERLINE) *attr |= ATTR_UNDERLINE;
-+        if (flags & GUI_PRINT_FLAG_ITALIC) *attr |= ATTR_UNDERLINE;
- 	if (flags & GUI_PRINT_FLAG_BLINK) *attr |= ATTR_BLINK;
- }
-