From 54d0ccbac3b6fbd01dcd252ea006d4e9e62f8e6e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2023 01:53:29 +0000 Subject: gentoo auto-resync : 20:12:2023 - 01:53:29 --- dev-libs/kosmindoormap/Manifest | 4 -- .../kosmindoormap-23.04.3-protobuf-23-1.patch | 31 -------------- .../kosmindoormap-23.04.3-protobuf-23-2.patch | 35 ---------------- .../kosmindoormap/kosmindoormap-23.04.3.ebuild | 49 ---------------------- 4 files changed, 119 deletions(-) delete mode 100644 dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch delete mode 100644 dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch delete mode 100644 dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild (limited to 'dev-libs/kosmindoormap') diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest index a34399bb8f22..ff63d15ac198 100644 --- a/dev-libs/kosmindoormap/Manifest +++ b/dev-libs/kosmindoormap/Manifest @@ -1,9 +1,5 @@ -AUX kosmindoormap-23.04.3-protobuf-23-1.patch 949 BLAKE2B 0a751a22ab7195dfe4363daa90530fa8acb427251c79261b76f701b543c3bbd2aad20a4ecb5292bc05da5511d375d686e2d7c2e66e1d312cd206af4125b2aa49 SHA512 52425c325db0b2607050314b2a4364a6eeaadf18d27cb94cb2423b9008b1396f65c38c26ab0432f083e48d4f2882eeae3e6169f0efeb10edb1e1b8607d4df81a -AUX kosmindoormap-23.04.3-protobuf-23-2.patch 1300 BLAKE2B 47dcb7783f4c91201efd92be6ab12b855b6628f36e8b31e112a38e68702b438c49caaafac2a428a23e0d53a595a8b08d1b6e5a70d7d0a758c23b5e4e7869cacf SHA512 07ee39654ee74e467f81871c1cac501ff1bec5174f8437b7110bb7c788c88789dcd73b2646a56e5ba5155e15af726f097381c93aecd47298c8446469ef2b0e2d -DIST kosmindoormap-23.04.3.tar.xz 375680 BLAKE2B 306336b33c7b03e67531f11163c579dab5b68614f4fd582eb14858a7c80e601e848aaf933c846a144d07e59c215b59f3a0021429f675a76750903144e02829d1 SHA512 1ad5acc7143842005cc02c146e90090d57d8fbafbac6a4401ab94ec966c709f66f7f832169982a808ab21911b16e6f837137c2fd9cf284c540ce03e6647c3405 DIST kosmindoormap-23.08.3.tar.xz 379980 BLAKE2B 5dae843d121543c5bd7fc3021f436b0d5ea4f7554c5f186479036af191946f57c67b95d41fef3b2ea74c71a315be159f49aab1f89afd03cd21bf326d605be1f6 SHA512 5a5d158eb6f231b6975ff24db73eaf4a1969606999fca7b3944a5bbb77393612bc2df3591b320ad8b9c42b0fca751b7f50e990636c22c3748141c20fcfb0c78e DIST kosmindoormap-23.08.4.tar.xz 380016 BLAKE2B d7e6d940ccdac8a17404dc40e5948fed1674d789ba2796e704c71d9b8cae4e79bcc385bd4a245a5b85301f51c37517bc19c17977556e6c4d83bc9f2cd03cc82d SHA512 ea27d24c1623c40b39a8681bc5b119187d463575b3e888aed0c0b2c0549b5997809ebc74e2e08427238586b9f2ee77350d34874862c6084c91245a6040dbfd2a -EBUILD kosmindoormap-23.04.3.ebuild 1134 BLAKE2B e858475078f7c6a6d818c58f58269c70b747c685557ba6f09711b7a8cf57af54bccbfd7105ab755eebc71a3ceeacd6f2864b57f64708824eaf8ee3f77827d0fe SHA512 22f76f9c8468008793990c3c42c28e678f6d0d90068465de5f74db8fe0c74808f160d4aa2430912f3b238a1b87f6a8ef8c1407924e7a634dc15f61e3d414dfd2 EBUILD kosmindoormap-23.08.3.ebuild 1053 BLAKE2B c64e91c277902a3fe8e6fe80636741e561872222b77612bc7d735ec7d920f7fe23cf305fe5e4cbb0e6ed1449e594c6ab5a8eac610705d2937498d1216dc82f8b SHA512 adf24e11048f6fffe005986807cebf8aef87ab1a9b4fd47dd74e95c99362f3504341c04298973f9f3867a66a572231a77da49364389e60bb22461de071e4f01f EBUILD kosmindoormap-23.08.4.ebuild 1053 BLAKE2B c64e91c277902a3fe8e6fe80636741e561872222b77612bc7d735ec7d920f7fe23cf305fe5e4cbb0e6ed1449e594c6ab5a8eac610705d2937498d1216dc82f8b SHA512 adf24e11048f6fffe005986807cebf8aef87ab1a9b4fd47dd74e95c99362f3504341c04298973f9f3867a66a572231a77da49364389e60bb22461de071e4f01f MISC metadata.xml 436 BLAKE2B 7b97cad83675445e816a4f92d2e9c2c4167457df244fd166b6388be7c9336b4852c3873fff4e9d18bf1cccaaeaec849a1b340fa92a15e54180652e53cb023859 SHA512 312c58bb9ef49585287db38ff0f4e6cb6486477f4c84246610c443fb07ced2129017462ef91fab147dde7d69b0923605dc5b68fe71f6cd80f0ed1115b4a9ca6b diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch b/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch deleted file mode 100644 index 427abde08a81..000000000000 --- a/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eac8c57528b5ef8e694df4072ed7a60be799c270 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 5 Jul 2023 16:16:02 +0200 -Subject: [PATCH] Use protobuf's cmake config if available - ---- - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 466c9add..da9881cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,13 @@ find_package(BISON REQUIRED) - set_package_properties(BISON PROPERTIES PURPOSE "MapCSS parser for indoor map rendering.") - - if (NOT WIN32) -- find_package(Protobuf) -+ # try upstream cmake config first -+ set(protobuf_MODULE_COMPATIBLE ON) -+ find_package(Protobuf CONFIG) -+ if(NOT Protobuf_FOUND) -+ # fall back to cmake's protobuf module -+ find_package(Protobuf) -+ endif() - set_package_properties(Protobuf PROPERTIES TYPE OPTIONAL PURPOSE "Parsing of OSM PBF files.") - endif() - --- -GitLab - diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch b/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch deleted file mode 100644 index 965a8a9d82de..000000000000 --- a/dev-libs/kosmindoormap/files/kosmindoormap-23.04.3-protobuf-23-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6dfceab2bacef67ea27b4d1045100b6e0d2be430 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 5 Jul 2023 14:00:29 +0200 -Subject: [PATCH] Use protobuf cmake targets instead of variables - -Makes it compatible with protobuf's upstream cmake config, which is required for protobuf>=22 as the cmake provided module is broken with it. ---- - src/osm/io/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/osm/io/CMakeLists.txt b/src/osm/io/CMakeLists.txt -index bf1d02c9..ec95f7e5 100644 ---- a/src/osm/io/CMakeLists.txt -+++ b/src/osm/io/CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-FileCopyrightText: 2020-2022 Volker Krause - # SPDX-License-Identifier: BSD-2-Clause - --if (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE) -+if (Protobuf_FOUND AND TARGET protobuf::protoc) - PROTOBUF_GENERATE_CPP(pbf_srcs pbf_hdrs - ../pbf/fileformat.proto - ../pbf/osmformat.proto -@@ -19,7 +19,7 @@ if (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE) - set_target_properties(KOSM_pbfioplugin PROPERTIES POSITION_INDEPENDENT_CODE ON) - target_link_libraries(KOSM_pbfioplugin - PUBLIC KOSM -- PRIVATE ${Protobuf_LIBRARIES} ZLIB::ZLIB -+ PRIVATE protobuf::libprotobuf ZLIB::ZLIB - ) - endif() - --- -GitLab - diff --git a/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild b/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild deleted file mode 100644 index a6f7915d7011..000000000000 --- a/dev-libs/kosmindoormap/kosmindoormap-23.04.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Data Model and Extraction System for Travel Reservation information" -HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="+openinghours" - -COMMON_DEPEND=" - >=dev-libs/kpublictransport-${PVCUT}:5 - dev-libs/protobuf:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - sys-libs/zlib - openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" -BDEPEND=" - sys-devel/bison - sys-devel/flex -" - -PATCHES=( "${FILESDIR}"/${P}-protobuf-23-{1,2}.patch ) # bug 909081, in 23.08.0 - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it - $(cmake_use_find_package openinghours KOpeningHours) - ) - ecm_src_configure -} -- cgit v1.2.3