gentoo auto-resync : 23:05:2024 - 00:06:39

4 files changed, 33 insertions, 2 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 0282213d3245..110ee18c3e69 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,6 @@
 AUX freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch 10363 BLAKE2B 03dd4e9795feaf6d4ac8a9f0412b5e9baf3b33e732ff13964c7acdb1bfeb884b524f4483e99de808d4130e70f3310366427f3f1b011735ff22442afd92c6888e SHA512 c66b4d2d18d2189f8df9d68ad556ecae2c5fde8d632c5207960bd1adc33d23c3a4a0ac055657388861b96ce8e391d414b4b98c160f89dad890e911535bdde3d6
 AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23f4dafe90c6b145b2bfe13d1cc6ec3c0729b6b6d3394da3a090fb73903b775b9d51711416ba0a56786e141d7a2bad SHA512 f45a38b36b5caee74be8b590b80e56adb91b42f41ad8149a97ef2ed0f5c10a32e4024149d75e4eb0b0242f086e71d9367ffd4c9dd307f113f1d25f1cc2c0793e
+AUX freerdp-2.11.7-type-mismatch.patch 758 BLAKE2B 3841272554c8b5e3bbd6a94fe00c8a9d429a3ef82f1723ff27a15c23d1be91bc3ec5bc1a9cc7a87911e3d690f2e53a6b46f65a77a5c3f738a585544b512e5743 SHA512 49e5b67904cb84b658c28cf98845b152c4421d506440e8efe04a388aa72d22dee5e41350f2acfeebd0bfc859ff8bc6a2aa654fabecadede3d8fc9166420de2e7
 AUX freerdp-3.4.0-incompatible-pointer.patch 10251 BLAKE2B 70a23022ff8db7dcf0ada3bf2165d6b271f259f4a49b40d4ca2c2de75e5321156cbedcca77240663e143986073d5a49e74b2b6caf456a6136d83673becf6c35e SHA512 c44165fc843742d1cb5859f24c6eaa78cda13837315ca3fde48092835992998701a670a66cf351c406153a65166050b5523e432789b5b6e2151227ea43ef034d
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 DIST freerdp-2.11.6.tar.gz 7337387 BLAKE2B 6d6b338710fccc4ad5067f4cf7f17190409f5313cb0c2c4ad84c82326b605897e01e03e2f334346ae5e20642c7813b415d0123558c00565b4b8c11257ebac226 SHA512 4facaff07bc26434474776e2463c9ebf0111190cb6bcf7d3dc7a6b3d8e2de991925a92b7889b2c5dec50ee4cf28f94bb1016c36da207a00ead09005ea0ace36d
@@ -12,8 +13,8 @@ DIST freerdp-3.5.1.tar.gz 9338947 BLAKE2B dd004333a52046300a5f319346da46ddb460e8
 DIST freerdp-3.5.1.tar.gz.asc 228 BLAKE2B ae5826e539f0078d3adf7a4886f0b0c249c73fd2fc7ae21dcf815d876ec26f4482c242c076dbd9dcadd18927f4f97199f16fac3b40c0c04b1e43482865af15dc SHA512 ba52d6a5aa3d91fdab988d91b8591ccb075ce3d52bbee0596ffdb50902b54e650b397995f273463296a484199b969bab47708b5dbfc76c4128aa54ec5afcfdf2
 EBUILD freerdp-2.11.5-r10.ebuild 3675 BLAKE2B 81ed6fb24d6bdd2ca894b2368e47adc29996441fa251ab5e4fa5d45128027a446c83f733dc9c010c6701e4b42bec15d987381bc3d72a234563c021552fd18a7e SHA512 910dad20fca8dbd8a287b31769f71fb2f660f4001df1b013e1340e19898fe2fd950765517faea66ecb9b8488b7bd1e87595813dccde3749a76f91b92b6a5b4e8
 EBUILD freerdp-2.11.6.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f
