From nobody Fri Apr 22 11:03:36 2022 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 3F9F7198CC3A; Fri, 22 Apr 2022 11:03:37 +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 4KlBNT1DNWz3Bsh; Fri, 22 Apr 2022 11:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650625417; 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=Pdrh7LsNXvNFm9zelu/dsUPIAUOHYDIn8XjqcB+D1yU=; b=vdSiAmhxyr5y8jwKGVM8wbkKwPRe4ZRxDo/qTmi99GL5HHzFG6r6CA6nHcgDXujLsG3Ru1 wJVBU7lReD13HVwVK5zdb4eAg0t+NF8iNZL1bfcIAQkAFoA9aAtriCsSERsut26Oa54FhL 5tiwhl8x5pUxrxEG2lGc7OxHHrSPWqm5bthE5YziJuZdUmnM26loJyNoET4G5SkJOKZhTI DOr2VOcZaenavvCeb6Jp693SIt1pqdQKR2WP+efcdZffjnffFYvHhJFaqjIk8gWbJy6BWc 0BcnjZFqWJiFzjZ4oh9f1xWgno6L2azn74UXXFnQgvt6bQ2Zw6LKpl4cBtAuTw== 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 09BE41C30D; Fri, 22 Apr 2022 11:03:37 +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 23MB3a88032485; Fri, 22 Apr 2022 11:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23MB3a9U032484; Fri, 22 Apr 2022 11:03:36 GMT (envelope-from git) Date: Fri, 22 Apr 2022 11:03:36 GMT Message-Id: <202204221103.23MB3a9U032484@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 7db96fb2da08 - main - graphics/digikam: fix build against current KDE Gear components 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7db96fb2da08dfd7c819bffc63b138a5f2d7cb81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650625417; 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=Pdrh7LsNXvNFm9zelu/dsUPIAUOHYDIn8XjqcB+D1yU=; b=c1FgggWIH4bNizrXGuwO5a3yq2x2cMwokQdI2iLL9a9cAPEb0f6g0c7DBocDR7SZgTcsUB v+9YkeBxVmo29xbWnfwayACyZ6NjZoqYdGx/MKuvk74NknoKk2NLdc15glejDbUbd4UhOK hVADBKPDbFR2WbtBCrDXElbYPQ+cCyxusukLfrh+uwJyuacuqplvEHgPStCVK7PnVVW8Mu uPc3h5KCkLa1LnHio4GCYZuf5q0Fq0pugMqbjL8PuzNMOM9XES6ppwvg7VF0K6wiqp4wlG usNo7nhsBOmwzmdNPeu/dCkvPLPhhh8AYgptIvfkoFQcLbiyOekRNWfpdGiJNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650625417; a=rsa-sha256; cv=none; b=PxMpwpJ53rcHnm6BeG60VxxGZn+IhE/cUQ7MKnRK51SozrZgLu2raO7y3CqOdSdtFx7d8c fArX+Pp4TGfowxQA1arOmOoFgteWy+qyNEwvrfhDSSyNdoFOOHjKcbAU6QzWhsDvpnPsmN Zz90Gvi1E+ikgfduMsYTZ70Rz/H6DOTfi2hXz5RjlOua9+quOTtI7ZymdrM1L2jGprcnaU gpjgrXLhNMkQC15H8bfZ+EG3kOrao+yDYSCexKDSdYIJ//h4m1mWuPBVc3IbH6nHnpmlZ5 fPVKHIk1B+y+2JWh2mpdfnX1tby1ytV0Xbe/vpmUdl6YM5pkxDLBKiPZ+/u2/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7db96fb2da08dfd7c819bffc63b138a5f2d7cb81 commit 7db96fb2da08dfd7c819bffc63b138a5f2d7cb81 Author: Tobias C. Berner AuthorDate: 2022-04-22 10:54:13 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-22 11:03:22 +0000 graphics/digikam: fix build against current KDE Gear components In the recent update [1] of KDE Gear a header file in net/akonadi-contacts was moved from Akonadi/Contact/ContactSearchJob to AkonadiContact/Akonadi/ContactSearchJob. [1] e250aeb4a1399664907d0df0605a3577ba671609 Reported by: fluffy --- ...h-core_utilities_extrasupport_addressbook_akonadiiface.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_akonadiiface.cpp b/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_akonadiiface.cpp new file mode 100644 index 000000000000..984766536fd1 --- /dev/null +++ b/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_akonadiiface.cpp @@ -0,0 +1,11 @@ +--- core/utilities/extrasupport/addressbook/akonadiiface.cpp.orig 2022-04-22 10:48:13 UTC ++++ core/utilities/extrasupport/addressbook/akonadiiface.cpp +@@ -49,7 +49,7 @@ + #include + #endif + +-#include ++#include + #include + + #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)