From d9712457ef49f237fe57111203a3bf165c28ea03 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 6 Sep 2024 16:50:49 +0200 Subject: dev-build/ignition-cmake: use proper patch to find protobuf Signed-off-by: Alexis Ballier --- dev-build/ignition-cmake/files/protobuf2.patch | 13 +++++++++++++ dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild | 1 + 2 files changed, 14 insertions(+) create mode 100644 dev-build/ignition-cmake/files/protobuf2.patch (limited to 'dev-build') diff --git a/dev-build/ignition-cmake/files/protobuf2.patch b/dev-build/ignition-cmake/files/protobuf2.patch new file mode 100644 index 000000000000..1c28803e7ff0 --- /dev/null +++ b/dev-build/ignition-cmake/files/protobuf2.patch @@ -0,0 +1,13 @@ +Index: gz-cmake-ignition-cmake2_2.17.2/cmake/FindIgnProtobuf.cmake +=================================================================== +--- gz-cmake-ignition-cmake2_2.17.2.orig/cmake/FindIgnProtobuf.cmake ++++ gz-cmake-ignition-cmake2_2.17.2/cmake/FindIgnProtobuf.cmake +@@ -31,7 +31,7 @@ find_package(Protobuf ${IgnProtobuf_FIND + 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 CONFIG REQUIRED) + endif() + + set(IgnProtobuf_missing_components "") diff --git a/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild b/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild index 7eefbd534ef4..dcd8ecacc7a5 100644 --- a/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild +++ b/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild @@ -14,6 +14,7 @@ SLOT="2" KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/protobuf2.patch" ) S="${WORKDIR}/gz-cmake-${PN}2_${PV}" src_configure() { -- cgit v1.2.3-65-gdbad