From 1e2036d6f0e6e806aef4f6369bac33a6c7775830 Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 30 Jan 2023 22:32:47 +0000 Subject: [PATCH] merge common deps into common makefile --- net/qbittorrent/Makefile.inc | 5 ++++- net/qbittorrent/qbittorrent-nox/Makefile | 3 --- net/qbittorrent/qbittorrent/Makefile | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/net/qbittorrent/Makefile.inc b/net/qbittorrent/Makefile.inc index f71a7b1b4f4..8a5f95f1417 100644 --- a/net/qbittorrent/Makefile.inc +++ b/net/qbittorrent/Makefile.inc @@ -20,7 +20,10 @@ MASTER_SITES ?= ${MASTER_SITE_SOURCEFORGE:=qbittorrent/} MODULES += devel/cmake \ x11/qt6 -BUILD_DEPENDS += x11/qt6/qttools +BUILD_DEPENDS += devel/boost \ + x11/qt6/qttools + +LIB_DEPENDS += net/libtorrent-rasterbar CONFIGURE_STYLE = cmake CONFIGURE_ARGS += -DQT6=ON diff --git a/net/qbittorrent/qbittorrent-nox/Makefile b/net/qbittorrent/qbittorrent-nox/Makefile index 671982241a6..4017181adbb 100644 --- a/net/qbittorrent/qbittorrent-nox/Makefile +++ b/net/qbittorrent/qbittorrent-nox/Makefile @@ -5,9 +5,6 @@ REVISION = 3 WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Sql Qt6Xml WANTLIB += c crypto execinfo m ssl torrent-rasterbar z -BUILD_DEPENDS += devel/boost -LIB_DEPENDS += net/libtorrent-rasterbar - CONFIGURE_ARGS += -DGUI=OFF .include diff --git a/net/qbittorrent/qbittorrent/Makefile b/net/qbittorrent/qbittorrent/Makefile index 934d4c20fae..c52e759185e 100644 --- a/net/qbittorrent/qbittorrent/Makefile +++ b/net/qbittorrent/qbittorrent/Makefile @@ -10,10 +10,7 @@ MODULES = lang/python MODPY_BUILDDEP = No MODPY_TESTDEP = No -BUILD_DEPENDS += devel/boost \ - x11/qt6/qtsvg - -LIB_DEPENDS += net/libtorrent-rasterbar +BUILD_DEPENDS += x11/qt6/qtsvg RUN_DEPENDS += x11/gtk+3,-guic \ devel/desktop-file-utils