From 16519e074b6c96c7fdead731ee82d2ed790559b1 Mon Sep 17 00:00:00 2001 From: zhuk Date: Thu, 13 Jul 2017 11:58:14 +0000 Subject: [PATCH] Unbreak (hopefully) Calligra after recent QML files placement change. I could not build calligra right now, but at least things won't go worse. Missed this among other KF5 stuff. Inpired by mail from aja@ via rsadowski@. --- editors/calligra/Makefile | 4 ++-- editors/calligra/pkg/PLIST | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index bb1f738a015..36127df787a 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.20 2017/05/31 22:02:09 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.21 2017/07/13 11:58:14 zhuk Exp $ COMMENT = K Desktop Environment, office suite HOMEPAGE = https://www.calligra-suite.org/ VERSION = 3.0.1 DISTNAME = calligra-${VERSION} CATEGORIES = editors -REVISION = 0 +REVISION = 1 DIST_SUBDIR = kde MASTER_SITES = ${MASTER_SITE_KDE:=stable/calligra/${VERSION}/} diff --git a/editors/calligra/pkg/PLIST b/editors/calligra/pkg/PLIST index aeb0fb2cfda..19956b8f1ba 100644 --- a/editors/calligra/pkg/PLIST +++ b/editors/calligra/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2017/05/30 18:57:20 rsadowski Exp $ +@comment $OpenBSD: PLIST,v 1.11 2017/07/13 11:58:14 zhuk Exp $ @conflict koffice-* @pkgpath editors/calligra-l10n/bs @conflict calligra-l10n-bs-* @@ -96,9 +96,9 @@ @lib lib/libkundo2.so.${LIBkundo2_VERSION} @lib lib/libpigmentcms.so.${LIBpigmentcms_VERSION} @lib lib/libwordsprivate.so.${LIBwordsprivate_VERSION} -lib/qml/org/kde/calligra/ -lib/qml/org/kde/calligra/libCalligraComponentsPlugin.so -lib/qml/org/kde/calligra/qmldir +lib/qt5/qml/org/kde/calligra/ +lib/qt5/qml/org/kde/calligra/libCalligraComponentsPlugin.so +lib/qt5/qml/org/kde/calligra/qmldir lib/qt5/plugins/calligra/ lib/qt5/plugins/calligra/colorspaces/ lib/qt5/plugins/calligra/colorspaces/kolcmsengine.so