commit: acda44b99e96169be0018e3aa5bc99daf2c795af Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Feb 8 22:32:02 2026 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Feb 8 22:33:25 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acda44b9
x11-libs/libXmu: Version bump to 1.3.1 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/libXmu/Manifest | 1 + ...ResStream-Fix-a-comparison-in-a-test-case.patch | 29 +++++++++++++++++ x11-libs/libXmu/libXmu-1.3.1.ebuild | 36 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest index 8dc1803e5dcd..9e3e565bd90b 100644 --- a/x11-libs/libXmu/Manifest +++ b/x11-libs/libXmu/Manifest @@ -1 +1,2 @@ DIST libXmu-1.2.1.tar.xz 364888 BLAKE2B fca2e16c663483c0147f87830d6a583bb32026719901bd0aa7b7c4e81b18667b7152e0dd0805e22faf51b62e86cffd7a9423c366f1cafd3af007807cf9965262 SHA512 05a30e5961e00e940ad7ec4eb94ec482b5cbe808585972bf70c849333af3fddf4ae4bd87895d706507fb3a94ed0fb73ea161e0e27dc2840323a1a1af49c0e8a3 +DIST libXmu-1.3.1.tar.xz 374032 BLAKE2B f5712d65a8e993273715c7402527588246ed84d0c12a1a52c4525ba23eeb2c5136549489367577693ce2f797fa8b5d198beed05410c2d66b98b7c2d6ec360cae SHA512 5210acad4ec19d93a2ac906fbb062e69853c8ced8e6d3428586cb737a3485280489f238a54676a286aa0b6698af6406504274ffd08d9b5803cad57cf9476c802 diff --git a/x11-libs/libXmu/files/1.3.1-test-EditResStream-Fix-a-comparison-in-a-test-case.patch b/x11-libs/libXmu/files/1.3.1-test-EditResStream-Fix-a-comparison-in-a-test-case.patch new file mode 100644 index 000000000000..26441035e6a3 --- /dev/null +++ b/x11-libs/libXmu/files/1.3.1-test-EditResStream-Fix-a-comparison-in-a-test-case.patch @@ -0,0 +1,29 @@ +From ee21c3088aad164207d24bb516756adfdc0642e6 Mon Sep 17 00:00:00 2001 +From: Tim Hentenaar <[email protected]> +Date: Sat, 7 Feb 2026 22:43:38 -0500 +Subject: [PATCH libXmu] test/EditResStream: Fix a comparison in a test case + +This happens when running the 32-bit tests on a 64-bit system. +(Issue #4) + +Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxmu/-/merge_requests/22> +--- + test/EditResStream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git ./test/EditResStream.c ./test/EditResStream.c +index 9836236..0162f13 100644 +--- ./test/EditResStream.c ++++ ./test/EditResStream.c +@@ -100,7 +100,7 @@ test_EditResStream(void) + + res = _XEditResGetWidgetInfo(&ps, &out); + g_assert_cmpint(res, ==, True); +- g_assert_cmpmem(ids, sizeof(ids), out.ids, out.num_widgets * sizeof(long)); ++ g_assert_cmpmem(ids, sizeof(ids), out.ids, out.num_widgets * sizeof(*out.ids)); + XtFree((char *) out.ids); + out.ids = NULL; + _XEditResFreeStream(&ps); +-- +2.52.0 + diff --git a/x11-libs/libXmu/libXmu-1.3.1.ebuild b/x11-libs/libXmu/libXmu-1.3.1.ebuild new file mode 100644 index 000000000000..52ecd8a43ef8 --- /dev/null +++ b/x11-libs/libXmu/libXmu-1.3.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org Xmu library" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + test? ( dev-libs/glib[${MULTILIB_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-test-EditResStream-Fix-a-comparison-in-a-test-case.patch +) + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc docs) + $(use_with doc xmlto) + --without-fop + ) + xorg-3_src_configure +}
