From 35edecf95d8c8b69f0bd4e01e75d222478838afa Mon Sep 17 00:00:00 2001 From: Tim Stahlhut Date: Sat, 16 Apr 2022 16:18:13 -0400 Subject: [PATCH] oce: Add conflict to opencascade --- mingw-w64-oce/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-oce/PKGBUILD b/mingw-w64-oce/PKGBUILD index 1f7cff4f3e..3fe9e246d1 100644 --- a/mingw-w64-oce/PKGBUILD +++ b/mingw-w64-oce/PKGBUILD @@ -4,13 +4,13 @@ _realname=oce pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=0.18.3 -pkgrel=6 +pkgrel=7 pkgdesc="Open CASCADE Community Edition: patches/improvements/experiments contributed by users over the official Open CASCADE library." url="https://github.com/tpaviot/oce" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') license=('LGPLv2.1') -conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") +conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-opencascade") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc") depends=("${MINGW_PACKAGE_PREFIX}-freetype") #depends=('intel-tbb' 'gl2ps' 'freeimage' 'tk')