* [gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/, net-libs/libktorrent/files/
@ 2019-07-15 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-07-15 20:52 UTC (permalink / raw
To: gentoo-commits
commit: f7ee786b4173c5077e353a61c9f74462f211dfb6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:09:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:51:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ee786b
net-libs/libktorrent: EAPI-7 bump
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libktorrent-2.1-unused-link.patch | 24 +++++++++
net-libs/libktorrent/libktorrent-2.1-r2.ebuild | 59 ++++++++++++++++++++++
2 files changed, 83 insertions(+)
diff --git a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch b/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
new file mode 100644
index 00000000000..636c59d1b06
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
@@ -0,0 +1,24 @@
+From e7c4847d9bbdc5d7c7435039aa5088d276ca5bce Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Mon, 10 Jun 2019 13:27:29 +0100
+Subject: remove unused link to kcrash, it can be used by the apps which use
+ libktorrent but it needs to be initialised not just arbitrarily linked to
+
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d347e07..1578bf4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -235,7 +235,6 @@ PRIVATE
+ qca-qt5
+ PUBLIC
+ KF5::Archive
+- KF5::Crash
+ KF5::KIOCore
+ KF5::KIOWidgets
+ KF5::Solid
+--
+cgit v1.1
diff --git a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
new file mode 100644
index 00000000000..230154addc5
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+SRC_URI="mirror://kde/stable/ktorrent/5.1/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtxml)
+ app-crypt/qca:2[qt5(+)]
+ >=dev-libs/gmp-6.0.0a:0=
+ dev-libs/libgcrypt:0=
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-libs/botan[gmp(-)]
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-link.patch" )
+
+src_prepare() {
+ kde5_src_prepare
+
+ # Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
+ sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+ CMakeLists.txt || die
+ sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
+ KF5TorrentConfig.cmake.in || die
+}
+
+src_test() {
+ # failing network tests
+ local myctestargs=(
+ -E "(fin|packetloss|send|transmit)"
+ )
+
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/, net-libs/libktorrent/files/
@ 2019-11-14 17:32 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-11-14 17:32 UTC (permalink / raw
To: gentoo-commits
commit: a51bb03daa7f2c74449464ce7d7f1d95aef88151
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 17:30:12 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 17:31:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51bb03d
net-libs/libktorrent: Fix build
Broken all of a sudden by... who knows what.
Closes: https://bugs.gentoo.org/700090
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libktorrent-2.1.1-fileops.patch | 25 ++++++++++++++++++++++
net-libs/libktorrent/libktorrent-2.1.1.ebuild | 5 ++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
new file mode 100644
index 00000000000..87d25e26b7b
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
@@ -0,0 +1,25 @@
+From 1e8ce6e98d7ca0088624778964b9aed4696ce030 Mon Sep 17 00:00:00 2001
+From: Christoph Feck <cfeck@kde.org>
+Date: Thu, 14 Nov 2019 14:19:42 +0100
+Subject: Fix build with XFS
+
+BUG: 414050
+---
+ src/util/fileops.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
+index c76b0e3..cfe4d5e 100644
+--- a/src/util/fileops.cpp
++++ b/src/util/fileops.cpp
+@@ -366,7 +366,7 @@ namespace bt
+
+ bool XfsPreallocate(const QString & path, Uint64 size)
+ {
+- int fd = ::open(QFile::encodeName(path), O_RDWR | O_LARGEFILE);
++ int fd = ::open(QFile::encodeName(path).constData(), O_RDWR | O_LARGEFILE);
+ if (fd < 0)
+ throw Error(i18n("Cannot open %1: %2",path,strerror(errno)));
+
+--
+cgit v1.1
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
index 34a552aa1dc..9399cfd161b 100644
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -36,7 +36,10 @@ RDEPEND="${COMMON_DEPEND}
!dev-libs/botan[gmp(-)]
"
-PATCHES=( "${FILESDIR}/${PN}-2.1-unused-link.patch" ) # git master
+PATCHES=(
+ "${FILESDIR}/${P}-fileops.patch" # bug 700090
+ "${FILESDIR}/${PN}-2.1-unused-link.patch" # git master
+)
src_prepare() {
kde5_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/, net-libs/libktorrent/files/
@ 2021-04-06 8:23 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-04-06 8:23 UTC (permalink / raw
To: gentoo-commits
commit: ade1151f6c6869959271e55b6f147f17e028039d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 08:11:10 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 6 08:23:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade1151f
net-libs/libktorrent: Drop 2.2.0-r1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/libktorrent/Manifest | 1 -
.../libktorrent-2.2.0-fix-MultiFileCache.patch | 26 ---------
net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild | 63 ----------------------
3 files changed, 90 deletions(-)
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 9f4b5ec3791..3e9c0abae53 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,2 +1 @@
-DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a
DIST libktorrent-20.12.3.tar.xz 604488 BLAKE2B e51bba82990632744aaadf3e40043fa80e64395f6f3721992780ff77d7663a0a3600aaf7d2653a00f32366555f1000a961c3e99de6d2e2cfecc4c1f79d1ebb00 SHA512 e2259251e8edbef6154674898614f81b3a29d5c711e9f751435450edbbb987c5e2a1d8ff864da5aa180b5d1adc3ef611f46175f2126faca52d1b1338d986d1cb
diff --git a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
deleted file mode 100644
index bafdbaffefa..00000000000
--- a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b0abf8378d497c5a8881771518df6a02404d031 Mon Sep 17 00:00:00 2001
-From: Alexander Trufanov <trufanovan@gmail.com>
-Date: Tue, 16 Jun 2020 13:47:42 +0300
-Subject: [PATCH] Fix a bug in MultiFileCache
-
-Differential Revision: https://phabricator.kde.org/D29852
----
- src/diskio/multifilecache.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp
-index 0a513ad..882630e 100644
---- a/src/diskio/multifilecache.cpp
-+++ b/src/diskio/multifilecache.cpp
-@@ -455,7 +455,7 @@ namespace bt
- off = file_off + (piece_off - chunk_off);
- len = piece_len;
- }
-- else if(piece_off >= chunk_off && piece_len < chunk_off + chunk_len)
-+ else if(piece_off >= chunk_off && piece_off < chunk_off + chunk_len)
- {
- // The start of the piece lies partially in the current file
- off = file_off + (piece_off - chunk_off);
---
-GitLab
-
diff --git a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
deleted file mode 100644
index 95565a6e37a..00000000000
--- a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="network"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
-SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
- >=dev-libs/gmp-6.0.0a:0=
- dev-libs/libgcrypt:0=
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- !dev-libs/botan[gmp(-)]
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-MultiFileCache.patch" ) # 2.2 branch
-
-src_prepare() {
- ecm_src_prepare
-
- # Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
- sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
- CMakeLists.txt || die
- sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
- KF5TorrentConfig.cmake.in || die
-}
-
-src_test() {
- # failing network tests
- local myctestargs=(
- -E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
- )
-
- ecm_src_test
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-06 8:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-15 20:52 [gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/, net-libs/libktorrent/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-11-14 17:32 Andreas Sturmlechner
2021-04-06 8:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox