From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21FA41582EF for ; Fri, 07 Mar 2025 22:18:09 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0AAF2342F8D for ; Fri, 07 Mar 2025 22:18:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0DEA411027C; Fri, 07 Mar 2025 22:18:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 01C8711027C for ; Fri, 07 Mar 2025 22:18:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 449E8342F8D for ; Fri, 07 Mar 2025 22:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ECBD288C for ; Fri, 07 Mar 2025 22:18:05 +0000 (UTC) From: "gerion" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "gerion" Message-ID: <1741385810.3b0590d53e9d2aa2ebc3d0a805576a827083d547.gerion@gentoo> Subject: [gentoo-commits] repo/user/gerislay:master commit in: gui-apps/organicmaps/, gui-apps/organicmaps/files/ X-VCS-Repository: repo/user/gerislay X-VCS-Files: gui-apps/organicmaps/Manifest gui-apps/organicmaps/files/fix-3party.patch gui-apps/organicmaps/organicmaps-9999.ebuild X-VCS-Directories: gui-apps/organicmaps/files/ gui-apps/organicmaps/ X-VCS-Committer: gerion X-VCS-Committer-Name: gerion X-VCS-Revision: 3b0590d53e9d2aa2ebc3d0a805576a827083d547 X-VCS-Branch: master Date: Fri, 07 Mar 2025 22:18:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eecee7df-2d52-45cd-8612-23ce197fbec8 X-Archives-Hash: bca38fbeb78ca8b7bca72dda6e6aeea2 commit: 3b0590d53e9d2aa2ebc3d0a805576a827083d547 Author: Gerion Entrup flump de> AuthorDate: Fri Mar 7 22:16:50 2025 +0000 Commit: gerion flump de> CommitDate: Fri Mar 7 22:16:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=3b0590d5 gui-apps/organicmaps: update - fix 3party patch - no init step required anymore - fix test data deletion Signed-off-by: Gerion Entrup flump.de> gui-apps/organicmaps/Manifest | 4 ++-- gui-apps/organicmaps/files/fix-3party.patch | 8 ++++---- gui-apps/organicmaps/organicmaps-9999.ebuild | 13 ++++--------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/gui-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest index b8a847b..7925930 100644 --- a/gui-apps/organicmaps/Manifest +++ b/gui-apps/organicmaps/Manifest @@ -1,4 +1,4 @@ -AUX fix-3party.patch 704 BLAKE2B be92ac6d473c1712ae3978e06af8a80451821af8bbe8cf5ebe31ba87022735173f164a19f46ec1d4557ad5f68fd0a5375e87e7fc858853dd9e013891ce588ae0 SHA512 ba2e9ea92651e50ec885b649568fb2668c46d742d5231a26515e5a3c5ba8e24a3cf00803e563b6a363f479e628a5752906bb0dec52b6cdb7474e465215c7aae4 +AUX fix-3party.patch 700 BLAKE2B ea980cb2a53222eb0e276344e12d30689d1705debbb3b8dd1aa09d49d21edabb4dd7dd57107fde85c19f078ba3e486d150afb7f5c35c63e941af1bb524d4cea3 SHA512 838bf26d3d73eb24b8cf2c5efd833e0dd374be307198a8a890669a2a52444efae17450bf4bfb25556e50c146d6f94fdc983883691ecb65d25191c1647831ccab AUX fix-jansson.patch 1119 BLAKE2B 5988c85b94c919dc9c98bb103e0f3c4e6829463aad9e050e99303874d0198611604a5bb9fe7c69d73a2550a23b063302d216187f520bfa7b58421d195fcce3dd SHA512 a796cdc6066e88b20375246f2c4f4ff8b2d5d510f1f2f56b7e9ff8864f31b158795f603cc15eac880bc5ad444dc8aafb822968292ab4ec1315b45c43bea19824 -EBUILD organicmaps-9999.ebuild 2443 BLAKE2B 31dcff21e5ca6145d612b7043d681fe4d609454f5938b76060fab0f4d5b9f749c8337213a4e6d35e51429a8f52ea3a9bef714ef5ddb109295c956dd6eba4c5dc SHA512 e03fc6fe2974ba4696cfbf443dc9d0ffa5944b7b64ef9c95d94dd849fbe9b9d81e8840c85b92ff3e9a9bd913a80346b74bdfafd0d980a1ac481843ade0e2c495 +EBUILD organicmaps-9999.ebuild 2303 BLAKE2B 0c727309b0d7cfc45415dfcc4fefd191500d45e8d4a7f6ce3ccfb8ebd3c7929a6a344e72dc20158fde43b1c7e4f321c8020826fe8635fd9547cc9e477b692eea SHA512 85d5c6f17bcb7ec808f6af69f1b96fd2e14ff9da8876fbc63d41b9dafe37792bf3b24a4401794cb43afcf8565f8214261a57ba6515d6dd04690d7ff1e9fee8a5 MISC metadata.xml 269 BLAKE2B de28959b3090173e0b4fc0b61b311af4af3c51764f0eb173e71874e684eb8b459a0d8cff52018479b58e0e0e9602f27f715c538c7dda9c055c52e97b8c1b14be SHA512 fa1cf7ea32065ae5b70250aa532b1599b89b695dd8eae7e2aa22ef427036c3b6e56d2ab349963fc39115559b92a817bf198424a41264a86fd4c8cec26746c4f9 diff --git a/gui-apps/organicmaps/files/fix-3party.patch b/gui-apps/organicmaps/files/fix-3party.patch index 9117f64..fa4d6a1 100644 --- a/gui-apps/organicmaps/files/fix-3party.patch +++ b/gui-apps/organicmaps/files/fix-3party.patch @@ -1,8 +1,8 @@ diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt -index d4996e302d..953787945b 100644 +index 57d0592dc3..264d7738d4 100644 --- a/3party/CMakeLists.txt +++ b/3party/CMakeLists.txt -@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) +@@ -40,9 +40,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) # Add pugixml library. add_subdirectory(pugixml) @@ -12,7 +12,7 @@ index d4996e302d..953787945b 100644 if (NOT PLATFORM_LINUX) add_subdirectory(freetype) add_subdirectory(icu) -@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) +@@ -54,6 +51,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source") endif() @@ -21,4 +21,4 @@ index d4996e302d..953787945b 100644 + add_subdirectory(agg) add_subdirectory(bsdiff-courgette) - add_subdirectory(liboauthcpp) + add_subdirectory(minizip) diff --git a/gui-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild index 5c4fe93..22a9dfa 100644 --- a/gui-apps/organicmaps/organicmaps-9999.ebuild +++ b/gui-apps/organicmaps/organicmaps-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit git-r3 python-r1 xdg cmake EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" # this URL is to make the tests compile since organicmaps usually dynamically clones the repo @@ -12,9 +12,9 @@ EGIT_WORLD_FEED_REPO_URI="https://github.com/${PN}/world_feed_integration_tests_ # organicmaps gets more and more system libraries, we use as many # as currently possible, use submodules for the rest EGIT_SUBMODULES=( - 3party/just_gtfs + 3party/just_gtfs # header contains #include 3party/just_gtfs 3party/protobuf/protobuf # wait for https://github.com/organicmaps/organicmaps/pull/6310 - 3party/fast_obj + 3party/fast_obj # header contains #include 3party/fast_obj ) DESCRIPTION="Offline maps and navigation using OpenStreetMap data" @@ -63,11 +63,6 @@ src_unpack() { } src_configure() { - # organicmaps wants a ./configure.sh execution. - # However, this setups mainly stuff for Android and XCode builds that we don't need. - # We need just this line here - cp private_default.h private.h || die - CMAKE_BUILD_TYPE="RelWithDebInfo" local mycmakeargs=( -DWITH_SYSTEM_PROVIDED_3PARTY=yes @@ -81,7 +76,7 @@ src_install() { cmake_src_install # Remove test data - rm -rf "${ED}"/usr/share/${PN}/data/world_feed_integration_tests_data || die + rm -rf "${ED}"/usr/share/${PN}/data/test_data || die } pkg_postinst() {