From d59b4a228a10f1f7f9941a2f587baed476be8cfa Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Mon, 23 Oct 2023 22:26:55 +0900
Subject: app-i18n/uim: rename patch

Signed-off-by: Akinori Hattori <hattya@gentoo.org>
---
 app-i18n/uim/files/uim-clang-16-configure.patch | 42 -------------------------
 app-i18n/uim/files/uim-clang-16.patch           | 42 +++++++++++++++++++++++++
 app-i18n/uim/uim-1.8.9-r1.ebuild                |  2 +-
 3 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 app-i18n/uim/files/uim-clang-16-configure.patch
 create mode 100644 app-i18n/uim/files/uim-clang-16.patch

(limited to 'app-i18n')

diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch b/app-i18n/uim/files/uim-clang-16-configure.patch
deleted file mode 100644
index 9a1a4726eb18..000000000000
--- a/app-i18n/uim/files/uim-clang-16-configure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
---- a/configure.ac
-+++ b/configure.ac
-@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
- 	AC_RUN_IFELSE(
- 		[AC_LANG_SOURCE([[
- #include <stdio.h>
-+#include <stdlib.h>
- int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
- 		]])],
- 		[AC_MSG_RESULT(yes)],
---- a/m4/openssl.m4
-+++ b/m4/openssl.m4
-@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version])
- AC_RUN_IFELSE(
- 	[AC_LANG_SOURCE([[
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <openssl/opensslv.h>
- #define DATA "conftest.sslincver"
-@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check,
- AC_MSG_CHECKING([whether OpenSSL's headers match the library])
- AC_RUN_IFELSE(
- 	[AC_LANG_SOURCE([[
-+#include <stdlib.h>
- #include <string.h>
-+#include <openssl/crypto.h>
- #include <openssl/opensslv.h>
- int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
- 	]])],
-@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); }
- AC_MSG_CHECKING([if programs using OpenSSL functions will link])
- AC_LINK_IFELSE(
- 	[AC_LANG_SOURCE([[
--#include <openssl/evp.h>
--int main(void) { SSLeay_add_all_algorithms(); }
-+#include <openssl/crypto.h>
-+int main(void) { OpenSSL_version_num(); }
- 	]])],
- 	[
- 		AC_MSG_RESULT(yes)
diff --git a/app-i18n/uim/files/uim-clang-16.patch b/app-i18n/uim/files/uim-clang-16.patch
new file mode 100644
index 000000000000..9a1a4726eb18
--- /dev/null
+++ b/app-i18n/uim/files/uim-clang-16.patch
@@ -0,0 +1,42 @@
+Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
+--- a/configure.ac
++++ b/configure.ac
+@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
+ 	AC_RUN_IFELSE(
+ 		[AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
+ 		]])],
+ 		[AC_MSG_RESULT(yes)],
+--- a/m4/openssl.m4
++++ b/m4/openssl.m4
+@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version])
+ AC_RUN_IFELSE(
+ 	[AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <openssl/opensslv.h>
+ #define DATA "conftest.sslincver"
+@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check,
+ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+ AC_RUN_IFELSE(
+ 	[AC_LANG_SOURCE([[
++#include <stdlib.h>
+ #include <string.h>
++#include <openssl/crypto.h>
+ #include <openssl/opensslv.h>
+ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+ 	]])],
+@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); }
+ AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+ AC_LINK_IFELSE(
+ 	[AC_LANG_SOURCE([[
+-#include <openssl/evp.h>
+-int main(void) { SSLeay_add_all_algorithms(); }
++#include <openssl/crypto.h>
++int main(void) { OpenSSL_version_num(); }
+ 	]])],
+ 	[
+ 		AC_MSG_RESULT(yes)
diff --git a/app-i18n/uim/uim-1.8.9-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild
index ec51cd6da6de..3b78acf0a953 100644
--- a/app-i18n/uim/uim-1.8.9-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@@ -84,6 +84,7 @@ BDEPEND="gnome-base/librsvg
 	nls? ( dev-util/intltool )"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-clang-16.patch
 	"${FILESDIR}"/${PN}-gentoo.patch
 	"${FILESDIR}"/${PN}-kde.patch
 	"${FILESDIR}"/${PN}-slibtool.patch
@@ -91,7 +92,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-Wconversion.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
-	"${FILESDIR}"/${PN}-clang-16-configure.patch
 )
 
 DOCS=( AUTHORS NEWS README RELNOTE doc )
-- 
cgit v1.2.3-65-gdbad