From 7064499e0eb09eee6d4838fbe876b6a91941a05d Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 3 Mar 2019 10:52:39 +0000 Subject: [PATCH] x11/plasma5-plasma-workspace: mark conflicting with old plasma5-plasma-desktop version A file was moved between packages between 5.14.x and 5.15.x. This hopefully helps portupgrade/portmaster to get the order right. PR: 236171 Reported by: Peter C B Henderson --- x11/plasma5-plasma-workspace/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile index 6b7edec0c3d0..6a9617a8b332 100644 --- a/x11/plasma5-plasma-workspace/Makefile +++ b/x11/plasma5-plasma-workspace/Makefile @@ -44,6 +44,9 @@ USE_XORG= ice sm x11 xau xcb xcomposite xext xfixes xft xkbfile xrender xtst CMAKE_OFF= BUILD_TESTING +# In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace: +CONFLICTS_INSTALL= plasma5-plasma-desktop-5.14.* + post-patch: # set the paths in startkde ${REINPLACE_CMD} -e 's|%%KDE_PREFIX%%|${KDE_PREFIX}|g' \