From d0bb3151c569ab6e40c84c177f43bff3c7ce4780 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Aug 2023 15:54:35 +0100 Subject: gentoo auto-resync : 25:08:2023 - 15:54:35 --- net-libs/Manifest.gz | Bin 32333 -> 32328 bytes net-libs/ignition-msgs/Manifest | 3 +- net-libs/ignition-msgs/files/protobuf.patch | 13 ++++ net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild | 1 + net-libs/ignition-transport/Manifest | 5 +- net-libs/ignition-transport/files/protobuf.patch | 76 +++++++++++++++++++++ .../ignition-transport-8.3.0.ebuild | 32 --------- .../ignition-transport-8.4.0.ebuild | 33 +++++++++ net-libs/libktorrent/Manifest | 2 + net-libs/libktorrent/libktorrent-23.08.0.ebuild | 59 ++++++++++++++++ 10 files changed, 189 insertions(+), 35 deletions(-) create mode 100644 net-libs/ignition-msgs/files/protobuf.patch create mode 100644 net-libs/ignition-transport/files/protobuf.patch delete mode 100644 net-libs/ignition-transport/ignition-transport-8.3.0.ebuild create mode 100644 net-libs/ignition-transport/ignition-transport-8.4.0.ebuild create mode 100644 net-libs/libktorrent/libktorrent-23.08.0.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 9909ea8d3471..de8733b1ac4c 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest index ddb508e45e10..f5c53ec60bd9 100644 --- a/net-libs/ignition-msgs/Manifest +++ b/net-libs/ignition-msgs/Manifest @@ -1,3 +1,4 @@ +AUX protobuf.patch 495 BLAKE2B 86b0317d36aa136e508509beb609fa48a881131accbe9cda6a30820acc7c801f0278bf03649be28ac6a857570b102521ffc3cce0cb04f86bbd72f4a11c41fdea SHA512 af57d5f639e2e446883b1aed958813341c75917c259ef8b51e9331bf8324de4e0fa639843b63d375c637e14974790c436bbfdccaff373bb26fc558b4b67e0447 DIST ignition-msgs5_5.11.0.tar.gz 346560 BLAKE2B 87dd9c99f9d8bf8719f2968a89fbe9fd276d4b35f5a870eee0ab7476affdbca565fbdc7c3e5e94a29a21df6e7b6ace138a8db00ba838de6d8ba07478dd6a3456 SHA512 bbd71339c816947cbf91778303c4370e3d03b068421f0a043de3462d5eb691b16cbc3d19804cb353ad03f78f3e187af366e9d950fa05ebf22d0d08c565748bc4 -EBUILD ignition-msgs-5.11.0.ebuild 632 BLAKE2B 0775646b83928f7d4f7a6641bb66dac06bcc933362546449970c4e811a35707f9a6c549bfe0a42d6e2824c552e02f8987b7b47ead318964294f2c50531582bc1 SHA512 9c6e0d9e6076787c73d82fe4a4891705dbd4eefd2beaada86a766023f293e3a68a87874e95c359d0ca7fc30db688714b8cbcf8466d012f2c70739b38fa997092 +EBUILD ignition-msgs-5.11.0.ebuild 673 BLAKE2B 1863753afa5851bc991be8880c0267c446ac83706b2d11f791a75aa62d5eff932f0ac084fc963b9e2b44422f59729f10c55bab3b5095d9df1d1e526fc42e5e2e SHA512 9fad23cc22c07c3115a5907a3b18a22d5820e5b4d90dc5b04366b5b266ca6f112333261eaa0cb8c53e72e3ad690a19fb1c2f7fd8770def9b8b0189de25a7e0ae MISC metadata.xml 343 BLAKE2B 00262d03f9243dbaff38706a32cb99e9673414480d7141598846c9431f13600f5bec6a72917544e4ec0782bb11cdb77d31113c7dd41a97dfd439c824f5752796 SHA512 a19ed05b831b26062800346a5fa5ff3b3431fd2595e2603a0455c51923118a4293fc1db8c10aa456a4d71cacb6e6727dc5ee968932ff28532c51e285d1457ece diff --git a/net-libs/ignition-msgs/files/protobuf.patch b/net-libs/ignition-msgs/files/protobuf.patch new file mode 100644 index 000000000000..5a441ae4d2a9 --- /dev/null +++ b/net-libs/ignition-msgs/files/protobuf.patch @@ -0,0 +1,13 @@ +Index: gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt +=================================================================== +--- gz-msgs-ignition-msgs5_5.11.0.orig/CMakeLists.txt ++++ gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt +@@ -62,7 +62,7 @@ message(STATUS "\n\n-- ====== Finding De + + #-------------------------------------- + # Find Protobuf +-set(REQ_PROTOBUF_VER 3) ++set(REQ_PROTOBUF_VER 4) + ign_find_package(IgnProtobuf + VERSION ${REQ_PROTOBUF_VER} + REQUIRED diff --git a/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild index 552d7c3fb165..647b49fb7925 100644 --- a/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild +++ b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild @@ -23,3 +23,4 @@ DEPEND="${RDEPEND} BDEPEND="dev-util/ignition-cmake:2" CMAKE_BUILD_TYPE=RelWithDebInfo S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}" +PATCHES=( "${FILESDIR}/protobuf.patch" ) diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest index 178d0ece1dae..7e28f90e89e4 100644 --- a/net-libs/ignition-transport/Manifest +++ b/net-libs/ignition-transport/Manifest @@ -1,3 +1,4 @@ -DIST ignition-transport8_8.3.0.tar.gz 607354 BLAKE2B f6d9213824fe8bd870968762173022cbd9196809574f9c16de625a75e903c883625f27faaf95fad5aa876e8cd2822f082b3dff7e3bd8c90e70766c2073aa19dd SHA512 120e9e7aea50e7f83d854c1ba61696ddf559db000f9d81ebfcad35db6752c1b5b6319163bd35080f5ccd5d2af928734dc836124c065dd77fd4076aedfb569ea4 -EBUILD ignition-transport-8.3.0.ebuild 765 BLAKE2B 9ebf0cc15b0691c1f6955d8323074536ddcf58d0b7a9d29aee27dc78bca1321afddfc7bc0420015ced34052c1623548402ba6a435e1586026e89ab3b9451602c SHA512 87f7179aab3eee2092e22ab9117f89c7a2ed1847562fc9ee0a2580b64f0268569b19fb2e9bdb1fd2bb81c03fa787df458d6bd4a494fc70919f7874eb0c38f974 +AUX protobuf.patch 2777 BLAKE2B 80a57a03e4dbcabaa810f9c8a90f47e29f22e869367ea71fc2d8c4e80e7d3d9eac8fd3592a868a7a247e84954105c271f4302f1a60cae7331465ff322d2af151 SHA512 e96636f7f85ad92fcb24d0b30469d7ba4fec56f41d9c2be5004c3155f7c9541d0300ddff0815ff91a34aab29f488c1fe488d06f456ed16d3334d9181f8f733f8 +DIST ignition-transport8_8.4.0.tar.gz 610048 BLAKE2B 82ece18d0777d8ca4f64d3b5c37a8532f3a1d067772303f4373e663a99e95573f8991db465a2d6d86606c8565d2af667c96f2ecf7a8dca032c5ab2d7888e7ea4 SHA512 7ed3d59b707f2d1b26bf80dfa7cc9633d4ce5a39b97c5396012e73bd949859ad3b71f79b8aa025ca78f5c1796bfdc9006c1c704f1b6b75e854ffcfc4c3ab53f8 +EBUILD ignition-transport-8.4.0.ebuild 806 BLAKE2B 3690f63528045dcda2ca900d774b3693aeae3edc5b524089a88a93a705c7eadab51c248cfd6afe8d4bed1d41fc5ff1a4b178b96d7496c24c37eaee7943025371 SHA512 f74e8270be59651294522f55e25f1a739720717e842842462e3dd8c13465080d5ede083b0c74fb5f35ce762d806393ca284aa0b91af4740acab57b78ec85fd3f MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af diff --git a/net-libs/ignition-transport/files/protobuf.patch b/net-libs/ignition-transport/files/protobuf.patch new file mode 100644 index 000000000000..497da899db7a --- /dev/null +++ b/net-libs/ignition-transport/files/protobuf.patch @@ -0,0 +1,76 @@ +From e35a697b619dbcecec0ae0c8b8f0a644d368abf3 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Tue, 6 Jun 2023 17:19:49 +0200 +Subject: [PATCH] Fix compatibility with protobuf 22 + +Signed-off-by: Silvio Traversaro +--- + CMakeLists.txt | 2 -- + include/gz/transport/RepHandler.hh | 8 ++++++-- + include/gz/transport/SubscriptionHandler.hh | 6 ++++-- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e3aab859..843fb17cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,9 +38,7 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") + + #-------------------------------------- + # Find Protobuf +-set(REQ_PROTOBUF_VER 3) + ign_find_package(IgnProtobuf +- VERSION ${REQ_PROTOBUF_VER} + REQUIRED + PRETTY Protobuf) + +diff --git a/include/gz/transport/RepHandler.hh b/include/gz/transport/RepHandler.hh +index 5d27f98c1..a5675fca7 100644 +--- a/include/gz/transport/RepHandler.hh ++++ b/include/gz/transport/RepHandler.hh +@@ -26,7 +26,7 @@ + #pragma warning(pop) + #endif + +-#if GOOGLE_PROTOBUF_VERSION > 2999999 ++#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000 + #include + #endif + +@@ -140,7 +140,11 @@ namespace ignition + return false; + } + +-#if GOOGLE_PROTOBUF_VERSION > 2999999 ++#if GOOGLE_PROTOBUF_VERSION >= 4022000 ++ auto msgReq = ++ google::protobuf::internal::DownCast(&_msgReq); ++ auto msgRep = google::protobuf::internal::DownCast(&_msgRep); ++#elif GOOGLE_PROTOBUF_VERSION > 2999999 + auto msgReq = google::protobuf::down_cast(&_msgReq); + auto msgRep = google::protobuf::down_cast(&_msgRep); + #else +diff --git a/include/gz/transport/SubscriptionHandler.hh b/include/gz/transport/SubscriptionHandler.hh +index 78477add0..d69c83ddb 100644 +--- a/include/gz/transport/SubscriptionHandler.hh ++++ b/include/gz/transport/SubscriptionHandler.hh +@@ -28,7 +28,7 @@ + + #include + +-#if GOOGLE_PROTOBUF_VERSION >= 3000000 ++#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000 + #include + #endif + +@@ -211,7 +211,9 @@ namespace ignition + if (!this->UpdateThrottling()) + return true; + +-#if GOOGLE_PROTOBUF_VERSION >= 3000000 ++#if GOOGLE_PROTOBUF_VERSION >= 4022000 ++ auto msgPtr = google::protobuf::internal::DownCast(&_msg); ++#elif GOOGLE_PROTOBUF_VERSION >= 3000000 + auto msgPtr = google::protobuf::down_cast(&_msg); + #else + auto msgPtr = google::protobuf::internal::down_cast(&_msg); diff --git a/net-libs/ignition-transport/ignition-transport-8.3.0.ebuild b/net-libs/ignition-transport/ignition-transport-8.3.0.ebuild deleted file mode 100644 index dd2ad51efb98..000000000000 --- a/net-libs/ignition-transport/ignition-transport-8.3.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Combines ZeroMQ with Protobufs to create a message passing system" -HOMEPAGE="https://github.com/ignitionrobotics/ign-transport" -SRC_URI="https://github.com/ignitionrobotics/ign-transport/archive/${PN}8_${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - net-libs/ignition-msgs:5= - dev-libs/protobuf:= - >=net-libs/zeromq-4.2.0:= - sys-apps/util-linux - net-libs/cppzmq - dev-db/sqlite:3 -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-util/ignition-cmake:2" -BDEPEND=" - dev-util/ignition-cmake:2 - virtual/pkgconfig" -CMAKE_BUILD_TYPE=RelWithDebInfo -S="${WORKDIR}/gz-transport-ignition-transport8_${PV}" diff --git a/net-libs/ignition-transport/ignition-transport-8.4.0.ebuild b/net-libs/ignition-transport/ignition-transport-8.4.0.ebuild new file mode 100644 index 000000000000..1661b79abf05 --- /dev/null +++ b/net-libs/ignition-transport/ignition-transport-8.4.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Combines ZeroMQ with Protobufs to create a message passing system" +HOMEPAGE="https://github.com/ignitionrobotics/ign-transport" +SRC_URI="https://github.com/ignitionrobotics/ign-transport/archive/${PN}8_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="8" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + net-libs/ignition-msgs:5= + dev-libs/protobuf:= + >=net-libs/zeromq-4.2.0:= + sys-apps/util-linux + net-libs/cppzmq + dev-db/sqlite:3 +" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} + dev-util/ignition-cmake:2" +BDEPEND=" + dev-util/ignition-cmake:2 + virtual/pkgconfig" +CMAKE_BUILD_TYPE=RelWithDebInfo +S="${WORKDIR}/gz-transport-ignition-transport8_${PV}" +PATCHES=( "${FILESDIR}/protobuf.patch" ) diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest index 728c86a05ad0..279df49c1b3d 100644 --- a/net-libs/libktorrent/Manifest +++ b/net-libs/libktorrent/Manifest @@ -1,3 +1,5 @@ DIST libktorrent-23.04.3.tar.xz 604076 BLAKE2B 50fd77cbd0563e2c38ed5e3e835315a71ec095befc99d2600402c2bef7ae1f47d1a71b265d110a164f3dabdb249a0a4b0c42b698e7e1adbf5fa8fab323761351 SHA512 5eb26785c29846290ed3d16809d618d3ce8027fa7a6f03d07b2ecf7c5b541dec8dc4a98f749a8716fbcedc8ea1181bdda53338c6fffb8acccdd39dabde5087df +DIST libktorrent-23.08.0.tar.xz 604156 BLAKE2B 08a6da6559205963588057a65ae89cffe8bcf875958127344bd8c01f3d4527ea9495bc8caeb59fc35be2bb98927a9d9d51eedebf54293d1f06766d55a056a048 SHA512 c3cad400b024c6afbef66af3ba01306f6d7e73664dc07fa546b48881b7615b85e6cdd0f3d2ef384524448622c03be28ff14ab0b49099da892fdd2e126fa4067b EBUILD libktorrent-23.04.3.ebuild 1424 BLAKE2B 9799aed8456ea870a3499ad7789c9a94d9eccbd0f37f7000095b4d642e3b01bf1dd5667ed1ead93416bb58c9b262e1377bea22acfc567d7c1160dca7a89a9fb8 SHA512 201cdf6a4fc434260c5cdd71ea2210e3e7ca171ad5f5cc21cbaaf9771a55f5fc3d69cf1dc8fe5cf4075083dfb0645470556ee916a082f78d6861b84ddb82d2dd +EBUILD libktorrent-23.08.0.ebuild 1427 BLAKE2B 3a74fa7ac7abe64b3fc839af4f97f5560269db73ebb98da5e46e268f629cc7ef2a2815436910aaa443b54b00f281e8a7fe0a55124333b0d7c023909e60c2d8f7 SHA512 3abea601c401cc426ed483b598633697bd274289a91aa4414bfaddc49400529aaa6ad1b7f2037cfa5e6b44df82931e9500ee4fd931aebfa6d2ab6ac3ee37aa60 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/net-libs/libktorrent/libktorrent-23.08.0.ebuild b/net-libs/libktorrent/libktorrent-23.08.0.ebuild new file mode 100644 index 000000000000..97bd4df6feec --- /dev/null +++ b/net-libs/libktorrent/libktorrent-23.08.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KDE_ORG_CATEGORY="network" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="BitTorrent library based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +COMMON_DEPEND=" + >=app-crypt/qca-2.3.0:2[qt5(+)] + >=dev-libs/gmp-6.0.0a:0= + dev-libs/libgcrypt:0= + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.71 +" +RDEPEND="${COMMON_DEPEND} + !dev-libs/botan[gmp(-)] +" +BDEPEND="sys-devel/gettext" + +src_prepare() { + ecm_src_prepare + + # Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this + sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \ + CMakeLists.txt || die + sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \ + KF5TorrentConfig.cmake.in || die +} + +src_test() { + # failing network tests + local myctestargs=( + -E "(fin|packetloss|send|superseedtest|transmit|utppolltest)" + ) + + ecm_src_test +} -- cgit v1.2.3