| 1 |
commit: 1393a4d378f851806bba13ceaaa8997e25b53318 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 2 20:53:55 2023 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 3 17:19:39 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1393a4d3 |
| 7 |
|
| 8 |
net-p2p/transmission: wire up qt6 support |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
net-p2p/transmission/transmission-4.0.1-r2.ebuild | 18 +++++++++++++++--- |
| 13 |
net-p2p/transmission/transmission-9999.ebuild | 18 +++++++++++++++--- |
| 14 |
2 files changed, 30 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-p2p/transmission/transmission-4.0.1-r2.ebuild b/net-p2p/transmission/transmission-4.0.1-r2.ebuild |
| 17 |
index 16698fd7a746..f0f1e44f4a54 100644 |
| 18 |
--- a/net-p2p/transmission/transmission-4.0.1-r2.ebuild |
| 19 |
+++ b/net-p2p/transmission/transmission-4.0.1-r2.ebuild |
| 20 |
@@ -24,7 +24,8 @@ HOMEPAGE="https://transmissionbt.com/" |
| 21 |
# MIT is in several libtransmission/ headers |
| 22 |
LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test" |
| 25 |
+IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test" |
| 26 |
+REQUIRED_USE="?? ( qt5 qt6 )" |
| 27 |
RESTRICT="!test? ( test )" |
| 28 |
|
| 29 |
ACCT_DEPEND=" |
| 30 |
@@ -37,6 +38,7 @@ BDEPEND=" |
| 31 |
gtk? ( sys-devel/gettext ) |
| 32 |
) |
| 33 |
qt5? ( dev-qt/linguist-tools:5 ) |
| 34 |
+ qt6? ( dev-qt/qttools:6[linguist] ) |
| 35 |
" |
| 36 |
COMMON_DEPEND=" |
| 37 |
>=dev-libs/libevent-2.1.0:=[threads(+)] |
| 38 |
@@ -61,6 +63,10 @@ COMMON_DEPEND=" |
| 39 |
dev-qt/qtsvg:5 |
| 40 |
dev-qt/qtwidgets:5 |
| 41 |
) |
| 42 |
+ qt6? ( |
| 43 |
+ dev-qt/qtbase:6[dbus,gui,network,widgets] |
| 44 |
+ dev-qt/qtsvg:6 |
| 45 |
+ ) |
| 46 |
systemd? ( >=sys-apps/systemd-209:= ) |
| 47 |
" |
| 48 |
DEPEND="${COMMON_DEPEND} |
| 49 |
@@ -75,7 +81,6 @@ src_configure() { |
| 50 |
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
| 51 |
|
| 52 |
-DENABLE_GTK=$(usex gtk ON OFF) |
| 53 |
- -DENABLE_QT=$(usex qt5 ON OFF) |
| 54 |
-DENABLE_MAC=OFF |
| 55 |
-DREBUILD_WEB=OFF |
| 56 |
-DENABLE_CLI=$(usex cli ON OFF) |
| 57 |
@@ -93,7 +98,6 @@ src_configure() { |
| 58 |
-DUSE_SYSTEM_UTP=OFF |
| 59 |
-DUSE_SYSTEM_B64=OFF |
| 60 |
-DUSE_SYSTEM_PSL=ON |
| 61 |
- -DUSE_QT_VERSION=5 |
| 62 |
|
| 63 |
-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl) |
| 64 |
-DWITH_INOTIFY=ON |
| 65 |
@@ -101,6 +105,14 @@ src_configure() { |
| 66 |
-DWITH_SYSTEMD=$(usex systemd ON OFF) |
| 67 |
) |
| 68 |
|
| 69 |
+ if use qt6; then |
| 70 |
+ mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 ) |
| 71 |
+ elif use qt5; then |
| 72 |
+ mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 ) |
| 73 |
+ else |
| 74 |
+ mycmakeargs+=( -DENABLE_QT=OFF ) |
| 75 |
+ fi |
| 76 |
+ |
| 77 |
# Disable assertions by default, bug 893870. |
| 78 |
use debug || append-cppflags -DNDEBUG |
| 79 |
|
| 80 |
|
| 81 |
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild |
| 82 |
index 16698fd7a746..f0f1e44f4a54 100644 |
| 83 |
--- a/net-p2p/transmission/transmission-9999.ebuild |
| 84 |
+++ b/net-p2p/transmission/transmission-9999.ebuild |
| 85 |
@@ -24,7 +24,8 @@ HOMEPAGE="https://transmissionbt.com/" |
| 86 |
# MIT is in several libtransmission/ headers |
| 87 |
LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" |
| 88 |
SLOT="0" |
| 89 |
-IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test" |
| 90 |
+IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test" |
| 91 |
+REQUIRED_USE="?? ( qt5 qt6 )" |
| 92 |
RESTRICT="!test? ( test )" |
| 93 |
|
| 94 |
ACCT_DEPEND=" |
| 95 |
@@ -37,6 +38,7 @@ BDEPEND=" |
| 96 |
gtk? ( sys-devel/gettext ) |
| 97 |
) |
| 98 |
qt5? ( dev-qt/linguist-tools:5 ) |
| 99 |
+ qt6? ( dev-qt/qttools:6[linguist] ) |
| 100 |
" |
| 101 |
COMMON_DEPEND=" |
| 102 |
>=dev-libs/libevent-2.1.0:=[threads(+)] |
| 103 |
@@ -61,6 +63,10 @@ COMMON_DEPEND=" |
| 104 |
dev-qt/qtsvg:5 |
| 105 |
dev-qt/qtwidgets:5 |
| 106 |
) |
| 107 |
+ qt6? ( |
| 108 |
+ dev-qt/qtbase:6[dbus,gui,network,widgets] |
| 109 |
+ dev-qt/qtsvg:6 |
| 110 |
+ ) |
| 111 |
systemd? ( >=sys-apps/systemd-209:= ) |
| 112 |
" |
| 113 |
DEPEND="${COMMON_DEPEND} |
| 114 |
@@ -75,7 +81,6 @@ src_configure() { |
| 115 |
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
| 116 |
|
| 117 |
-DENABLE_GTK=$(usex gtk ON OFF) |
| 118 |
- -DENABLE_QT=$(usex qt5 ON OFF) |
| 119 |
-DENABLE_MAC=OFF |
| 120 |
-DREBUILD_WEB=OFF |
| 121 |
-DENABLE_CLI=$(usex cli ON OFF) |
| 122 |
@@ -93,7 +98,6 @@ src_configure() { |
| 123 |
-DUSE_SYSTEM_UTP=OFF |
| 124 |
-DUSE_SYSTEM_B64=OFF |
| 125 |
-DUSE_SYSTEM_PSL=ON |
| 126 |
- -DUSE_QT_VERSION=5 |
| 127 |
|
| 128 |
-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl) |
| 129 |
-DWITH_INOTIFY=ON |
| 130 |
@@ -101,6 +105,14 @@ src_configure() { |
| 131 |
-DWITH_SYSTEMD=$(usex systemd ON OFF) |
| 132 |
) |
| 133 |
|
| 134 |
+ if use qt6; then |
| 135 |
+ mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 ) |
| 136 |
+ elif use qt5; then |
| 137 |
+ mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 ) |
| 138 |
+ else |
| 139 |
+ mycmakeargs+=( -DENABLE_QT=OFF ) |
| 140 |
+ fi |
| 141 |
+ |
| 142 |
# Disable assertions by default, bug 893870. |
| 143 |
use debug || append-cppflags -DNDEBUG |
Archives