diff options
Diffstat (limited to 'dev-util/ignition-cmake')
-rw-r--r-- | dev-util/ignition-cmake/Manifest | 5 | ||||
-rw-r--r-- | dev-util/ignition-cmake/files/protobuf.patch | 54 | ||||
-rw-r--r-- | dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild (renamed from dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild) | 3 |
3 files changed, 59 insertions, 3 deletions
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest index c5de601de5d8..6a9a1197f839 100644 --- a/dev-util/ignition-cmake/Manifest +++ b/dev-util/ignition-cmake/Manifest @@ -1,3 +1,4 @@ -DIST ignition-cmake2-2.16.0.tar.bz2 209182 BLAKE2B 8ee21bedfbaa35ef3ea6a758de074e72b1b2003531ca5900310ef4b34bf95f7e2d49ca8cb3d023a86810e302eb11e4edbc1769e03cb58ddedb74819a520b3177 SHA512 c391112b9120bb415a596f8258da173949b62f3d28e216d1c94d2c3ec05062c6999148ef03ce2653d0ca21e70f66d991ec1d0fe105d280eb19aee57530b34896 -EBUILD ignition-cmake-2.16.0.ebuild 530 BLAKE2B bd184cc78acb11b89523d479b8c4654687eb33775398a17fc57f1a13de556ee57316c3b2078571ab92c6ec1b2ab5f0b54291f535f08231168c7671a1572a7226 SHA512 011d3dfbfa3a127b3ccb0a6d4857a7ad29ae92c71e5d13c6dca5cdc4fa23f74f453527f84be1dffc8475ebb9811a708b8f028e20ed444fadd9b29759426a0c03 +AUX protobuf.patch 2224 BLAKE2B d9707647c874ea0b06232283c491c303317e27d8566b093752bfca5bcf6f919fc4d773e0c939e47e4e6fb39a026b07f569f03a1b9383c0a3ba9838d640082424 SHA512 1ce7f696424d8a8b1ae90372996dfd767ca2eb7f6e20f6e67daf6e16713013e0789b545584860203306d2d40830b2415844a939cf94dc08a5966489504e543dc +DIST ignition-cmake2-2.17.0.tar.bz2 212353 BLAKE2B 4945559d35cea859383fc510fd2b78cbbd3127ef58c94fa239ecad3643725b7e003a9a18ddb25deec42938196adaf0a4f3466b602cf35dd1fe58f02c5a0ede91 SHA512 bb7263531c772474780fab990dafaa9697b1ce7d9113053bc7af3b2ae6cf292a46c6b37452e5bf720ef34ed3a9732503106d5e55b5ae813bed65618ae4ee69dc +EBUILD ignition-cmake-2.17.0.ebuild 571 BLAKE2B 8b9e32271aa99c389cf4e1a7bdb98c9e0cb0a7243a5aa232b43819f5d00a220f2f01d0927b5db4d8473e228c3c9bac7308b0dd2e3ef5fa35105ddb21e6fd057b SHA512 0223878589ca269fad2986a752df139a79e95e6331a4cea2bc4b6bff22073e33ac74fb58c2b3dba2da100e3c4d553ced207caaf38409069807f86fdda6cc1565 MISC metadata.xml 410 BLAKE2B f0398d55e4e2dc9cb7a350e9c2472d9a6b3856f9086b8dc4137d44c4b25c50cef6e9564cf44b1e7374fbfac72fc3990364e7c35962016644818069e6311adb1a SHA512 577eae419cf6950a1ae2b892a20c18428b490d6375ef05aad34bf0ac9a0acb246b26863e1175c5309d2900d5eb21aa603c32e27a16aa4c1dbd60006ceed5a2da diff --git a/dev-util/ignition-cmake/files/protobuf.patch b/dev-util/ignition-cmake/files/protobuf.patch new file mode 100644 index 000000000000..1bb2fe6480bb --- /dev/null +++ b/dev-util/ignition-cmake/files/protobuf.patch @@ -0,0 +1,54 @@ +Index: ignition-cmake-2.17.0/cmake/FindIgnProtobuf.cmake +=================================================================== +--- ignition-cmake-2.17.0.orig/cmake/FindIgnProtobuf.cmake ++++ ignition-cmake-2.17.0/cmake/FindIgnProtobuf.cmake +@@ -26,12 +26,12 @@ + include(IgnPkgConfig) + ign_pkg_config_entry(IgnProtobuf "protobuf >= ${IgnProtobuf_FIND_VERSION}") + +-find_package(Protobuf ${IgnProtobuf_FIND_VERSION} QUIET CONFIG) ++find_package(protobuf ${IgnProtobuf_FIND_VERSION} QUIET CONFIG) + +-if(NOT ${Protobuf_FOUND}) ++if(NOT ${protobuf_FOUND}) + # If a config-file was not found, then fall back on the system-installed + # find-module that comes with CMake. +- find_package(Protobuf ${IgnProtobuf_FIND_VERSION}) ++ find_package(protobuf ${IgnProtobuf_FIND_VERSION}) + endif() + + set(IgnProtobuf_missing_components "") +@@ -49,21 +49,21 @@ foreach(component ${IgnProtobuf_FIND_COM + + if((${component} STREQUAL "libprotobuf") OR (${component} STREQUAL "all")) + if((NOT PROTOBUF_LIBRARY) AND (NOT TARGET protobuf::libprotobuf)) +- set(Protobuf_FOUND false) ++ set(protobuf_FOUND false) + ign_string_append(IgnProtobuf_missing_components "libprotobuf" DELIM " ") + endif() + endif() + + if((${component} STREQUAL "libprotoc") OR (${component} STREQUAL "all")) + if((NOT PROTOBUF_PROTOC_LIBRARY) AND (NOT TARGET protobuf::libprotoc)) +- set(Protobuf_FOUND false) ++ set(protobuf_FOUND false) + ign_string_append(IgnProtobuf_missing_components "libprotoc" DELIM " ") + endif() + endif() + + if((${component} STREQUAL "protoc") OR (${component} STREQUAL "all")) + if((NOT PROTOBUF_PROTOC_EXECUTABLE) AND (NOT TARGET protobuf::protoc)) +- set(Protobuf_FOUND false) ++ set(protobuf_FOUND false) + ign_string_append(IgnProtobuf_missing_components "protoc" DELIM " ") + endif() + endif() +@@ -74,7 +74,7 @@ if(IgnProtobuf_missing_components AND NO + message(STATUS "Missing required protobuf components: ${IgnProtobuf_missing_components}") + endif() + +-if(${Protobuf_FOUND}) ++if(${protobuf_FOUND}) + # If we have found Protobuf, then set the IgnProtobuf_FOUND flag to true so + # that ign_find_package(~) knows that we were successful. + set(IgnProtobuf_FOUND true) diff --git a/dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild index 52d3b6de808d..b19b57da6d01 100644 --- a/dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild +++ b/dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -14,6 +14,7 @@ SLOT="2" KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/protobuf.patch" ) src_configure() { local mycmakeargs=( |