From nobody Fri Jul 14 11:56:25 2023 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 4R2VLd5p8vz4mYJc; Fri, 14 Jul 2023 11:56:25 +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 4R2VLd5LqKz3nd6; Fri, 14 Jul 2023 11:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689335785; 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=IDkSIzfidftEzFSkCX3BUo5FMgOAEaQo/VSmxHfq0MM=; b=a/GYCMiZYQjwCs9g+w2lOdfM7pxEPCF+vbBadoY9OVa7EoqBku6g6u9C8CV3785XjNy9zj rmbR2ArAS8gUdF+DmxUi77y7+7dVQx9TnRx5svGN2XavyuCuDeh8O3Rwfz0NKHP+Evz1aY WTsRS8Q47C8rzMKMTPetLwXTxFi0h7ede21l4dcfOqGuat8bBQGSXyEpG0PXtFR1GXkfPV 1HLy2x1jStnnKSe7W0OKbum6Cg1kcF1cjCA78/+tRMEitQR0+X0nDqBWOt5MegdYfA5Qnp 1DILVXd3XNCk8Sf/+ErEcH5ifkYJ2VymgHj1IYOtYhIygxmyxz9tTohQu1y2bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689335785; 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=IDkSIzfidftEzFSkCX3BUo5FMgOAEaQo/VSmxHfq0MM=; b=R+VaRayY80fsjjlFDKBxtGMRsZLSo+ag5JMmnGSTojO/tNE20Db67kBF/3ohcu2iygBAXz KakK0qteYAHBi/jAj9pkOV2aPbIwelTaACm3B6NiJKHAiRuEwSgOmAzhpHI+ndBmIGB/2w ZIgsPAR159lZxSefpJqTYIG2Fo+sgtDL7UfT6PZgh71qEOIQBeIJUpmOhu1Npsqp0hyaCA Z1G/M5UT04qGe09qEHK49sLyJWLSjaRa2xh6AM7QUF3lDRbDmz9eQtPzAQoDAPaelFY3UE dk8AJkMNe3Qo5rYl+8nI2AzLjftMJ+cpmQZGnKQm1vR4MZKmR6ooLlygBMV/9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689335785; a=rsa-sha256; cv=none; b=E8BZlnpeuMqpvrb3GeTmMqV2H6lgyOKIUhjxDXaSFdDu+QVVQZdm7fgUlhweTGSuvnHsJu Ben1IOjFTG2S9uz/fntfIpDs+j4WiDS2LueANMHBTTzAVMNTqQdzrB4VDd5GNbl371NpHN VxtVaBI6iv/q0ZQ90PeIm1BmpNR2aFu0cO+NObBoJ5q0Qd3NkYIC0Eg9JapYGa45qJvjj+ +vBDcQco3AFLXmIeLYA54sKDhw3CAy9Du9q0aduuumUuoXYZ6XfGJNOll3SuwgceeaE1jf qwZrXQrcWWTrGTXRoqZFF8AwKWyDHihI9ePKblkm6Ms53wWik5EDJTSf30Sbtg== 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 4R2VLd4Q8QzGXp; Fri, 14 Jul 2023 11:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EBuPCq045444; Fri, 14 Jul 2023 11:56:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EBuPMY045443; Fri, 14 Jul 2023 11:56:25 GMT (envelope-from git) Date: Fri, 14 Jul 2023 11:56:25 GMT Message-Id: <202307141156.36EBuPMY045443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f35320c28b06 - main - databases/akonadi: and net-im/kaccounts-integration: reverse dependencies 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f35320c28b06cd55c521b9d5979d9ab5f764db4f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f35320c28b06cd55c521b9d5979d9ab5f764db4f commit f35320c28b06cd55c521b9d5979d9ab5f764db4f Author: Vladimir Druzenko AuthorDate: 2023-07-14 11:50:16 +0000 Commit: Vladimir Druzenko CommitDate: 2023-07-14 11:56:04 +0000 databases/akonadi: and net-im/kaccounts-integration: reverse dependencies Without this patch, there is a circular dependency if Akonadi is built with kaccounts-integration installed, as Akonadi has an optional dependency on kaccounts-integration and libaccounts-qt5 that makes the port silently depend on libkaccounts.so and libaccounts-qt5.so. kaccounts-integration, on the other hand, had a dependency on Akonadi that was probably inherited from the Qt4 version, as the Akonadi plugin was removed from the code base in 2015. Reviewed by: rakuco, tcberner Tested by: tcberner Approved by: tcberner (mentor, kde@) Differential Revision: https://reviews.freebsd.org/D41019 --- databases/akonadi/Makefile | 5 ++++- net-im/kaccounts-integration/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 7d0f3f2e79ea..035f15845ad9 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -1,5 +1,6 @@ PORTNAME= akonadi DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= databases kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -8,7 +9,9 @@ WWW= https://community.kde.org/KDE_PIM/Akonadi LICENSE= LGPL21 -LIB_DEPENDS= libboost_thread.so:devel/boost-libs +LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ + libkaccounts.so:net-im/kaccounts-integration \ + libaccounts-qt5.so:net-im/libaccounts-qt5 # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index d06a5c382a71..e484543c04d6 100644 --- a/net-im/kaccounts-integration/Makefile +++ b/net-im/kaccounts-integration/Makefile @@ -1,5 +1,6 @@ PORTNAME= kaccounts-integration DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -18,7 +19,6 @@ USES= cmake compiler:c++11-lang gettext pkgconfig kde:5 \ qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \ i18n iconthemes kcmutils kdeclarative kio service wallet widgetsaddons \ - akonadi \ ecm:build USE_QT= concurrent core dbus declarative gui network widgets xml \ buildtools:build qmake:build