gentoo auto-resync : 18:04:2023 - 11:55:01

3 files changed, 64 insertions, 2 deletions

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index d4424d4ed75e..63c9b5f35541 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,5 +1,6 @@
+AUX synergy-1.14.1.32-gcc13.patch 1746 BLAKE2B e3537422b63ba65f0090c0e1842dabe77d908e7ec47fea203cb0ed3d678fe563896fb925df7e6b56af305d96caeb3ef19b1da23e3eff4fb3310ec64c2e258011 SHA512 7a327bab118932961f521d29dfa5bceec4b74b44edcfc43238cb0379882030982db580155e4955d2ed69e6bc88c4ae9df95e651233a244169db0e2f09c5883e8
 DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
 DIST synergy-core-1.14.1.32-stable.tar.gz 4617994 BLAKE2B c015ddff44175ea6b0436ab0d7eccfc4e693d7697a67a1b256d310784d794589b1f1815c95fc5948b9987b2c8d11b6bd0685efe08fc87291835fb03b7dcce970 SHA512 c0835d9f1b3f05a994d8340c7abdeb4ed7ab68739d3c0f05e61f639924978d2de1ed1ded58b398287aa29d013a73114b71a578572d2ad6f96e3fce3e0e1a8bc6
-EBUILD synergy-1.14.1.32.ebuild 2480 BLAKE2B fdde5dde71a4f4f415f43c43bd8618ad563517ff774c8ab2d0765c50a9e88ec50e175ea59aa906b65d6012b8b8f391af85574d21f4d53899b4ef4237118fa196 SHA512 5e3e749c6821bd14dd842a1b8b34e0e8b0bca93187a32b6395b2fd6012972ecac2dbf612247b28639e8b603cbc5db97532a9e96106aa3b020d57356df301a193
+EBUILD synergy-1.14.1.32.ebuild 2536 BLAKE2B 338667f2c1e0798f185f9ce3ae33c018af7a12332405630add816de2313d6474f98f804d99e3e4eb977acfa7c4bef23e40814f68e6210e99f64aebf7188a2c1e SHA512 1f08e6ba2327243665e56b1bbd5da8a8570f1568cf56db60574893d5853cd73e99572c78aec0e50b7a64c5a3d2034e99042d6cd53d0d8fb6a6fcc4310e2c5279
 MISC metadata.xml 253 BLAKE2B 292b1b20a01320b1ba0052bd4a7cf499185927595330234f4d6d52af72cf3e89f1760cba8fc2318cb9bc18e61d2251d55726da4b9f5db965a715283f4b01172e SHA512 b5f0c70817e0d820b23a0fb792664ea05b8b47aacec7c501993dabf8abe7d841f0f5bd8d9d95a82c651bcfe2c847d06589d2abc2e2d029e56c26325ebb02dc11
diff --git a/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch b/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch
new file mode 100644
index 000000000000..655199f4b04a
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/898032
+https://github.com/symless/synergy-core/commit/ab8a7b5ed44a3aeadc7a20f0e4020d47ac258e14
+
+From ab8a7b5ed44a3aeadc7a20f0e4020d47ac258e14 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 8 Dec 2022 09:16:44 +0000
+Subject: [PATCH] add missing <cstdint> includes for SIZE_MAX (#7237)
+
+Without the change the build on upcoming `gcc-13` ails as:
+
+    src/lib/base/Log.cpp: In member function 'void Log::print(const char*, int, const char*, ...)':
+    src/lib/base/Log.cpp:128:23:
+      error: 'SIZE_MAX' was not declared in this scope
+      128 |     if ((strnlen(fmt, SIZE_MAX) > 2) && (fmt[0] == '%' && fmt[1] == 'z')) {
+          |                       ^~~~~~~~
+    src/lib/base/Log.cpp:30:1:
+      note: 'SIZE_MAX' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+       29 | #include <ctime>
+      +++ |+#include <cstdint>
+       30 |
+
+gcc-13 cleaned it's header dependencies and that exposes these failures.
+--- a/src/lib/base/Log.cpp
++++ b/src/lib/base/Log.cpp
+@@ -23,10 +23,11 @@
+ #include "base/log_outputters.h"
+ #include "common/Version.h"
+ 
++#include <cstdint>
+ #include <cstdio>
+ #include <cstring>
+ #include <iostream>
+-#include <ctime> 
++#include <ctime>
+ 
+ // names of priorities
+ static const char*        g_priority[] = {
+--- a/src/lib/base/String.cpp
++++ b/src/lib/base/String.cpp
+@@ -21,6 +21,7 @@
+ #include "common/stdvector.h"
+ 
+ #include <cctype>
++#include <cstdint>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+--- a/src/lib/synergy/IKeyState.cpp
++++ b/src/lib/synergy/IKeyState.cpp
+@@ -19,6 +19,7 @@
+ #include "synergy/IKeyState.h"
+ #include "base/EventQueue.h"
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <cstdlib>
+ 
diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild
index ed1586ea37b1..a85da6a5502d 100644
--- a/x11-misc/synergy/synergy-1.14.1.32.ebuild
+++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,6 +60,10 @@ BDEPEND="
 
 DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.1.32-gcc13.patch
+)
+
 src_prepare() {
 	# broken on Xvfb
 	rm src/test/integtests/platform/XWindowsScreenTests.cpp || die