From d20060d848281b819fba5ba4c2990b5a1ad144ce Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 19 Feb 2019 21:31:49 +0000
Subject: [PATCH] user/irssi: fix ridiculous egregious C conformance error
---
user/irssi/APKBUILD | 7 +++++--
...diculous-egregious-conformance-error.patch | 19 +++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 user/irssi/fix-ridiculous-egregious-conformance-error.patch
diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD
index ead93c2967..92effce1bc 100644
--- a/user/irssi/APKBUILD
+++ b/user/irssi/APKBUILD
@@ -9,7 +9,9 @@ arch="all"
license="GPL-2.0+ AND ISC"
makedepends="ncurses-dev glib-dev openssl-dev perl-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-perl"
-source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz"
+source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz
+ fix-ridiculous-egregious-conformance-error.patch
+ "
build() {
cd "$builddir"
@@ -44,4 +46,5 @@ perl() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi
}
-sha512sums="343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40 irssi-1.2.0.tar.xz"
+sha512sums="343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40 irssi-1.2.0.tar.xz
+88c9fe5593a81b92943d1ca419b39d074f9c52378350007c0896aa95ef056e098201b338d31da31b5ec1492e1577d2862b989e00427dc89edde0bcef46cd8e2a fix-ridiculous-egregious-conformance-error.patch"
diff --git a/user/irssi/fix-ridiculous-egregious-conformance-error.patch b/user/irssi/fix-ridiculous-egregious-conformance-error.patch
new file mode 100644
index 0000000000..ceb707c9ba
--- /dev/null
+++ b/user/irssi/fix-ridiculous-egregious-conformance-error.patch
@@ -0,0 +1,19 @@
+--- irssi-1.2.0/tests/fe-text/test-paste-join-multiline.c.old 2019-02-11 17:27:58.000000000 +0000
++++ irssi-1.2.0/tests/fe-text/test-paste-join-multiline.c 2019-02-19 21:28:03.250000000 +0000
+@@ -48,13 +48,15 @@
+ static void test_paste_join_multiline(const paste_join_multiline_test_case *test)
+ {
+ char *resultstr, *t1;
++ glong length;
+ GArray *buffer = g_array_new(FALSE, FALSE, sizeof(unichar));
+
+ g_test_message("Testing: %s", test->description);
+ g_test_message("INPUT: \"%s\"", (t1 = g_strescape(test->input, NULL)));
+ g_free(t1);
+
+- buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len);
++ buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, &length);
++ buffer->len = length;
+ paste_buffer_join_lines(buffer);
+ resultstr = g_ucs4_to_utf8((unichar *) buffer->data, buffer->len, NULL, NULL, NULL);
+
--
GitLab