From 328c3d105528c6ef07436d71e687b9342b2e4bf8 Mon Sep 17 00:00:00 2001
From: Kevin Easton <kme@fedoraproject.org>
Date: Jan 30 2020 11:32:22 +0000
Subject: Add patch to mark all inline functions in expr2.c static, fixing build on s390


This is a backport from upstream.

---

diff --git a/BitchX.spec b/BitchX.spec
index 4c5496f..fa7bd9f 100644
--- a/BitchX.spec
+++ b/BitchX.spec
@@ -1,7 +1,7 @@
 Summary: IrcII chat client
 Name: BitchX
 Version: 1.2.1
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: BSD and GPLv2+
 URL: http://www.bitchx.org
 Source0: http://www.bitchx.ca/%{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@ Source0: http://www.bitchx.ca/%{name}-%{version}.tar.gz
 Patch0: format-security.patch
 Patch1: configure_openssl_SSLeay.patch
 Patch2: remove-duplicate-symbols.patch
+Patch3: expr2_static_inline.patch
 BuildRequires:  gcc
 BuildRequires: ncurses-devel openssl-devel glib2-devel libxcrypt-devel
 
@@ -20,6 +21,7 @@ BitchX: The ultimate IRC client
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --with-plugins --with-ssl --enable-ipv6
@@ -37,6 +39,9 @@ make DESTDIR=%{buildroot} install
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jan 30 2020 Kevin Easton <kme@fedoraproject.org> - 1.2.1-23
+- Add patch to mark all inline functions in expr2.c static, fixing build on s390
+
 * Wed Jan 29 2020 Kevin Easton <kme@fedoraproject.org> - 1.2.1-22
 - Add patch to remove duplicate symbols, fixing build on gcc 10
 
diff --git a/expr2_static_inline.patch b/expr2_static_inline.patch
new file mode 100644
index 0000000..e0d563c
--- /dev/null
+++ b/expr2_static_inline.patch
@@ -0,0 +1,30 @@
+diff -uNrp BitchX-1.2.1.orig/source/expr2.c BitchX-1.2.1/source/expr2.c
+--- BitchX-1.2.1.orig/source/expr2.c	2013-01-01 15:55:05.000000000 +1100
++++ BitchX-1.2.1/source/expr2.c	2020-01-30 22:08:58.752241991 +1100
+@@ -1192,7 +1192,7 @@ int	lexerr (expr_info *c, char *format,
+  * case 'operand' is set to 1.  When an operand is lexed, then the next token
+  * is expected to be a binary operator, so 'operand' is set to 0. 
+  */
+-__inline int	check_implied_arg (expr_info *c)
++__inline static int	check_implied_arg (expr_info *c)
+ {
+ 	if (c->operand == 2)
+ 	{
+@@ -1205,7 +1205,7 @@ __inline int	check_implied_arg (expr_inf
+ 	return c->operand;
+ }
+ 
+-__inline TOKEN 	operator (expr_info *c, char *x, int y, TOKEN z)
++__inline static TOKEN 	operator (expr_info *c, char *x, int y, TOKEN z)
+ {
+ 	check_implied_arg(c);
+ 	if (c->operand)
+@@ -1216,7 +1216,7 @@ __inline TOKEN 	operator (expr_info *c,
+ 	return z;
+ }
+ 
+-__inline TOKEN 	unary (expr_info *c, char *x, int y, TOKEN z)
++__inline static TOKEN 	unary (expr_info *c, char *x, int y, TOKEN z)
+ {
+ 	if (!c->operand)
+ 		return lexerr(c, "An operator (%s) was found where "