gentoo auto-resync : 06:02:2025 - 00:10:59

4 files changed, 60 insertions, 4 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index d39d9bdbdb08..d2d32da8b14e 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,10 +1,11 @@
 AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3
+AUX nx-3.5.99.26-gcc14-32bit.patch 2033 BLAKE2B feefddc7af011ffd6e1432b3abb4846d5b6a3ba6eedf19ad3eed144599670335430da1b5dfdfc207f72a04189b2fbafd4dbc3297ddf1965b9933a22f2e19967f SHA512 9596c717b98951eaec930dda2b72a440bcc3e0fa5806130a23c66cb3d3e6a47f00c7dcb794498b9a29954b9e44d40298aa997f773ede277cf71a19eb85789291
 AUX nx-3.5.99.26-musl.patch 2203 BLAKE2B f4c43ed04ef6f35ef159ff30102cc6b52154e1a620a5a419f82e20f721f37832826ce0f8f141b6fdb6ce8a6814cd2fd5fec308c6f69f0b235b72578e67c1cbbd SHA512 f99052424faa49324aa79deeb92890e018872615c3d10bb0426e26487c3394201c6cb477628676583fda1794b1c980c07f31fdfe6379558694cce17734787131
 AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052
 AUX nx-3.5.99.26-which.patch 1157 BLAKE2B 0118abda74ceffa96bbf7fc1518ca5073c3a51b4762ba5769e061878613e27491e01c1d9ba3ca632b4de1166fce345e55f6840daf27608ce627f0c58b2b869b0 SHA512 b31ea5a6cbf5f65ac9a15ce83e2181dd1c9783e8b0ac9af24260399539a9c93bd0466d10cd7cf1eddbc95edfb1a1f7bd403f4cf1ebc66816463a2252300f4835
 AUX nx-3.5.99.27-which.patch 758 BLAKE2B 6d8841c80f086592365042d225128ebd897b118f5fdf6c573df2a845ae08d54e08f8c5c349a3a601325fb82f83bc5411262cc48b05f28a6ba24de685ab11a491 SHA512 3adca92c7e6aad36eec354f7a637c864e0ebba99535d6568c52e033ebd07ce1b026204f9b849889b324184f479ffe6195249c7d3affb1852934cca980b7c018c
 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
 DIST nx-libs-3.5.99.27.tar.gz 11076330 BLAKE2B 713f6052a8405bd61916bc2c31cff1b3b14f63f78138a2d8a3c8d85170fede3d126071ef0e03fa267ef1533432f324992ed67edc86f922e3dda4f0cb40811045 SHA512 bfba1eea6f4debe90fa020276079027c3716daaff91bded72297ecab2a8c9f56d07630ca8bc9084c319d2c674304ad80131190ec1272c161c05221d6f19089d0
-EBUILD nx-3.5.99.26.ebuild 3976 BLAKE2B 6828daf2673119018868dea0b46fc333aa0b646134fb90a81d1cbd5a7fcd5350f91706cabe677a8ade0146830ac9490d27a6fe5b1218573690ddcf3a7b7a6696 SHA512 1b069fbaaf9b797208de3268d126a0e4f11b7faf2bd79dc552b65cd066e9e4ad810d028e7ff7f5c87b6909244223c669e9ef4eb758968ee9a0fb1ba4e70bb0ff
-EBUILD nx-3.5.99.27.ebuild 3718 BLAKE2B 5c3eaa3e1a308e9712079289b6db7681a25a8153f114a2917cc6d017d1375bb49e5e3e296ba8d31e602c1d2cb73888948690a6133a6d8932a5044637d4bc1d24 SHA512 37b2f9e526b240209a6ca504d0c8d7c01d8d7356fc523b8a2cf001f6f066f7a11aa8a8cacc7e36a63caf872be5e4c00a4fe6b49f73cfb5a0ae455b69736b2723
+EBUILD nx-3.5.99.26.ebuild 4079 BLAKE2B b0728e3ccfa65db9aec0c13dc7d445f2f5d85478a7a148276ecbb8deb5d2e1a18ae800791678026c883cb9c7d00cc0e47eb8b5251396840453be18df82de0c5a SHA512 06f147874ccee72357334dab53542f87dd6037ae3c8c97bd59c368a0af1a33e26367310dd6e98e02b043de48a2a8edd6d16f3d145e29c03a0c59b1047fb3acfe
+EBUILD nx-3.5.99.27.ebuild 3822 BLAKE2B 234e6eb1fa670d4135c38f36b27797c85100080c6ba8c3b1cdd090b75d8e972b4ef9ce0ddace1f045d4ff4517c0752c81b46f0ee762bca3b5b3bbcb8577fc219 SHA512 f9c3abed8a12d4164b3c008cd549e1b1286efc736ec550a2540d4eec5ab4ec7b105d7561dd5276ce38dddcba4791789b2a795694da7994460a5e63678514763d
 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch b/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch
