From 713f3c848dc3ecba1a4bfd482d792c7b6aa329b7 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 1 Mar 2024 14:23:46 +0100 Subject: [PATCH] qt6_positioning, remove "replaces" for qt6_locale (#10167) This is needed to run NeoChat 24.02.0 and KF6 --- dev-qt/qt6-positioning/qt6_positioning-6.6.0.recipe | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dev-qt/qt6-positioning/qt6_positioning-6.6.0.recipe b/dev-qt/qt6-positioning/qt6_positioning-6.6.0.recipe index 7a1d15f36..ecd7505c4 100644 --- a/dev-qt/qt6-positioning/qt6_positioning-6.6.0.recipe +++ b/dev-qt/qt6-positioning/qt6_positioning-6.6.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2015-2023 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 GNU FDL v1" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtpositioning-everywhere-src-$portVersion.tar.xz" CHECKSUM_SHA256="8d6520fa3c759ed33eaea7cb1aa7e1e7ec999f828e496a6c592847d61f0fa539" SOURCE_DIR="qtpositioning-everywhere-src-$portVersion" @@ -34,9 +34,6 @@ REQUIRES=" lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " -REPLACES=" - qt6_location$secondaryArchSuffix - " PROVIDES_devel=" qt6_positioning${secondaryArchSuffix}_devel = $portVersion compat >= 6 @@ -47,9 +44,6 @@ REQUIRES_devel=" qt6_positioning$secondaryArchSuffix == $portVersion base qt6_base${secondaryArchSuffix}_devel " -REPLACES_devel=" - qt6_location${secondaryArchSuffix}_devel - " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel