public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/
@ 2017-03-06 20:54 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-03-06 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8e7fdb875b08331f913bffd10d0dd33dc63e6c2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 20:46:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 20:51:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7fdb87

net-p2p/qbittorrent: 3.3.11 version bump

Update HOMEPAGE
metadata.xml: Indentation, upstream remote-id

Gentoo-bug: 607722, 611854

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-p2p/qbittorrent/Manifest                       |  1 +
 .../files/qbittorrent-3.3.11-build.patch           | 50 +++++++++++++++++++
 net-p2p/qbittorrent/metadata.xml                   | 28 +++++------
 net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild      | 57 ++++++++++++++++++++++
 4 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 959151e6ae9..9507220f1d5 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,3 +1,4 @@
 DIST qbittorrent-3.1.12.tar.xz 2465744 SHA256 d5d5b27958297f0b14cf03af8dd24a0d2a990e108c9a7a6159e4a2fbb1111c83 SHA512 af7cbb1a3158cd1fd6c28f17f1dbb62d94c9d192068b5a683b6b0e19e43664f3d312da055c5c19de75b5849c812b7aa9a0c966a7e464c120e0006bb1ea5a6e5a WHIRLPOOL 632fabec4c33104e55c73433028923033e65f37624aba37649e4f6f5593038fa9868e48787db7b1659690456835fc55dc542510d2f60732c66452d3c748508bf
 DIST qbittorrent-3.3.10.tar.xz 2959380 SHA256 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 SHA512 4f4e7071fa6db75ed2b5fbf5f17d5a9634aa5f2ed9fbcec52e6a0112967f5832e998384c7ff4962b1e00a0f847fa5d39bcdba36f997b5b895c7688e0dd247516 WHIRLPOOL 950b49d7a15aa7cf16dfe2bbfba72959e91f21f85ba589ce85be370b8b21c03fb389d404ed46ad2c802e3a57660094fe644b20df9bc3a0714cb5d9ea965e1b97
+DIST qbittorrent-3.3.11.tar.xz 2986312 SHA256 4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760 SHA512 1f7d4a40b7f966e710d4cbed721074d53b0478ed1970932dee32b73ea210251cbd3807912e9c9a00371fa41f5c947c59443bbda4925b022fbe88fc23b3f225c5 WHIRLPOOL 5fb2e0456d81b104e5545329a301040c81a18b25798e831ab8f780f8ee19d09c12f5315d5581243e141f7a00eb938ab449927871c70a4bf5e9c2e6dd71d4aca3
 DIST qbittorrent-3.3.7.tar.xz 2884792 SHA256 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40 SHA512 c33ae47bd78e79197fd499e9541ce20a30c0ee582c6696f72b792a46324a42bffbe2140f6dcb89c05d9366b7332845e108c661c0458e94ca5739cfc71be4dafc WHIRLPOOL 753efd5e30c725d77e241bfc4cee63f089109b4a85bab5224e5445d141605c07bb8873531245d17f577252ae1d90041457848e9290ecb2384d96f2a20bbf6f66

diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch
new file mode 100644
index 00000000000..372fb267630
--- /dev/null
+++ b/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch
@@ -0,0 +1,50 @@
+From b3c973612f5cfcd97d9921330ee606ab9c8cd269 Mon Sep 17 00:00:00 2001
+From: Chocobo1 <Chocobo1@users.noreply.github.com>
+Date: Sat, 4 Mar 2017 15:48:37 +0800
+Subject: [PATCH] =?UTF-8?q?Fix=20compile=20error:=20=E2=80=98escape?=
+ =?UTF-8?q?=E2=80=99=20is=20not=20a=20member=20of=20=E2=80=98Qt=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/base/utils/string.cpp | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/base/utils/string.cpp b/src/base/utils/string.cpp
+index 7d76d9a..6c713b1 100644
+--- a/src/base/utils/string.cpp
++++ b/src/base/utils/string.cpp
+@@ -34,6 +34,7 @@
+ #include <QByteArray>
+ #include <QtGlobal>
+ #include <QLocale>
++
+ #ifdef QBT_USES_QT5
+ #include <QCollator>
+ #endif
+@@ -217,6 +218,23 @@ QString Utils::String::toHtmlEscaped(const QString &str)
+ #ifdef QBT_USES_QT5
+     return str.toHtmlEscaped();
+ #else
+-    return Qt::escape(str);
++    // code from Qt
++    QString rich;
++    const int len = str.length();
++    rich.reserve(int(len * 1.1));
++    for (int i = 0; i < len; ++i) {
++        if (str.at(i) == QLatin1Char('<'))
++            rich += QLatin1String("&lt;");
++        else if (str.at(i) == QLatin1Char('>'))
++            rich += QLatin1String("&gt;");
++        else if (str.at(i) == QLatin1Char('&'))
++            rich += QLatin1String("&amp;");
++        else if (str.at(i) == QLatin1Char('"'))
++            rich += QLatin1String("&quot;");
++        else
++            rich += str.at(i);
++    }
++    rich.squeeze();
++    return rich;
+ #endif
+ }

diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index 5901c3cdacc..b8639b7c10e 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <use>
-    <flag name="webui">Enable the Web UI</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">qbittorrent</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="webui">Enable the Web UI</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">qbittorrent/qBittorrent</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild
new file mode 100644
index 00000000000..1221fe2d7a4
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	MY_P=${P/_}
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
+	dev-qt/qtxml:5
+	>=net-libs/rb_libtorrent-1.0.6
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT5=ON
+		-DSYSTEM_QTSINGLEAPPLICATION=ON
+		-DDBUS=$(usex dbus)
+		-DGUI=$(usex X)
+		-DWEBUI=$(usex webui)
+	)
+	cmake-utils_src_configure
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/
@ 2017-05-21  2:28 Davide Pesavento
  0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2017-05-21  2:28 UTC (permalink / raw
  To: gentoo-commits

commit:     e998b9a6e129332146f7f5906466d3cd3ab7ffdb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 02:28:00 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 21 02:28:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e998b9a6

net-p2p/qbittorrent: remove 3.3.11

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-p2p/qbittorrent/Manifest                       |  1 -
 .../files/qbittorrent-3.3.11-build.patch           | 50 -------------------
 net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild      | 57 ----------------------
 3 files changed, 108 deletions(-)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 6df0bab6894..646cfa7175b 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,5 +1,4 @@
 DIST qbittorrent-3.3.10.tar.xz 2959380 SHA256 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 SHA512 4f4e7071fa6db75ed2b5fbf5f17d5a9634aa5f2ed9fbcec52e6a0112967f5832e998384c7ff4962b1e00a0f847fa5d39bcdba36f997b5b895c7688e0dd247516 WHIRLPOOL 950b49d7a15aa7cf16dfe2bbfba72959e91f21f85ba589ce85be370b8b21c03fb389d404ed46ad2c802e3a57660094fe644b20df9bc3a0714cb5d9ea965e1b97
-DIST qbittorrent-3.3.11.tar.xz 2986312 SHA256 4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760 SHA512 1f7d4a40b7f966e710d4cbed721074d53b0478ed1970932dee32b73ea210251cbd3807912e9c9a00371fa41f5c947c59443bbda4925b022fbe88fc23b3f225c5 WHIRLPOOL 5fb2e0456d81b104e5545329a301040c81a18b25798e831ab8f780f8ee19d09c12f5315d5581243e141f7a00eb938ab449927871c70a4bf5e9c2e6dd71d4aca3
 DIST qbittorrent-3.3.12-cmake-3.8.patch.gz 18330 SHA256 8172d04af3621ed0859ff541ae6c6e73f469125e0b7defd591191ab8c233e658 SHA512 e5aa6aa32f12c47a28658b2382faca88b64be1c198c69ad88f4fcd9f18d2db7a4e71c170dffd142b5af0184105b04dc2409417761db8859f622d42af7d25b060 WHIRLPOOL a68723a52858aed3e0474e0ccc3bcde7a451b388c8cd30ea5548f53e950902e234cb7e9cc32a86c75e367c4cad33a40beab52619de0a1f27442b89a10c25e67f
 DIST qbittorrent-3.3.12.tar.xz 2989604 SHA256 56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f SHA512 537ded71c75b3ab3fe014d77b5c4f8069ebb7a1aa94b5190b16e9ee910bfb70d462e5a3a536ba9222a97d8cceac00af0d33a92b7414b17724694d364fc2374df WHIRLPOOL 9f3b7cb85885691ea747b2569690aa3d1189798be6000e9ec2c8af65ccd86010be877af10b540422233f5b8c253bf221fad0fea6fdc9a0b5dcbc3cedf50613bd
 DIST qbittorrent-3.3.7.tar.xz 2884792 SHA256 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40 SHA512 c33ae47bd78e79197fd499e9541ce20a30c0ee582c6696f72b792a46324a42bffbe2140f6dcb89c05d9366b7332845e108c661c0458e94ca5739cfc71be4dafc WHIRLPOOL 753efd5e30c725d77e241bfc4cee63f089109b4a85bab5224e5445d141605c07bb8873531245d17f577252ae1d90041457848e9290ecb2384d96f2a20bbf6f66

diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch
deleted file mode 100644
index 372fb267630..00000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b3c973612f5cfcd97d9921330ee606ab9c8cd269 Mon Sep 17 00:00:00 2001
-From: Chocobo1 <Chocobo1@users.noreply.github.com>
-Date: Sat, 4 Mar 2017 15:48:37 +0800
-Subject: [PATCH] =?UTF-8?q?Fix=20compile=20error:=20=E2=80=98escape?=
- =?UTF-8?q?=E2=80=99=20is=20not=20a=20member=20of=20=E2=80=98Qt=E2=80=99?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- src/base/utils/string.cpp | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/base/utils/string.cpp b/src/base/utils/string.cpp
-index 7d76d9a..6c713b1 100644
---- a/src/base/utils/string.cpp
-+++ b/src/base/utils/string.cpp
-@@ -34,6 +34,7 @@
- #include <QByteArray>
- #include <QtGlobal>
- #include <QLocale>
-+
- #ifdef QBT_USES_QT5
- #include <QCollator>
- #endif
-@@ -217,6 +218,23 @@ QString Utils::String::toHtmlEscaped(const QString &str)
- #ifdef QBT_USES_QT5
-     return str.toHtmlEscaped();
- #else
--    return Qt::escape(str);
-+    // code from Qt
-+    QString rich;
-+    const int len = str.length();
-+    rich.reserve(int(len * 1.1));
-+    for (int i = 0; i < len; ++i) {
-+        if (str.at(i) == QLatin1Char('<'))
-+            rich += QLatin1String("&lt;");
-+        else if (str.at(i) == QLatin1Char('>'))
-+            rich += QLatin1String("&gt;");
-+        else if (str.at(i) == QLatin1Char('&'))
-+            rich += QLatin1String("&amp;");
-+        else if (str.at(i) == QLatin1Char('"'))
-+            rich += QLatin1String("&quot;");
-+        else
-+            rich += str.at(i);
-+    }
-+    rich.squeeze();
-+    return rich;
- #endif
- }

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild
deleted file mode 100644
index 06ecba50733..00000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	MY_P=${P/_}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT5=ON
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/
@ 2017-10-15 22:12 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-10-15 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     81e65d9926f6ba4b61e0b06e66eed985dcb70f1a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 22:11:37 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 22:12:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e65d99

net-p2p/qbittorrent: 3.3.16 version bump

