From 2672fd62360a230a51b98879c5d2e2bd5ce16fff Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Dec 06 2022 10:45:55 +0000
Subject: Declare string_chomp in the installed header file (#2151172)


This is used by mfiler3.

---

diff --git a/saphire-string_chomp-public.patch b/saphire-string_chomp-public.patch
new file mode 100644
index 0000000..b4d7bf4
--- /dev/null
+++ b/saphire-string_chomp-public.patch
@@ -0,0 +1,27 @@
+string_chomp is used by mfiler3, so move it to the public header file.
+
+diff --git a/headers/saphire/saphire_inner.h b/headers/saphire/saphire_inner.h
+index 5a5b6245aa72c5a1..2ba552ebc18f57ac 100644
+--- a/headers/saphire/saphire_inner.h
++++ b/headers/saphire/saphire_inner.h
+@@ -394,9 +394,6 @@ BOOL is_line_field(char* p);
+ BOOL is_line_field2(enum eLineField lf, char* p);
+     // �������饤��ե�����ɤ�ݥ���Ȥ��Ƥ��뤫2
+ 
+-BOOL string_chomp(string_obj* str);
+-    // ���ԥ����ɤ������
+-
+ BOOL string_chomp2(string_obj* str, enum eLineField lf);
+     // ���ԥ����ɤ������
+ 
+diff --git a/headers/saphire/saphire_string.h b/headers/saphire/saphire_string.h
+index 79871885230ab3f9..ddae52e0fe40b218 100644
+--- a/headers/saphire/saphire_string.h
++++ b/headers/saphire/saphire_string.h
+@@ -54,4 +54,6 @@ void string_erase(string_obj* obj, int pos, int len);       // 文字列をpos
+ void string_toupper(string_obj* self, enum eKanjiCode code); // 大文字にする
+ void string_tolower(string_obj* self, enum eKanjiCode code); // 小文字にする
+ 
++BOOL string_chomp(string_obj* str);
++
+ #endif
diff --git a/saphire.spec b/saphire.spec
index 91ada05..5157870 100644
--- a/saphire.spec
+++ b/saphire.spec
@@ -4,7 +4,7 @@
 
 Name:		saphire
 Version:	3.6.5
-Release:	28%{?dist}
+Release:	29%{?dist}
 Summary:	Yet another shell
 
 License:	MIT
@@ -12,6 +12,7 @@ URL:		http://ab25cq.wiki.fc2.com/
 Source0:	http://dl.sourceforge.jp/sash/%{repoid}/saphire-%{version}.tgz
 Patch0:	saphire-3.6.5-gcc10-fno-common.patch
 Patch1:	saphire-3.6.5-c99-port.patch
+Patch2:	saphire-string_chomp-public.patch
 
 BuildRequires: make
 BuildRequires:  gcc
@@ -38,6 +39,7 @@ developing applications that use %{name}.
 # Patches
 %patch0 -p1 -b .gcc10
 %patch1 -p1 -b .c99
+%patch2 -p1 -b .string_chomp
 
 # Don't strip binary
 sed -i.strip -e 's|\$(INSTALL) -s|\$(INSTALL) |' Makefile.in
@@ -154,6 +156,9 @@ make install \
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Tue Dec  6 2022 Florian Weimer <fweimer@redhat.com> - 3.6.5-29
+- Declare string_chomp in the installed header file (#2151172)
+
 * Sun Dec  4 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.6.5-28
 - Port to C99, -Werror=implicit-function-declaration -Werror=implicit-int