From nobody Fri Nov 15 01:56:46 2024 X-Original-To: dev-commits-ports-main@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 4XqKrZ5NCvz5dQrW; Fri, 15 Nov 2024 01:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqKrZ4LXFz4cMw; Fri, 15 Nov 2024 01:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731635806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTcJlxwvCafzPUgrvxK8MrXkeGUlQqzwuDxb3eoy4cs=; b=lrdCkw8A6FwANHWZrrjApN/fQsN8snT683KFX5XYyqWuvmvXS6D2+Z4KviykVJKrNMwNKZ 6KyKq8/uSx21Cx28esF6locP1Qz9/fESk717XDcW+RD09QZrhh1JURGfIFewg9CABVykTD B4zyEdFdBzulv8ljjWN1ojmFy+MW/Rx7gkvFw+e8lkhXe29QHjbBVUj3pG4uqPYONEZaGX AzY9SZmBMh3ZwC2VefBITw8jXeIU2YO7pfzklUf479ist1PrNBhJf+fLYXXvd9XKlzBH6e rbfA0CWnlk4/yHIbkSm6AyQbcv9N/d9sSZwAWTi76Ewc2Q7nzuOm2XdE2zidhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731635806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTcJlxwvCafzPUgrvxK8MrXkeGUlQqzwuDxb3eoy4cs=; b=kf+++rHzslOHIkw0dIZpxpz2IAVd9jRF53bFJVatgzKxHtI2jd4KohIwvuAl+r1P+ik7u8 3stcKxd5RwQwfJiMpQUS+JgIoMgKvIVhkchpG9vcKZJHN6NQ6uxSDtExkUe6HJf0EYAXZM yIR2w/zsqqwMxnZ6KTDgYWq2xj9QdtxSroDhz2pqG6mpspBxrdIu1zw3IaxJXB6YWXGLBe b7CP3B2Y9XG+hAu6Ia66qG8iRjC3ZTwik1QPCfK0AIABUSN8y74XSaZDpKxYUO8dH2/EOt /2MQn0Uf+eVnG0T7MI0SNVuU/HUyizHpqIV7k1ekSHTr7G4B1C5IzY029gsnsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731635806; a=rsa-sha256; cv=none; b=bzgSMMCg7k0u3p091o/Tzv45xk1jOyVddSLg2nwf+dsTnatKw1oWIDi9/LP3TV7KYtWzvR Z87FMvE5jFXcK6ChqpBJ5s6pSms4HKqI9QoCB16s5W5LcaJ+Dpb3fj1avlRc7i6ZEFuYpe 5g6ad/2SBMEPDyf/Hfi1zkA6qGrXIB0FM1ofZ8ibNBmRHUJ1b618AWB7Mh5NKmO5A/DOeb n2c1TDG14bQajXlMMl2hNQuZWohlHdZIxhQsvkKZGTgsyn6mATe9sEwBVnsuW4NsZdPNXh hWMKz0PntlHCMGECM09Tz8haqcBBSti+mjJxX6kso4BT14dd2MURA0y7+j0W5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XqKrZ2P6Kz13Wk; Fri, 15 Nov 2024 01:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AF1uk9X029816; Fri, 15 Nov 2024 01:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AF1uk1r029813; Fri, 15 Nov 2024 01:56:46 GMT (envelope-from git) Date: Fri, 15 Nov 2024 01:56:46 GMT Message-Id: <202411150156.4AF1uk1r029813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 51dfd0c006af - main - Revert "graphics/digikam: make Marble integration optional" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51dfd0c006afb1b40474e6bc17a8147ce7f81e18 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=51dfd0c006afb1b40474e6bc17a8147ce7f81e18 commit 51dfd0c006afb1b40474e6bc17a8147ce7f81e18 Author: Dima Panov AuthorDate: 2024-11-15 01:54:22 +0000 Commit: Dima Panov 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