Gentoo-bug: 613194, 621548
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 net-p2p/qbittorrent/Manifest                       |  1 +
 .../files/qbittorrent-3.3.16-cmake.patch           | 44 +++++++++++++++
 net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild      | 64 ++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 69885079694..101ed3b9d0e 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,3 +1,4 @@
 DIST qbittorrent-3.3.10.tar.xz 2959380 SHA256 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 SHA512 4f4e7071fa6db75ed2b5fbf5f17d5a9634aa5f2ed9fbcec52e6a0112967f5832e998384c7ff4962b1e00a0f847fa5d39bcdba36f997b5b895c7688e0dd247516 WHIRLPOOL 950b49d7a15aa7cf16dfe2bbfba72959e91f21f85ba589ce85be370b8b21c03fb389d404ed46ad2c802e3a57660094fe644b20df9bc3a0714cb5d9ea965e1b97
 DIST qbittorrent-3.3.12-cmake-3.8.patch.gz 18330 SHA256 8172d04af3621ed0859ff541ae6c6e73f469125e0b7defd591191ab8c233e658 SHA512 e5aa6aa32f12c47a28658b2382faca88b64be1c198c69ad88f4fcd9f18d2db7a4e71c170dffd142b5af0184105b04dc2409417761db8859f622d42af7d25b060 WHIRLPOOL a68723a52858aed3e0474e0ccc3bcde7a451b388c8cd30ea5548f53e950902e234cb7e9cc32a86c75e367c4cad33a40beab52619de0a1f27442b89a10c25e67f
 DIST qbittorrent-3.3.12.tar.xz 2989604 SHA256 56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f SHA512 537ded71c75b3ab3fe014d77b5c4f8069ebb7a1aa94b5190b16e9ee910bfb70d462e5a3a536ba9222a97d8cceac00af0d33a92b7414b17724694d364fc2374df WHIRLPOOL 9f3b7cb85885691ea747b2569690aa3d1189798be6000e9ec2c8af65ccd86010be877af10b540422233f5b8c253bf221fad0fea6fdc9a0b5dcbc3cedf50613bd
+DIST qbittorrent-3.3.16.tar.xz 2961420 SHA256 ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117 WHIRLPOOL dec3eab159c9f930d5c2a2f123b089c6ce84e7bcbd83d84f996c1a0167e4bbbdf468492a136a86485cc73611f044587e940910e34260535f2074e84680369ccb

diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch
new file mode 100644
index 00000000000..9f5b82b218e
--- /dev/null
+++ b/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch
@@ -0,0 +1,44 @@
+From 0ad52903890fe680307b46f4051bdd91d8aaffd5 Mon Sep 17 00:00:00 2001
+From: Eugene Shalygin <eugene.shalygin@gmail.com>
+Date: Sat, 7 Oct 2017 21:48:52 +0200
+Subject: [PATCH] cmake: do not use Qt5Widgets when locating
+ QtSingleApplication. Closes #7551.
+
+This fixes cmake builds with GUI disabled and system
+QtSingleApplication. We rely on Qt5::Core instead of Qt5::Widgets.
+---
+ cmake/Modules/FindQtSingleApplication.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake
+index eb56607e94..9b526c9839 100644
+--- a/cmake/Modules/FindQtSingleApplication.cmake
++++ b/cmake/Modules/FindQtSingleApplication.cmake
+@@ -30,9 +30,9 @@ IF(QT4_FOUND)
+         NAMES ${QTSINGLEAPPLICATION_NAMES}
+         PATHS ${QT_LIBRARY_DIR}
+     )
+-ELSEIF(Qt5Widgets_FOUND)
++ELSEIF(Qt5Core_FOUND)
+     message(STATUS "Looking for Qt5 single application library")
+-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
++    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
+         FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
+ 
+         IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
+@@ -43,12 +43,12 @@ ELSEIF(Qt5Widgets_FOUND)
+     SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
+         Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
+         QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
+-    GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
+-    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
++    GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION)
++    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
+ 
+     FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
+         NAMES ${QTSINGLEAPPLICATION_NAMES}
+-        PATHS ${QT5_WIDGETSLIBRARYPATH}
++        PATHS ${_QT5_CORELIBRARYPATH}
+     )
+ ENDIF()
+ 

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
new file mode 100644
index 00000000000..98163e4f20c
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	MY_P=${P/_}
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
+	dev-qt/qtxml:5
+	>=net-libs/libtorrent-rasterbar-1.0.6
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEM_QTSINGLEAPPLICATION=ON
+		-DDBUS=$(usex dbus)
+		-DGUI=$(usex X)
+		-DWEBUI=$(usex webui)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/
@ 2019-07-16  9:39 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-07-16  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2ba34f12ffa132f756c19c43880f1a7b226f0be0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 09:36:07 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 09:39:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba34f12

