From 9d9377a6e929dc2e3e4445882257ecddff7135d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 24 Nov 2021 10:24:40 +0100 Subject: [PATCH] qtwebengine_bin: conflicts instead of replace --- dev-qt/qtwebengine/qtwebengine_bin-5.15.2.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine_bin-5.15.2.recipe b/dev-qt/qtwebengine/qtwebengine_bin-5.15.2.recipe index bb2e08e9a..e232b84d4 100644 --- a/dev-qt/qtwebengine/qtwebengine_bin-5.15.2.recipe +++ b/dev-qt/qtwebengine/qtwebengine_bin-5.15.2.recipe @@ -5,7 +5,7 @@ HOMEPAGE="https://www.qt.io" COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/threedeyes/qtwebengine-haiku/releases/download/$portVersion-2/qtwebengine-$portVersion-2-x86_64.hpkg#noarchive" CHECKSUM_SHA256="df467a8901d60fd5c15665df88a3fef4167cc8b2da414ed7559f2df97b29c254" SOURCE_URI_2="https://github.com/threedeyes/qtwebengine-haiku/releases/download/$portVersion-2/qtwebengine_devel-$portVersion-2-x86_64.hpkg#noarchive" @@ -66,7 +66,7 @@ REQUIRES=" lib:libwebpmux$secondaryArchSuffix lib:libz$secondaryArchSuffix " -REPLACES=" +CONFLICTS=" qtwebengine$secondaryArchSuffix " @@ -82,7 +82,7 @@ REQUIRES_devel=" haiku$secondaryArchSuffix qtwebengine_bin$secondaryArchSuffix == $portVersion base " -REPLACES_devel=" +CONFLICTS_devel=" qtwebengine${secondaryArchSuffix}_devel "