From bd8ba891e5de806c0725eab7e22753bb0c6b262d Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 24 Oct 2022 11:25:26 -0400 Subject: net-p2p/transmission: fix progress bars in Qt UI Closes: https://bugs.gentoo.org/878099 Signed-off-by: Mike Gilbert --- ...ransmission-3.00-horizontal-progress-bars.patch | 36 ++++++ net-p2p/transmission/transmission-3.00-r4.ebuild | 133 -------------------- net-p2p/transmission/transmission-3.00-r5.ebuild | 134 +++++++++++++++++++++ 3 files changed, 170 insertions(+), 133 deletions(-) create mode 100644 net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch delete mode 100644 net-p2p/transmission/transmission-3.00-r4.ebuild create mode 100644 net-p2p/transmission/transmission-3.00-r5.ebuild (limited to 'net-p2p') diff --git a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch new file mode 100644 index 000000000000..63d8ca2fe274 --- /dev/null +++ b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/878099 +https://github.com/transmission/transmission/issues/3150 + +--- a/qt/FileTreeDelegate.cc ++++ a/qt/FileTreeDelegate.cc +@@ -49,7 +49,7 @@ + if (column == FileTreeModel::COL_PROGRESS) + { + QStyleOptionProgressBar p; +- p.state = option.state | QStyle::State_Small; ++ p.state = option.state | QStyle::State_Horizontal | QStyle::State_Small; + p.direction = qApp->layoutDirection(); + p.rect = option.rect; + p.rect.setSize(QSize(option.rect.width() - 4, option.rect.height() - 8)); +--- a/qt/TorrentDelegate.cc ++++ a/qt/TorrentDelegate.cc +@@ -545,7 +545,7 @@ + progressBarState = QStyle::State_None; + } + +- progressBarState |= QStyle::State_Small; ++ progressBarState |= QStyle::State_Horizontal | QStyle::State_Small; + + QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal; + QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon(); +--- a/qt/TorrentDelegateMin.cc ++++ a/qt/TorrentDelegateMin.cc +@@ -218,7 +218,7 @@ + progressBarState = QStyle::State_None; + } + +- progressBarState |= QStyle::State_Small; ++ progressBarState |= QStyle::State_Horizontal | QStyle::State_Small; + + QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal; + QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon(); diff --git a/net-p2p/transmission/transmission-3.00-r4.ebuild b/net-p2p/transmission/transmission-3.00-r4.ebuild deleted file mode 100644 index 2b31213bed1f..000000000000 --- a/net-p2p/transmission/transmission-3.00-r4.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 2006-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd xdg-utils - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/transmission/transmission" -else - SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="A fast, easy, and free BitTorrent client" -HOMEPAGE="https://transmissionbt.com/" - -# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest -# transmission in licenses/ is for mentioning OpenSSL linking exception -# MIT is in several libtransmission/ headers -LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" -SLOT="0" -IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test" -RESTRICT="!test? ( test )" - -ACCT_DEPEND=" - acct-group/transmission - acct-user/transmission -" -BDEPEND="${ACCT_DEPEND} - virtual/pkgconfig - nls? ( - gtk? ( sys-devel/gettext ) - qt5? ( dev-qt/linguist-tools:5 ) - ) -" -COMMON_DEPEND=" - >=dev-libs/libevent-2.0.10:= - !mbedtls? ( dev-libs/openssl:0= ) - mbedtls? ( net-libs/mbedtls:0= ) - net-libs/libnatpmp - >=net-libs/miniupnpc-1.7:= - >=net-misc/curl-7.16.3[ssl] - sys-libs/zlib:= - nls? ( virtual/libintl ) - gtk? ( - >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3.4:3 - appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - ) - systemd? ( >=sys-apps/systemd-209:= ) -" -DEPEND="${COMMON_DEPEND} - nls? ( virtual/libintl ) -" -RDEPEND="${COMMON_DEPEND} - ${ACCT_DEPEND} -" - -PATCHES=( - "${FILESDIR}"/cmake-unused-command-line.patch - "${FILESDIR}"/transmission-3.00-openssl-3.patch -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} - - -DENABLE_CLI=$(usex cli ON OFF) - -DENABLE_GTK=$(usex gtk ON OFF) - -DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF) - -DENABLE_NLS=$(usex nls ON OFF) - -DENABLE_QT=$(usex qt5 ON OFF) - -DENABLE_TESTS=$(usex test ON OFF) - - -DUSE_SYSTEM_EVENT2=ON - -DUSE_SYSTEM_DHT=OFF - -DUSE_SYSTEM_MINIUPNPC=ON - -DUSE_SYSTEM_NATPMP=ON - -DUSE_SYSTEM_UTP=OFF - -DUSE_SYSTEM_B64=OFF - - -DWITH_CRYPTO=$(usex mbedtls polarssl openssl) - -DWITH_INOTIFY=ON - -DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF) - -DWITH_SYSTEMD=$(usex systemd ON OFF) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon - newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon - - if use systemd; then - # Service sets Type=notify - systemd_dounit daemon/transmission-daemon.service - systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf - fi - - insinto /usr/lib/sysctl.d - doins "${FILESDIR}"/60-transmission.conf - - if [[ ${EUID} == 0 ]]; then - diropts -o transmission -g transmission - fi - keepdir /var/lib/transmission -} - -pkg_postrm() { - if use gtk || use qt5; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} - -pkg_postinst() { - if use gtk || use qt5; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} diff --git a/net-p2p/transmission/transmission-3.00-r5.ebuild b/net-p2p/transmission/transmission-3.00-r5.ebuild new file mode 100644 index 000000000000..6a12e5a07a73 --- /dev/null +++ b/net-p2p/transmission/transmission-3.00-r5.ebuild @@ -0,0 +1,134 @@ +# Copyright 2006-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake systemd xdg-utils + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/transmission/transmission" +else + SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="A fast, easy, and free BitTorrent client" +HOMEPAGE="https://transmissionbt.com/" + +# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest +# transmission in licenses/ is for mentioning OpenSSL linking exception +# MIT is in several libtransmission/ headers +LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" +SLOT="0" +IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test" +RESTRICT="!test? ( test )" + +ACCT_DEPEND=" + acct-group/transmission + acct-user/transmission +" +BDEPEND="${ACCT_DEPEND} + virtual/pkgconfig + nls? ( + gtk? ( sys-devel/gettext ) + qt5? ( dev-qt/linguist-tools:5 ) + ) +" +COMMON_DEPEND=" + >=dev-libs/libevent-2.0.10:= + !mbedtls? ( dev-libs/openssl:0= ) + mbedtls? ( net-libs/mbedtls:0= ) + net-libs/libnatpmp + >=net-libs/miniupnpc-1.7:= + >=net-misc/curl-7.16.3[ssl] + sys-libs/zlib:= + nls? ( virtual/libintl ) + gtk? ( + >=dev-libs/glib-2.32:2 + >=x11-libs/gtk+-3.4:3 + appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtnetwork:5 + dev-qt/qtdbus:5 + ) + systemd? ( >=sys-apps/systemd-209:= ) +" +DEPEND="${COMMON_DEPEND} + nls? ( virtual/libintl ) +" +RDEPEND="${COMMON_DEPEND} + ${ACCT_DEPEND} +" + +PATCHES=( + "${FILESDIR}"/cmake-unused-command-line.patch + "${FILESDIR}"/transmission-3.00-openssl-3.patch + "${FILESDIR}"/transmission-3.00-horizontal-progress-bars.patch +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} + + -DENABLE_CLI=$(usex cli ON OFF) + -DENABLE_GTK=$(usex gtk ON OFF) + -DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF) + -DENABLE_NLS=$(usex nls ON OFF) + -DENABLE_QT=$(usex qt5 ON OFF) + -DENABLE_TESTS=$(usex test ON OFF) + + -DUSE_SYSTEM_EVENT2=ON + -DUSE_SYSTEM_DHT=OFF + -DUSE_SYSTEM_MINIUPNPC=ON + -DUSE_SYSTEM_NATPMP=ON + -DUSE_SYSTEM_UTP=OFF + -DUSE_SYSTEM_B64=OFF + + -DWITH_CRYPTO=$(usex mbedtls polarssl openssl) + -DWITH_INOTIFY=ON + -DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF) + -DWITH_SYSTEMD=$(usex systemd ON OFF) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon + newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon + + if use systemd; then + # Service sets Type=notify + systemd_dounit daemon/transmission-daemon.service + systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf + fi + + insinto /usr/lib/sysctl.d + doins "${FILESDIR}"/60-transmission.conf + + if [[ ${EUID} == 0 ]]; then + diropts -o transmission -g transmission + fi + keepdir /var/lib/transmission +} + +pkg_postrm() { + if use gtk || use qt5; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_postinst() { + if use gtk || use qt5; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} -- cgit v1.2.3-65-gdbad