Re: git: ed2fb20283e9 - main - graphics/digikam: make Marble integration optional
Date: Fri, 15 Nov 2024 01:00:18 UTC
On Thu, Nov 14, 2024 at 3:38 PM Dima Panov <fluffy@freebsd.org> wrote:
>
> The branch main has been updated by fluffy:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=ed2fb20283e97e18da5b8cdf74a3f6587a21e355
>
> commit ed2fb20283e97e18da5b8cdf74a3f6587a21e355
> Author: Dima Panov <fluffy@FreeBSD.org>
> AuthorDate: 2024-11-14 20:34:46 +0000
> Commit: Dima Panov <fluffy@FreeBSD.org>
> CommitDate: 2024-11-14 20:37:48 +0000
>
> graphics/digikam: make Marble integration optional
>
> Sponsored by: Future Crew, LLC
> ---
> graphics/digikam/Makefile | 9 +++++++--
> graphics/digikam/pkg-plist | 2 +-
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
Please revert this. Digikam hasn't needed marble since version 8.3.0.
> diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
> index 5bf87738461b..759fac5ea78c 100644
> --- a/graphics/digikam/Makefile
> +++ b/graphics/digikam/Makefile
> @@ -66,12 +66,13 @@ PLIST_SUB= SHLIB_VER=${DISTVERSION}
>
> WITH_CCACHE_BUILD= yes
>
> -OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MEDIAPLAYER NLS
> +OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MARBLE 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}
> + ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} \
> + MARBLE
Adding MARBLE here is redundant.
> OPTIONS_SUB= yes
>
> AUTOTAGS_DESC= Install data required for autotagging (~436 MiB)
> @@ -95,6 +96,10 @@ 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
> +
As said, digikam no longer uses astro/marble. You just added an
unneeded dependency. Even if it did,
"MARBLE_CMAKE_OFF=-DMarble_FOUND:BOOL=OFF" wouldn't disable its
detection.
"MARBLE_CMAKE_BOOL=CMAKE_DISABLE_FIND_PACKAGE_Marble" is what you
should use to do that.
> 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 382e0c11fce4..052d77919d67 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
> -%%QT_PLUGINDIR%%/digikam/generic/Generic_GeolocationEdit_Plugin.so
> +%%MARBLE%%%%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