new file mode 100644
index 000000000000..c641b033f956
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch
@@ -0,0 +1,51 @@
+Bugs: https://bugs.gentoo.org/927780
+https://github.com/ArcticaProject/nx-libs/pull/1087
+
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 15 Jan 2025 22:03:00 +0000
+Subject: [PATCH] dix: Fix a warning about GetTimeInMillis return value in
+ XFont2.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ported over from XOrg Server:
+
+    commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
+    Author: Emma Anholt <emma@anholt.net>
+    Date:   Mon May 7 16:46:15 2018 -0700
+
+        dix: Fix a warning about GetTimeInMillis return value in XFont2.
+
+        Signed-off-by: Eric Anholt <eric@anholt.net>
+        Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+This resolves the following issue when built with GCC-14 (and beyond):
+
+    ../../dix/dixfonts.c: At top level:
+    ../../dix/dixfonts.c:2485:27: error: initialization of âuint32_t (*)(void)â {aka âunsigned int (*)(void)â} from incompatible pointer type âCARD32 (*)(void)â {aka âlong unsigned int (*)(void)â} [-Wincompatible-pointer-types]
+     2485 |     .get_time_in_millis = GetTimeInMillis,
+          |
+--- a/nx-X11/programs/Xserver/dix/dixfonts.c
++++ b/nx-X11/programs/Xserver/dix/dixfonts.c
+@@ -2471,6 +2471,11 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bo
+     RemoveFontWakeup(fpe);
+ }
+ 
++static uint32_t wrap_time_in_millis(void)
++{
++    return GetTimeInMillis();
++}
++
+ #ifdef HAS_XFONT2
+ static const xfont2_client_funcs_rec xfont2_client_funcs = {
+     .version = XFONT2_CLIENT_FUNCS_VERSION,
+@@ -2482,7 +2487,7 @@ static const xfont2_client_funcs_rec xfont2_client_funcs = {
+     .get_client_resolutions = get_client_resolutions,
+     .get_default_point_size = get_default_point_size,
+     .get_new_font_client_id = get_new_font_client_id,
+-    .get_time_in_millis = GetTimeInMillis,
++    .get_time_in_millis = wrap_time_in_millis,
+     .init_fs_handlers = _init_fs_handlers,
+     .register_fpe_funcs = register_fpe_funcs,
+     .remove_fs_handlers = _remove_fs_handlers,
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 3a112d2be6bb..c08c5941821d 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
 	"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
 	"${FILESDIR}/${PN}-3.5.99.26-which.patch"
+	# https://github.com/ArticaProject/nx-libs/pull/1087
+	"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild
index 60a90c7c8d28..095b3d048849 100644
--- a/net-misc/nx/nx-3.5.99.27.ebuild
+++ b/net-misc/nx/nx-3.5.99.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -44,6 +44,8 @@ S="${WORKDIR}/nx-libs-${PV}"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
 	"${FILESDIR}/${PN}-3.5.99.27-which.patch"
+	# https://github.com/ArcticaProject/nx-libs/pull/1087
+	"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
 )
 
 src_prepare() {