net-p2p/qbittorrent: EAPI-7, drop gnome2-utils, fix bug w/ Qt-5.12.4

Upstream commit 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960

Reported-by: Nikos Chantziaras <realnc <AT> gmail.com>
Bug: https://bugs.gentoo.org/689704
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...-4.1.6-no-screenblank-on-close-to-systray.patch | 25 ++++++++
 net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild    | 72 ++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
new file mode 100644
index 00000000000..361f7aa2255
--- /dev/null
+++ b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
@@ -0,0 +1,25 @@
+From 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960 Mon Sep 17 00:00:00 2001
+From: Ekin Dursun <ekindursun@gmail.com>
+Date: Tue, 7 May 2019 02:08:46 +0300
+Subject: [PATCH] Don't turn screen blank when closed to system tray
+
+Closes #9240 and possibly #9121, as @zeule suggested here: https://github.com/qbittorrent/qBittorrent/issues/9240#issuecomment-408025722.
+---
+ src/gui/mainwindow.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
+index 4c62ba5d90..0b8b41ebab 100644
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -1158,8 +1158,8 @@ void MainWindow::closeEvent(QCloseEvent *e)
+ #else
+     const bool goToSystrayOnExit = pref->closeToTray();
+     if (!m_forceExit && m_systrayIcon && goToSystrayOnExit && !this->isHidden()) {
+-        hide();
+-        e->accept();
++        e->ignore();
++        QTimer::singleShot(0, this, &QWidget::hide);
+         if (!pref->closeToTrayNotified()) {
+             showNotificationBaloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again."));
+             pref->setCloseToTrayNotified(true);

diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
new file mode 100644
index 00000000000..ae75d7415fa
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
+	dev-qt/qtxml:5
+	=net-libs/libtorrent-rasterbar-1.1*:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-no-screenblank-on-close-to-systray.patch" )
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf --with-qtsingleapplication=system \
+		$(use_enable dbus qt-dbus) \
+		$(use_enable debug) \
+		$(use_enable webui) \
+		$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/
@ 2019-09-29 17:42 Mikle Kolyada
  0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2019-09-29 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0c5afb448d4a3f83ba60a25337376511c20e3511
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 17:42:14 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 17:42:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5afb44

net-p2p/qbittorrent: Drop old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-p2p/qbittorrent/Manifest                       |  1 -
 ...-4.1.6-no-screenblank-on-close-to-systray.patch | 25 --------
 net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild    | 72 ----------------------
 3 files changed, 98 deletions(-)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index ad3dd5feb43..5790de685fc 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,3 +1,2 @@
-DIST qbittorrent-4.1.6.tar.gz 7780676 BLAKE2B fe2572bece5a014d821cf905a13a45f71c63eda661b338a90517a23d257d83f556c1ad1bd064cc2840e9731886d7afaafa36ea50f8c3fe8ff05fc3ec3a12c478 SHA512 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735
 DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4
 DIST qbittorrent-4.1.8.tar.gz 7803739 BLAKE2B ee56e004945025f06b179b08e938c6a3182f252c3bed6990158634ea1fdfd525fd67d105fd7ecdf0217a4bd73d847c5007d1e95f492f4f4e41c32d22dd6b7523 SHA512 8920e98f8db5dd738caab8815cc4a10950c34ba2eaa19b50479bb2ab548f6f297534759d71791caa4c8bfbea92d4b71d223a27fae150e00cc0a262eb3370a1e3

diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
deleted file mode 100644
index 361f7aa2255..00000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960 Mon Sep 17 00:00:00 2001
-From: Ekin Dursun <ekindursun@gmail.com>
-Date: Tue, 7 May 2019 02:08:46 +0300
-Subject: [PATCH] Don't turn screen blank when closed to system tray
-
-Closes #9240 and possibly #9121, as @zeule suggested here: https://github.com/qbittorrent/qBittorrent/issues/9240#issuecomment-408025722.
----
- src/gui/mainwindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index 4c62ba5d90..0b8b41ebab 100644
---- a/src/gui/mainwindow.cpp
-+++ b/src/gui/mainwindow.cpp
-@@ -1158,8 +1158,8 @@ void MainWindow::closeEvent(QCloseEvent *e)
- #else
-     const bool goToSystrayOnExit = pref->closeToTray();
-     if (!m_forceExit && m_systrayIcon && goToSystrayOnExit && !this->isHidden()) {
--        hide();
--        e->accept();
-+        e->ignore();
-+        QTimer::singleShot(0, this, &QWidget::hide);
-         if (!pref->closeToTrayNotified()) {
-             showNotificationBaloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again."));
-             pref->setCloseToTrayNotified(true);

diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
deleted file mode 100644
index 1031d3dfb61..00000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S="${WORKDIR}/qBittorrent-release-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
-	dev-qt/qtxml:5
-	=net-libs/libtorrent-rasterbar-1.1*:0=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-libs/geoip
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-no-screenblank-on-close-to-systray.patch" )
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	econf --with-qtsingleapplication=system \
-		$(use_enable dbus qt-dbus) \
-		$(use_enable debug) \
-		$(use_enable webui) \
-		$(use_enable X gui)
-}
-
-src_install() {
-	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/
@ 2023-10-19 16:56 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-10-19 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     9cbbeb14db35f527f0ce09b69d66131b16f2386c
Author:     Alexey Lunev <cheembox573 <AT> gmail <DOT> com>
AuthorDate: Thu Oct 19 16:04:47 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 16:56:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbeb14

net-p2p/qbittorrent: revbump to fix service file

Closes: https://bugs.gentoo.org/916012
Signed-off-by: Alexey Lunev <cheembox573 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33415
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/qbittorrent/files/qbittorrent.initd                             | 2 +-
 .../{qbittorrent-4.5.5.ebuild => qbittorrent-4.5.5-r1.ebuild}           | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/qbittorrent/files/qbittorrent.initd b/net-p2p/qbittorrent/files/qbittorrent.initd
index 7f800e640e76..a04de6aaafb9 100644
--- a/net-p2p/qbittorrent/files/qbittorrent.initd
+++ b/net-p2p/qbittorrent/files/qbittorrent.initd
@@ -14,7 +14,7 @@ command="/usr/bin/qbittorrent-nox"
 command_args="${QBITTORRENT_OPTS}"
 pidfile="/run/${RC_SVCNAME}.pid"
 command_background="yes"
-command_user="${QBITTORRENT_USER}:${QBITTORRENT_USER}"
+command_user="${QBITTORRENT_USER}:${QBITTORRENT_GROUP}"
 umask="${QBITTORRENT_UMASK}"
 start_stop_daemon_args="--ionice ${QBITTORRENT_IONICE} --nicelevel ${QBITTORRENT_NICE}"
 

diff --git a/net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild
similarity index 100%
rename from net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild
rename to net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-19 16:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-16  9:39 [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-10-19 16:56 Florian Schmaus
2019-09-29 17:42 Mikle Kolyada
2017-10-15 22:12 Andreas Sturmlechner
2017-05-21  2:28 Davide Pesavento
2017-03-06 20:54 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox