From nobody Fri Nov 15 01:00:18 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XqJbj5gZJz5dMKs; Fri, 15 Nov 2024 01:00:33 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-ua1-f50.google.com (mail-ua1-f50.google.com [209.85.222.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqJbj2h54z4Xn3; Fri, 15 Nov 2024 01:00:33 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ua1-f50.google.com with SMTP id a1e0cc1a2514c-856cc1f30d3so526642241.3; Thu, 14 Nov 2024 17:00:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731632431; x=1732237231; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4aa4OPRGw99IGer8dwgGejXOWI5dqPpWFUiKgWA1bFo=; b=KNLsOCaq/lLGArCPdptZwgD4zqBNtg1DSKL6yRDJ1m0Nt1F8VguAdh8MvI4OsFlfwZ r4ldivk8KOzsIZuRxKsNYkNJ1nYyBdHB5XJdEj0ieJOKhd3qgGbYkZ+3jvs4TQFLq5Vl sV5Pucuo2QbmTtcTQc6irj49sBVXo8JxprfhakP/hksAPUE2qgx84YnWM2PaoBYNk57+ 5I9R+8l+lM6CPb1KlfnNXE+iXwxQXgIywQGMVCIgeik3s09BaZmEvMBDjbhQNOhNWGx+ UdX55ynImB4g03ZKMGODgwjaVOnSxcsZDTwuybct1zz8nYmeXFJP1jiX8ApTjewmRKTf NxjA== X-Forwarded-Encrypted: i=1; AJvYcCU0FYlHaxql3a2OZ5G3F/KpT6oOwexi3nP5uZWyOOSMvF+XiYTw5psN/teXTNJSIKvb7JMyXrm4YbdIxoHFxHZnHEy54B4=@freebsd.org, AJvYcCXC/QYp/r45wPcq3aQDiOqYncRKwJo5+BKOunKYQ6TF/829KjCyl4+jinG7eAmRmLiJo1ZXwm5kmNS1Wy66GKw3KzgHryJhqg==@freebsd.org X-Gm-Message-State: AOJu0Yy5rmSAaY5OM/BXvqXiS7FQAzovYEf+L99eEiJJFDgFOrnZIRRZ 5p8omSYBmH0rIhytZLENlxLRNGvxqBZgmI0PWZH6RTvPimEjBtLSrnpeYy0sOF+zXejgE+lXkwu OhzmUz4/O0xWLx8I2RZd3qz5C1V/Oplz4 X-Google-Smtp-Source: AGHT+IE3y4xiuNNteN2zfqZ/TUaMbkVdx4Yk7xmUPZWOBlZDNbyvdpC1vv8slbQKEdhX213GfPebuDP6fW8IOzeJj7k= X-Received: by 2002:a05:6102:a4d:b0:493:eebc:d77d with SMTP id ada2fe7eead31-4ad630bbb41mr1081939137.15.1731632429898; Thu, 14 Nov 2024 17:00:29 -0800 (PST) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 References: <202411142038.4AEKc31Y037670@gitrepo.freebsd.org> In-Reply-To: <202411142038.4AEKc31Y037670@gitrepo.freebsd.org> From: "Jason E. Hale" Date: Thu, 14 Nov 2024 20:00:18 -0500 Message-ID: Subject: Re: git: ed2fb20283e9 - main - graphics/digikam: make Marble integration optional To: Dima Panov Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4XqJbj2h54z4Xn3 X-Spamd-Bar: ---- On Thu, Nov 14, 2024 at 3:38=E2=80=AFPM Dima Panov 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 > AuthorDate: 2024-11-14 20:34:46 +0000 > Commit: Dima Panov > 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