gentoo resync : 14.12.2020

3 files changed, 39 insertions, 8 deletions

diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 5c72524882b2..a7e0213cd547 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,5 +1,6 @@
-DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093 SHA512 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250
+AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
 DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B 93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57 SHA512 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374
-EBUILD libarcus-4.6.1.ebuild 1413 BLAKE2B b86d88ae8593f0604b1aed03d4463bec146eeb3ffe7b9387a3e4a40fa4aaaa02dfbfd2fcf75441012aeea630700e606a7f0d2fbb5e164e5100b4792795d94dd3 SHA512 d96d6c1dc57ae1364d6776ab0eadfa05633982fc43e0275cb9b488813b73157849c8b11b64d8eaf479dd26c137680a6873c11726fedd1348bcedab9bdaa8a3da
+DIST libarcus-4.8.0.tar.gz 31906 BLAKE2B 677fafa3875834c7602bc85b7246f50ed0dc49e886814c4562ce41a1a7baecfb4fb0bac42aada5339fe73cbd3fc5ac3b28076bf72a1e24591a947d747c6eb794 SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689
 EBUILD libarcus-4.7.0.ebuild 1296 BLAKE2B 46122f8ecd8ca43cdec1a249d01198b5e5d72257d69c42a11ab3fe3bc8b555e68cbbafe548f6cd30bb53573b5fd5379208cc90c37378393eef177618152aecfa SHA512 4575ab25cd24d8745f8a19ccee7fd0157e4fcdf7cf2ea74db4cf1e96cfd941436351117b6f3d50641b9cbbe669b7289628d0d3df4dfd9d1a0c5a54da0802a928
+EBUILD libarcus-4.8.0.ebuild 1361 BLAKE2B ede2807324a1d667b3c6cc3a90874d68a57594e877424aedfbd25d0149cb5c173bce8a1ad725deb9fb2a5a4242c81b44e0a8052465c4f37daf40e84d707c2832 SHA512 a2f6c5e2ff007727d77d3c570b4c4333db04cd44bad54d2d5663d2f7b8cf2479f5cb19a84e546217ef0ec704da07fad291cbe67ce6ebb60997d862b4e32088d9
 MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49
diff --git a/dev-libs/libarcus/files/libarcus-4.8.0-deprecated-protobuf-calls.patch b/dev-libs/libarcus/files/libarcus-4.8.0-deprecated-protobuf-calls.patch
new file mode 100644
index 000000000000..659885d406e3
--- /dev/null
+++ b/dev-libs/libarcus/files/libarcus-4.8.0-deprecated-protobuf-calls.patch
@@ -0,0 +1,30 @@
+--- a/src/Socket_p.h
++++ b/src/Socket_p.h
+@@ -128,9 +128,6 @@
+
+         static const int keep_alive_rate = 500; //Number of milliseconds between sending keepalive packets
+
+-        // This value determines when protobuf should warn about very large messages.
+-        static const int message_size_warning = 400 * 1048576;
+-
+         // This value determines when protobuf should error out because the message is too large.
+         // Due to the way Protobuf is implemented, messages large than 512MiB will cause issues.
+         static const int message_size_maximum = 500 * 1048576;
+@@ -362,7 +359,7 @@
+             return;
+         }
+
+-        uint32_t message_size = message->ByteSize();
++        uint32_t message_size = message->ByteSizeLong();
+         if(platform_socket.writeUInt32(message_size) == -1)
+         {
+             error(ErrorCode::SendFailedError, "Could not send message size");
+@@ -548,7 +545,7 @@
+
+         google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size);
+         google::protobuf::io::CodedInputStream stream(&array);
+-        stream.SetTotalBytesLimit(message_size_maximum, message_size_warning);
++        stream.SetTotalBytesLimit(message_size_maximum);
+         if(!message->ParseFromCodedStream(&stream))
+         {
+             error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data));
diff --git a/dev-libs/libarcus/libarcus-4.6.1.ebuild b/dev-libs/libarcus/libarcus-4.8.0.ebuild
index a1481fb098bd..b4abce1942f4 100644
--- a/dev-libs/libarcus/libarcus-4.6.1.ebuild
+++ b/dev-libs/libarcus/libarcus-4.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="examples +python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -29,18 +29,18 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated-protobuf-calls.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	default
-
 	# Find SIP for current python version, not the latest installed
 	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		cmake/FindSIP.cmake || die
+		CMakeLists.txt cmake/FindSIP.cmake || die
 
 	cmake_src_prepare
 }