[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/, app-arch/xz-utils/files/

[Sam James]

commit:     99529e3e30d71d892944629cfa1ac862d8327dc3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 05:41:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 05:41:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99529e3e

app-arch/xz-utils: backport -Wsign-conversion fix

It's just silencing the warning.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xz-utils-5.4.2-Wsign-conversion.patch    | 23 ++++++++++++++++++++++
 app-arch/xz-utils/xz-utils-5.4.2.ebuild            |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
new file mode 100644
index 000000000000..217cc759a904
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
@@ -0,0 +1,23 @@
+https://github.com/tukaani-project/xz/commit/0673c9ec98b6bae12b33dc295564514aaa26e2fc
+
+From 0673c9ec98b6bae12b33dc295564514aaa26e2fc Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin@×××××××.org>
+Date: Sun, 19 Mar 2023 22:45:59 +0200
+Subject: [PATCH] liblzma: Silence -Wsign-conversion in SSE2 code in
+ memcmplen.h.
+
+Thanks to Christian Hesse for reporting the issue.
+Fixes: https://github.com/tukaani-project/xz/issues/44
+--- a/src/liblzma/common/memcmplen.h
++++ b/src/liblzma/common/memcmplen.h
+@@ -89,7 +89,8 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2,
+ 	// version isn't used on x86-64.
+ #	define LZMA_MEMCMPLEN_EXTRA 16
+ 	while (len < limit) {
+-		const uint32_t x = 0xFFFF ^ _mm_movemask_epi8(_mm_cmpeq_epi8(
++		const uint32_t x = 0xFFFF ^ (uint32_t)_mm_movemask_epi8(
++			_mm_cmpeq_epi8(
+ 			_mm_loadu_si128((const __m128i *)(buf1 + len)),
+ 			_mm_loadu_si128((const __m128i *)(buf2 + len))));
+ 
+

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index a6b8dfa60f8f..736b0038dc69 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -53,6 +53,10 @@ if [[ ${PV} != 9999 ]] ; then
 	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Wsign-conversion.patch
+)
+
 src_prepare() {
 	default