Skip to content

Commit

Permalink
databases/akonadi: and net-im/kaccounts-integration: reverse dependen…
Browse files Browse the repository at this point in the history
…cies

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
  • Loading branch information
VVD committed Jul 14, 2023
1 parent 298ac61 commit f35320c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion databases/akonadi/Makefile
@@ -1,5 +1,6 @@
PORTNAME= akonadi
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= databases kde kde-applications

MAINTAINER= kde@FreeBSD.org
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion 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
Expand All @@ -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
Expand Down

0 comments on commit f35320c

Please sign in to comment.