gentoo auto-resync : 17:04:2023 - 05:52:08

3 files changed, 133 insertions, 5 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 1da1bada3a44..af68a5880e84 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,6 +1,7 @@
+AUX mlterm-configure-clang16.patch 3768 BLAKE2B 2a7b5e99c469fcc4303017a0aa0d5a4e7c097d5ce4a4a0642701d7e5b68e3737a557c34a60d2847ca4571ae6d4788f8853a4b72d95df9bb721110dcff6c5c372 SHA512 be0025373d14eff53ad4d3d07333f0ffb269a0f2b7857a79046596abd2761ef12044cbcefe42a30193626e3eea5c016d6f484f9aecb325ebe1caa3d086da3ea5
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
 DIST mlterm-3.9.3.tar.gz 4272090 BLAKE2B 8f71a8c5cd63b7caa803e699a7e42b8d11cb18324595a7a255c7542df6fad6b968bf56a03a2d19a2381d103232685e3c3cd62388ac036a024870fbe3d222d081 SHA512 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1
 EBUILD mlterm-3.9.2.ebuild 2988 BLAKE2B 59e3a253040ecbab108e3b213e6f792835a0a7a5218030719e7a64ae697905a38d409db4f9d767d51c973fa7398a0225af93c0bbeccb22129892bc822ad59347 SHA512 0e7baa0d749843c051c0102f38c3e51924bb8b168ed44053fb7ce42d1f98827647fa90f431f87f7daff4d7e0457bcd4d78ae62ff6b7f82ea0b8a3a93177e333c
-EBUILD mlterm-3.9.3.ebuild 2992 BLAKE2B d906561c6e7d39867ea3f519500a4df37b77abcd4c37dc1a63737ef16bd700e2009ccd7069f61f4cf717616a2e8cdd5785d57aea71b5d8ac10cfcd153c9f2bc8 SHA512 c3f02977723ff46a7f13fe2163957a5bf2e0ce9d4722c7d035a2c71c836de32a4fd1f10ce07715d8e4d82f75e5796ce903d3fc7b7da62e678339d75190b1aaeb
+EBUILD mlterm-3.9.3-r1.ebuild 3055 BLAKE2B 828c78486903dacc1e3194375335b812545f30bcc480e1318d8f8121ad3530d8f383b89d6304abef5400e7a222e425a961eaf1512d47f32f793e7f75af8553c6 SHA512 0d95b6f364b8416b844261f779746810b42a131925ff35b4f92343e3008c6879b7bd21185b37835d7818ca8a0d8159760966e5723a50dbfd0cd3830e8feb5ac5
 MISC metadata.xml 1228 BLAKE2B 788a19c8b676d0d5991cd80809f67f526edf6343ab897bc6287cc51f100b4e82bc5cffea0d2165ed3dc7950d0302579005763b0679aaaad5aaabdb8947a94d94 SHA512 d2efc5096992c50c00437cb5e735a12959e6e577b11c9f3d653ca2123ad04923db38c796bc3eaabd79772f521096784404b68a324712f749a15fbd81ae33eabe
diff --git a/x11-terms/mlterm/files/mlterm-configure-clang16.patch b/x11-terms/mlterm/files/mlterm-configure-clang16.patch
new file mode 100644
index 000000000000..134870d8f756
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-configure-clang16.patch
@@ -0,0 +1,123 @@
+https://github.com/arakiken/mlterm/pull/68
+
+From 4eb1a0b237a861cee7ba0ceb4b69d54ab46f87f5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 16 Apr 2023 11:38:16 +0100
+Subject: [PATCH] Fix configure.ac compatibility with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+Bug: https://bugs.gentoo.org/904353
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+--- a/baselib/configure
++++ b/baselib/configure
+@@ -13226,6 +13226,8 @@ See \`config.log' for more details" "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#define _XOPEN_SOURCE 600
++#include <stdlib.h>
+ #include <fcntl.h>
+ int
+ main ()
+@@ -13599,6 +13601,8 @@ else
+ /* end confdefs.h.  */
+ 
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
+--- a/baselib/configure.in
++++ b/baselib/configure.in
+@@ -285,7 +285,9 @@ elif test "$bl_cv_mingw" = "yes" ; then
+ 	bl_cv_pty=streams
+ elif test "$host" = "$build" ; then
+ 	AC_CHECK_FUNC(posix_openpt,
+-		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <fcntl.h>],
++		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600
++						#include <stdlib.h>
++						#include <fcntl.h>],
+ 						[return posix_openpt(O_RDWR | O_NOCTTY) == -1;])],
+ 				[
+ 					AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT")
+@@ -435,6 +437,8 @@ if test "$host" = "$build"; then
+ 	AC_TRY_RUN(
+ 	[
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
+--- a/configure
++++ b/configure
+@@ -25110,6 +25110,8 @@ See \`config.log' for more details" "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#define _XOPEN_SOURCE 600
++#include <stdlib.h>
+ #include <fcntl.h>
+ int
+ main ()
+@@ -25147,6 +25149,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <fcntl.h>
++#include <sys/stat.h>
+ int
+ main ()
+ {
+@@ -25475,6 +25478,8 @@ else
+ /* end confdefs.h.  */
+ 
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
+--- a/configure.in
++++ b/configure.in
+@@ -2150,7 +2150,9 @@ elif test "$bl_cv_mingw" = "yes" ; then
+ 	bl_cv_pty=streams
+ elif test "$host" = "$build" ; then
+ 	AC_CHECK_FUNC(posix_openpt,
+-		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <fcntl.h>],
++		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600
++						#include <stdlib.h>
++						#include <fcntl.h>],
+ 						[return posix_openpt(O_RDWR | O_NOCTTY) == -1;])],
+ 				[
+ 					AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT")
+@@ -2160,7 +2162,8 @@ elif test "$host" = "$build" ; then
+ 		[bl_cv_pty=bsd])
+ 	if test "$bl_cv_pty" = "bsd" ; then
+ 		AC_RUN_IFELSE(
+-			[AC_LANG_PROGRAM([#include <fcntl.h>],
++			[AC_LANG_PROGRAM([#include <sys/stat.h>
++					#include <fcntl.h>],
+ 					[return open( "/dev/ptmx", O_RDWR | O_NOCTTY, 0) == -1;])],
+ 			[bl_cv_pty=streams])
+ 	fi
+@@ -2297,6 +2300,8 @@ if test "$host" = "$build"; then
+ 	AC_TRY_RUN(
+ 	[
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
diff --git a/x11-terms/mlterm/mlterm-3.9.3.ebuild b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
index 48e60e6194d8..f9f685ab417d 100644
--- a/x11-terms/mlterm/mlterm-3.9.3.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
@@ -53,19 +53,23 @@ RDEPEND="virtual/libcrypt:=
 		x11-libs/libxkbcommon
 	)
 	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
 DOCS=( doc/{en,ja} )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-font.patch
+	"${FILESDIR}"/${PN}-configure-clang16.patch
+)
+
 src_prepare() {
 	# default config
 	sed -i \
 		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
 		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
+		etc/main || die
 
 	default
 }