Date: Thu, 14 Nov 2024 20:00:18 -0500 From: "Jason E. Hale" <jhale@freebsd.org> To: Dima Panov <fluffy@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: ed2fb20283e9 - main - graphics/digikam: make Marble integration optional Message-ID: <CAJE75NG0GvvE2Ffi1um=_pm2T7xQZ6YQrnST0jwD89fKm6jSZg@mail.gmail.com> In-Reply-To: <202411142038.4AEKc31Y037670@gitrepo.freebsd.org> References: <202411142038.4AEKc31Y037670@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Nov 14, 2024 at 3:38=E2=80=AFPM Dima Panov <fluffy@freebsd.org> wro= te: > > The branch main has been updated by fluffy: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Ded2fb20283e97e18da5b8cdf= 74a3f6587a21e355 > > 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=3D SHLIB_VER=3D${DISTVERSION} > > WITH_CCACHE_BUILD=3D yes > > -OPTIONS_DEFINE=3D AUTOTAGS FACEDETECT KDEPIM MEDIAPLAYER = NLS > +OPTIONS_DEFINE=3D AUTOTAGS FACEDETECT KDEPIM MARBLE MEDIA= PLAYER NLS > OPTIONS_MULTI=3D DB > DB_DESC=3D Database options > OPTIONS_MULTI_DB=3D MYSQL MYSQL_INTERNAL SQLITE3 > OPTIONS_DEFAULT=3D ${OPTIONS_DEFINE:NAUTOTAGS:NFACEDETECT} \ > - ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} > + ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} \ > + MARBLE Adding MARBLE here is redundant. > OPTIONS_SUB=3D yes > > AUTOTAGS_DESC=3D Install data required for autotagging (~436 MiB= ) > @@ -95,6 +96,10 @@ KDEPIM_USES=3D grantlee:5 > KDEPIM_USE=3D KDE=3Dakonadi,akonadicontacts,contacts,grantlee= theme,itemmodels > KDEPIM_CMAKE_BOOL=3D ENABLE_AKONADICONTACTSUPPORT > > +MARBLE_DESC=3D Virtual globe and world atlas > +MARBLE_USE=3D kde=3Dmarble > +MARBLE_CMAKE_OFF=3D -DMarble_FOUND:BOOL=3DOFF > + As said, digikam no longer uses astro/marble. You just added an unneeded dependency. Even if it did, "MARBLE_CMAKE_OFF=3D-DMarble_FOUND:BOOL=3DOFF" wouldn't disable its detection. "MARBLE_CMAKE_BOOL=3DCMAKE_DISABLE_FIND_PACKAGE_Marble" is what you should use to do that. > MEDIAPLAYER_DESC=3D Enable media player > MEDIAPLAYER_LIB_DEPENDS=3D 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_Plugi= n.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?CAJE75NG0GvvE2Ffi1um=_pm2T7xQZ6YQrnST0jwD89fKm6jSZg>