Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Nov 2024 20:38:05 GMT
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 116eb4a7d098 - main - textproc/kreport: make Marble integration optional
Message-ID:  <202411142038.4AEKc511037758@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=116eb4a7d09860493ef9dad0ac6e7aae39a12f2b

commit 116eb4a7d09860493ef9dad0ac6e7aae39a12f2b
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-11-14 20:37:15 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-11-14 20:37:49 +0000

    textproc/kreport: make Marble integration optional
    
    Sponsored by:   Future Crew, LLC
---
 textproc/kreport/Makefile  | 10 +++++++++-
 textproc/kreport/pkg-plist |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile
index 9073e8ff3756..50931847b605 100644
--- a/textproc/kreport/Makefile
+++ b/textproc/kreport/Makefile
@@ -12,12 +12,20 @@ WWW=		https://www.kexi-project.org/
 LIB_DEPENDS=		libKPropertyCore3.so:x11-toolkits/kproperty
 
 USES=		cmake compiler:c++11-lang gettext kde:5 python qt:5 tar:xz
-USE_KDE=	config coreaddons marble widgetsaddons \
+USE_KDE=	config coreaddons widgetsaddons \
 		ecm:build
 USE_QT=		core declarative gui location network printsupport webchannel \
 		webengine widgets xml \
 		buildtools:build qmake:build
 
+OPTIONS_DEFINE=	MARBLE
+OPTIONS_DEFAULT=MARBLE
+OPTIONS_SUB=	yes
+
+MARBLE_DESC=	Virtual globe and world atlas
+MARBLE_USE=	kde=marble
+MARBLE_CMAKE_OFF=	-DMarble_FOUND:BOOL=OFF
+
 CONFLICTS_INSTALL=	calligra-2*
 
 post-extract:
diff --git a/textproc/kreport/pkg-plist b/textproc/kreport/pkg-plist
index 92267e73e2aa..ee2ef769ddbc 100644
--- a/textproc/kreport/pkg-plist
+++ b/textproc/kreport/pkg-plist
@@ -77,11 +77,11 @@ lib/libKReport3.so.4
 lib/libKReport3.so.4.2.0
 %%QT_MKSPECDIR%%/modules/qt_KReport3.pri
 %%QT_PLUGINDIR%%/kreport3/org.kde.kreport.barcode.so
-%%QT_PLUGINDIR%%/kreport3/org.kde.kreport.maps.so
+%%MARBLE%%%%QT_PLUGINDIR%%/kreport3/org.kde.kreport.maps.so
 libdata/pkgconfig/KReport3.pc
 %%DATADIR%%3/icons/kreport_breeze.rcc
 %%DATADIR%%3/icons/org.kde.kreport.barcode_breeze.rcc
-%%DATADIR%%3/icons/org.kde.kreport.maps_breeze.rcc
+%%MARBLE%%%%DATADIR%%3/icons/org.kde.kreport.maps_breeze.rcc
 share/kservicetypes5/kreport_elementplugin.desktop
 share/locale/af/LC_MESSAGES/kreport_qt.qm
 share/locale/ar/LC_MESSAGES/kreport_qt.qm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411142038.4AEKc511037758>