Date: Fri, 15 Nov 2024 01:56:46 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: 51dfd0c006af - main - Revert "graphics/digikam: make Marble integration optional" Message-ID: <202411150156.4AF1uk1r029813@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=51dfd0c006afb1b40474e6bc17a8147ce7f81e18 commit 51dfd0c006afb1b40474e6bc17a8147ce7f81e18 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2024-11-15 01:54:22 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-11-15 01:55:21 +0000 Revert "graphics/digikam: make Marble integration optional" This reverts commit ed2fb20283e97e18da5b8cdf74a3f6587a21e355. Obliviously it was come from mix of work and vanilla repo :( Sponsored by: Future Crew, LLC --- graphics/digikam/Makefile | 11 +++-------- graphics/digikam/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 759fac5ea78c..ddc4247a5bd1 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,6 +1,6 @@ PORTNAME= digikam DISTVERSION= 8.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} \ https://files.kde.org/digikam/%SUBDIR%/:aesthetic,autotags,face,shape \ @@ -66,13 +66,12 @@ PLIST_SUB= SHLIB_VER=${DISTVERSION} WITH_CCACHE_BUILD= yes -OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MARBLE MEDIAPLAYER NLS +OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MEDIAPLAYER NLS OPTIONS_MULTI= DB DB_DESC= Database options OPTIONS_MULTI_DB= MYSQL MYSQL_INTERNAL SQLITE3 OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NAUTOTAGS:NFACEDETECT} \ - ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} \ - MARBLE + ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} OPTIONS_SUB= yes AUTOTAGS_DESC= Install data required for autotagging (~436 MiB) @@ -96,10 +95,6 @@ KDEPIM_USES= grantlee:5 KDEPIM_USE= KDE=akonadi,akonadicontacts,contacts,grantleetheme,itemmodels KDEPIM_CMAKE_BOOL= ENABLE_AKONADICONTACTSUPPORT -MARBLE_DESC= Virtual globe and world atlas -MARBLE_USE= kde=marble -MARBLE_CMAKE_OFF= -DMarble_FOUND:BOOL=OFF - MEDIAPLAYER_DESC= Enable media player MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libvdpau.so:multimedia/libvdpau diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist index 052d77919d67..382e0c11fce4 100644 --- a/graphics/digikam/pkg-plist +++ b/graphics/digikam/pkg-plist @@ -245,7 +245,7 @@ lib/libdigikamgui.so.%%SHLIB_VER%% %%QT_PLUGINDIR%%/digikam/generic/Generic_FileTransfer_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_Flickr_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_GLViewer_Plugin.so -%%MARBLE%%%%QT_PLUGINDIR%%/digikam/generic/Generic_GeolocationEdit_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_GeolocationEdit_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_Google_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_HtmlGallery_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_ImageShack_Plugin.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411150156.4AF1uk1r029813>