-EBUILD freerdp-2.11.7.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f
-EBUILD freerdp-2.9999.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f
+EBUILD freerdp-2.11.7.ebuild 4065 BLAKE2B b99f1e776a8928a2300d7e0a5efbbd6b67ca8070125779cda0a90105f08c348008ceb240a483fd5b9554b7be69085da9f119d300174cc91bec5812466096f4b4 SHA512 13eda5a622d3cf79a3a36357ebb88235983d87dae7aa15b0d9744563b1d44a4897d1d1fc99fad1a38a3d8c4c368cf3fb174f6ac8babfa7522123a08b57ded1b8
+EBUILD freerdp-2.9999.ebuild 4014 BLAKE2B 8e16a4c7dc35301402fbae5da1ba9da5673f0b5c4d8da811e5671f91816265a7dad92b5ae69533f44c084cec371962eac4499a0bb7ce98665336abf3ddaa730e SHA512 7ca53326d24353a2e1bc2d5c006c6a0866c98363d11ab231ff1c086119545979019ad9e13d9e40d4903bb020f4b891a041c0c93edfd566def19296b870e968fc
 EBUILD freerdp-3.4.0-r11.ebuild 4170 BLAKE2B d0c489ddda31ec18c760f17f151cf1381ff9ad018b33d8246a4e7231f98298d8a7083e91be321d75d263f58e0b6e4fc3a71f029f3cf4b8c88d2ef4d7b45f5262 SHA512 da6d233a7bb1ef6aa31a6457dce467aab9abb22f73a3f480825c16bfc3be25501635baf9849ef5e5de2771908adf6a9d89f40d9d6f83b843f32a5e972f52acd8
 EBUILD freerdp-3.5.0.ebuild 4061 BLAKE2B db81f0a4e3e724a56f8a751a8ea75157ddf1bb2084bbcbb0d7cb79c1303943841eb25b47062f873ca37c0c653b5fdaea945aee0679f881e23b3ea3c5aaaaceb9 SHA512 c39ca3be52c6a180268384108dfa908dfdc912988b2b1e6dc4aeb13b53beebca02745898106afb3bde52035d3f78bf752b69ebcec8bdc28527d3540be13ca6af
 EBUILD freerdp-3.5.1.ebuild 4282 BLAKE2B 7df61eb651420605019dd8fd67569194f57aeb3ac79b2a9632812a8f3f537bcac7a7e6457c3bbe35f187b73348aa88f6e6fe749c5e90895d5c15669b2ecb3e6f SHA512 c04f62608dcf2f511468175b7f1fb8eb83174acd61f3a11862751176900b232ebc1bc80d947d07dd513b3570ab6542a5bb1f8a9bb28906af5e61274f1a5227d2
diff --git a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
new file mode 100644
index 000000000000..34720aef4b5b
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
@@ -0,0 +1,23 @@
+From d2b6771c748e54e659d5f1243a92e499c3beaa36 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2024 17:04:43 -0400
+Subject: [PATCH] X11: fix pointer/integer type mismatch
+
+Fixed on master in 2da280b8a1748052b70b3f5a1ef0d8e932c33adc.
+---
+ client/X11/xf_graphics.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
+index 5aa1fd48b5a3..fe81e0ed91cb 100644
+--- a/client/X11/xf_graphics.c
++++ b/client/X11/xf_graphics.c
+@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
+ 
+ #endif
+ fail:
+-	WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1);
++	WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL);
+ 	return rc;
+ }
+ 
diff --git a/net-misc/freerdp/freerdp-2.11.7.ebuild b/net-misc/freerdp/freerdp-2.11.7.ebuild
index 2a7209cfab84..966ad5d7d626 100644
--- a/net-misc/freerdp/freerdp-2.11.7.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.7.ebuild
@@ -106,6 +106,7 @@ src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/freerdp-2.11.2-clang.patch"
 		"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
+		"${FILESDIR}/freerdp-2.11.7-type-mismatch.patch"
 	)
 	cmake_src_prepare
 }
@@ -126,6 +127,9 @@ src_configure() {
 	# bug #881695
 	filter-lto
 
+	# https://bugs.gentoo.org/927731
+	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
 	local mycmakeargs=(
 		-Wno-dev
 		-DBUILD_TESTING=$(option test)
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 2a7209cfab84..b17a66b5c459 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -126,6 +126,9 @@ src_configure() {
 	# bug #881695
 	filter-lto
 
+	# https://bugs.gentoo.org/927731
+	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
 	local mycmakeargs=(
 		-Wno-dev
 		-DBUILD_TESTING=$(option test)