From nobody Wed Apr 26 09:08:01 2023 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 4Q5tLn6Zkkz47jd2; Wed, 26 Apr 2023 09:08:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q5tLn63hVz3JwX; Wed, 26 Apr 2023 09:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682500081; 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=zTAhYKVs+YifJIyq1KC+EfwWN0ZF8hpe0uvyVFCRXD4=; b=ET/T1GF6/r7WV/gcaPNGzn8CmVKhH6CedaORuC2wIY7D3cLl87MhZGBUHz91pAX4jvKlri WSEQ40xuwkpiNxkvgHw47WUufQuckz9pwgQ1Iq4YrNDw1vPpjKnb3oKZ6QPIvfSzd/vKBc dHUgjkd7fSRKsibIh+2lp0rAhCEGV4Enlrp2x4rw+LmXq/HsaNBfwbpsFP0eTsE/z9FG3N AIAECxb5hHLQVucfizvEttpESeoaIuuQnzFP1b+MLKkktImkHWkGAuByKlX+NLbwrwFD2+ a2AMLScUo+DurFGR4ctA+AOG6zYgZNSqnEvH7h9ttGUeGlhvzcRJRYBjI9N8ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682500081; 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=zTAhYKVs+YifJIyq1KC+EfwWN0ZF8hpe0uvyVFCRXD4=; b=AEV3z/l+W/pzL/Ft1wRq9wOWPtvmH6FGe95R64dKOluJZwLZF+7FnC2nyYwXwSe6o4HKRL NRsZe9eN1u/iXOnPQzbFvgZsl5Rd70fgszBFWVPipD9JJlV3hiA/w/uZQ/vNSJB8Lk5PwT EeuEgh42mlj0wSmFkqB6sShAu+M78hlmboY7Tbb0bLOiuiknuq+iEBQuDQxsNcDO4T+73U 0T3wuHZkmHxevfTYqUmWderLr3jR3SSRwFbdZljL1LSQsOyOx4uPoubrT5HVo7oqAD94jM in+ddsAMAqIOCSLSkEOzZ4/Gv09lGbZeL1ApDkkrggLHGb6HInWUijz0P5v64w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682500081; a=rsa-sha256; cv=none; b=M7vdIzjIJ7NQsxacHGPOnwDbOkvJ0sSFON7V5LH9YcwWto5O2QVAd01maEpC8rZLjqnlVF idld1QBmHCMz8eDHmVTCWGm3JBfkzyyc/SmsKJ8U8HnoHNqO3KkEtMQ6t2zIwSQLyBuUF1 7d6N3rKVN7cXwZ7vtx7+S9cO/CUvfuGjQm/+akBd9LtNOt0Pr8nSqVeDTjkNUsoGYxGDAH GG4bvR/VGn5ZZXkK7AAYkNOyhJ0rg9dqUmtmPfiiRYI57pNIGSCqzjj/GOziJMLkzpoY+p +v70v8WJgSAm73xl2YlN0zku2/izB4EWkwOM0GhB6CU8ML3rk2zUI4c5afiCSw== 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 4Q5tLn4pzqzTDt; Wed, 26 Apr 2023 09:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33Q981Mn075742; Wed, 26 Apr 2023 09:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33Q981eW075741; Wed, 26 Apr 2023 09:08:01 GMT (envelope-from git) Date: Wed, 26 Apr 2023 09:08:01 GMT Message-Id: <202304260908.33Q981eW075741@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: 1712e3f21205 - main - graphics/digikam: unbreak build after KDE PIM 23.04 (+) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 1712e3f212057b3892514e2ee9878b7863ca45cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1712e3f212057b3892514e2ee9878b7863ca45cb commit 1712e3f212057b3892514e2ee9878b7863ca45cb Author: Dima Panov AuthorDate: 2023-04-26 09:06:39 +0000 Commit: Dima Panov CommitDate: 2023-04-26 09:06:39 +0000 graphics/digikam: unbreak build after KDE PIM 23.04 (+) In KDE PIM 23.04 the KF5:: targets have been renamed to KPim5:: While the KF5:: targets are kept for backwards compatibility, they no longer recursively include other KF5:: targets. We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined. Backport from: https://invent.kde.org/graphics/digikam/-/commit/5b4ba173f6a84a8be1131b1523dc42df95171ec7 --- graphics/digikam/files/patch-core_CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/graphics/digikam/files/patch-core_CMakeLists.txt b/graphics/digikam/files/patch-core_CMakeLists.txt index 42ed65623cb8..03bbfb53f083 100644 --- a/graphics/digikam/files/patch-core_CMakeLists.txt +++ b/graphics/digikam/files/patch-core_CMakeLists.txt @@ -1,4 +1,4 @@ ---- core/CMakeLists.txt.orig 2020-04-23 11:51:20 UTC +--- core/CMakeLists.txt.orig 2023-03-12 13:19:01 UTC +++ core/CMakeLists.txt @@ -10,6 +10,7 @@ APPLY_COMMON_POLICIES() @@ -8,7 +8,15 @@ message(STATUS "----------------------------------------------------------------------------------") message(STATUS "Check dependencies for ${PROJECT_NAME} version ${DIGIKAM_VERSION_STRING}") message(STATUS "") -@@ -341,8 +342,13 @@ endif() +@@ -132,6 +133,7 @@ if(ENABLE_AKONADICONTACTSUPPORT) + + find_package(KF5 ${AKONADI_MIN_VERSION} QUIET + OPTIONAL_COMPONENTS ++ Akonadi # We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined after KDE PIM 23.04 + AkonadiContact # For KDE Mail Contacts support. + Contacts # API for contacts/address book data. + ) +@@ -379,8 +381,13 @@ endif() find_package(Doxygen) @@ -22,4 +30,4 @@ + link_directories(${LQR-1_LIBDIR}) endif() - # -- libgphoto2 rules ---------------------------------------------------------- + if(BUILD_WITH_CCACHE)