Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9."
@ 2020-08-27 18:04 ericonr
  2020-08-27 18:07 ` [PR PATCH] [Updated] " ericonr
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 18:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages qbit
https://github.com/void-linux/void-packages/pull/24514

Revert "libtorrent-rasterbar: update to 1.2.9."
This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512

@pullmoll 

A patch file from https://github.com/void-linux/void-packages/pull/24514.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbit-24514.patch --]
[-- Type: text/x-diff, Size: 1592 bytes --]

From 696d5c2bf4cecfda2b17295916a3294918409569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 14:54:16 -0300
Subject: [PATCH] Revert "libtorrent-rasterbar: update to 1.2.9."

This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512
---
 srcpkgs/libtorrent-rasterbar/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index f866ac53259..732f0e5a032 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,7 +1,8 @@
 # Template file for 'libtorrent-rasterbar'
 pkgname=libtorrent-rasterbar
-version=1.2.9
-revision=1
+reverts="1.2.9_1"
+version=1.2.7
+revision=3
 build_style=gnu-configure
 configure_args="--enable-examples --enable-python-binding
  --with-boost=${XBPS_CROSS_BASE}/usr
@@ -12,8 +13,8 @@ short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
-distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${version}/libtorrent-rasterbar-${version}.tar.gz"
-checksum=6c986225a1c2d9eb23c5b1ac0692d83208b721a05c968102a17ee3fde01bd709
+distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${version//./_}/libtorrent-rasterbar-${version}.tar.gz"
+checksum=bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
@ 2020-08-27 18:07 ` ericonr
  2020-08-27 18:15 ` ericonr
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 18:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages qbit
https://github.com/void-linux/void-packages/pull/24514

Revert "libtorrent-rasterbar: update to 1.2.9."
This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512

@pullmoll 

A patch file from https://github.com/void-linux/void-packages/pull/24514.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbit-24514.patch --]
[-- Type: text/x-diff, Size: 1690 bytes --]

From 81f166c856b393fe8844dc3d3ca211f821db648f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 14:54:16 -0300
Subject: [PATCH] Revert "libtorrent-rasterbar: update to 1.2.9."

This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512. Add warning about breakages.
---
 srcpkgs/libtorrent-rasterbar/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index f866ac53259..2a67bfa59fc 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,7 +1,9 @@
 # Template file for 'libtorrent-rasterbar'
+# Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.9
-revision=1
+reverts="1.2.9_1"
+version=1.2.7
+revision=3
 build_style=gnu-configure
 configure_args="--enable-examples --enable-python-binding
  --with-boost=${XBPS_CROSS_BASE}/usr
@@ -12,8 +14,8 @@ short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
-distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${version}/libtorrent-rasterbar-${version}.tar.gz"
-checksum=6c986225a1c2d9eb23c5b1ac0692d83208b721a05c968102a17ee3fde01bd709
+distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${version//./_}/libtorrent-rasterbar-${version}.tar.gz"
+checksum=bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
  2020-08-27 18:07 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-27 18:15 ` ericonr
  2020-08-27 18:17 ` ericonr
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 18:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 4407 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#issuecomment-682111003

Comment:
This is a revert because rebuilding qbittorrent with the new version is erroring out:

```
/usr/bin/ld: resumedatasavingmanager.o: in function `int libtorrent::detail::bencode_recursive<Utils::IO::FileDeviceOutputIterator>(Utils::IO::FileDeviceOutputIterator&, libtorrent::entry const&)':
resumedatasavingmanager.cpp:(.text._ZN10libtorrent6detail17bencode_recursiveIN5Utils2IO24FileDeviceOutputIteratorEEEiRT_RKNS_5entryE[_ZN10libtorrent6detail17bencode_recursiveIN5Utils2IO24FileDeviceOutputIteratorEEEiRT_RKNS_5entryE]+0x407): undefined reference to `libtorrent::entry::dict[abi:cxx11]() const'
/usr/bin/ld: tracker.o: in function `BitTorrent::Tracker::prepareAnnounceResponse(BitTorrent::Tracker::TrackerAnnounceRequest const&)':
tracker.cpp:(.text+0x1c0d): undefined reference to `libtorrent::entry::entry(std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, libtorrent::entry, libtorrent::aux::strview_less, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libtorrent::entry> > >)'
/usr/bin/ld: tracker.cpp:(.text+0x2288): undefined reference to `libtorrent::entry::entry(std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, libtorrent::entry, libtorrent::aux::strview_less, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libtorrent::entry> > >)'
/usr/bin/ld: tracker.o: in function `BitTorrent::Tracker::processRequest(Http::Request const&, Http::Environment const&) [clone .cold]':
tracker.cpp:(.text.unlikely+0xb1a): undefined reference to `libtorrent::entry::entry(std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, libtorrent::entry, libtorrent::aux::strview_less, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libtorrent::entry> > >)'
/usr/bin/ld: tracker.o: in function `int libtorrent::detail::bencode_recursive<std::back_insert_iterator<QByteArray> >(std::back_insert_iterator<QByteArray>&, libtorrent::entry const&)':
tracker.cpp:(.text._ZN10libtorrent6detail17bencode_recursiveISt20back_insert_iteratorI10QByteArrayEEEiRT_RKNS_5entryE[_ZN10libtorrent6detail17bencode_recursiveISt20back_insert_iteratorI10QByteArrayEEEiRT_RKNS_5entryE]+0x230): undefined reference to `libtorrent::entry::dict[abi:cxx11]() const'
/usr/bin/ld: tracker.o: in function `void std::vector<libtorrent::entry, std::allocator<libtorrent::entry> >::_M_realloc_insert<std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, libtorrent::entry, libtorrent::aux::strview_less, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libtorrent::entry> > >&>(__gnu_cxx::__normal_iterator<libtorrent::entry*, std::vector<libtorrent::entry, std::allocator<libtorrent::entry> > >, std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, libtorrent::entry, libtorrent::aux::strview_less, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libtorrent::entry> > >&)':
tracker.cpp:(.text._ZNSt6vectorIN10libtorrent5entryESaIS1_EE17_M_realloc_insertIJRSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES1_NS0_3aux12strview_lessESaISt4pairIKSB_S1_EEEEEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_[_ZNSt6vectorIN10libtorrent5entryESaIS1_EE17_M_realloc_insertIJRSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES1_NS0_3aux12strview_lessESaISt4pairIKSB_S1_EEEEEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_]+0x130): undefined reference to `libtorrent::entry::entry(std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, libtorrent::entry, libtorrent::aux::strview_less, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, libtorrent::entry> > >)'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:1039: qbittorrent] Error 1
make[1]: Leaving directory '/builddir/qbittorrent-4.2.5/build-x11/src'
make: *** [Makefile:47: sub-src-make_first] Error 2
```

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
  2020-08-27 18:07 ` [PR PATCH] [Updated] " ericonr
  2020-08-27 18:15 ` ericonr
@ 2020-08-27 18:17 ` ericonr
  2020-08-27 18:41 ` pullmoll
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 18:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#issuecomment-682111813

Comment:
Needs a confirmation if `deluge` requires a rebuild or not.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (2 preceding siblings ...)
  2020-08-27 18:17 ` ericonr
@ 2020-08-27 18:41 ` pullmoll
  2020-08-27 18:48 ` ericonr
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-08-27 18:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#issuecomment-682123512

Comment:
I'd say we revbump pkgs depending on libtorrent-rasterbar-devel in any case.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (3 preceding siblings ...)
  2020-08-27 18:41 ` pullmoll
@ 2020-08-27 18:48 ` ericonr
  2020-08-27 19:30 ` [PR PATCH] [Updated] " ericonr
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 18:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#issuecomment-682126467

Comment:
Will do.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (4 preceding siblings ...)
  2020-08-27 18:48 ` ericonr
@ 2020-08-27 19:30 ` ericonr
  2020-08-27 19:31 ` ericonr
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 19:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages qbit
https://github.com/void-linux/void-packages/pull/24514

Revert "libtorrent-rasterbar: update to 1.2.9."
This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512

@pullmoll 

A patch file from https://github.com/void-linux/void-packages/pull/24514.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbit-24514.patch --]
[-- Type: text/x-diff, Size: 3820 bytes --]

From 81f166c856b393fe8844dc3d3ca211f821db648f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 14:54:16 -0300
Subject: [PATCH 1/4] Revert "libtorrent-rasterbar: update to 1.2.9."

This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512. Add warning about breakages.
---
 srcpkgs/libtorrent-rasterbar/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index f866ac53259..2a67bfa59fc 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,7 +1,9 @@
 # Template file for 'libtorrent-rasterbar'
+# Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.9
-revision=1
+reverts="1.2.9_1"
+version=1.2.7
+revision=3
 build_style=gnu-configure
 configure_args="--enable-examples --enable-python-binding
  --with-boost=${XBPS_CROSS_BASE}/usr
@@ -12,8 +14,8 @@ short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
-distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${version}/libtorrent-rasterbar-${version}.tar.gz"
-checksum=6c986225a1c2d9eb23c5b1ac0692d83208b721a05c968102a17ee3fde01bd709
+distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${version//./_}/libtorrent-rasterbar-${version}.tar.gz"
+checksum=bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 918e6df544e8b89121c1f246370b3e09ff864dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 16:30:08 -0300
Subject: [PATCH 2/4] qbittorrent: revbump for libtorrent-rasterbar.

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index caea7a7677f..4a85f61b3e2 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.2.5
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools tar xz"

From 81553a55f2743f90eb9e46ad9772eb071adffa40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 16:30:08 -0300
Subject: [PATCH 3/4] deluge: revbump for libtorrent-rasterbar.

---
 srcpkgs/deluge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index bb48e58ef6f..9eca5e10f08 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=6
+revision=7
 archs=noarch
 build_style=python3-module
 # TODO package python3-slimit to minify javascript

From f45664aad36a66961e34e3bf926479415646a3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 16:30:08 -0300
Subject: [PATCH 4/4] btfs: revbump for libtorrent-rasterbar.

---
 srcpkgs/btfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 55a4960e630..35884c436b9 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
 version=2.22
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (5 preceding siblings ...)
  2020-08-27 19:30 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-27 19:31 ` ericonr
  2020-08-27 19:36 ` [PR REVIEW] " pullmoll
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 19:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#issuecomment-682147876

Comment:
@pullmoll done!

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR REVIEW] Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (6 preceding siblings ...)
  2020-08-27 19:31 ` ericonr
@ 2020-08-27 19:36 ` pullmoll
  2020-08-27 21:33 ` [PR PATCH] [Updated] " ericonr
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-08-27 19:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New review comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#discussion_r478650095

Comment:
Did we already have revision=3?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (7 preceding siblings ...)
  2020-08-27 19:36 ` [PR REVIEW] " pullmoll
@ 2020-08-27 21:33 ` ericonr
  2020-08-27 21:34 ` [PR REVIEW] " ericonr
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 21:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages qbit
https://github.com/void-linux/void-packages/pull/24514

Revert "libtorrent-rasterbar: update to 1.2.9."
This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512

@pullmoll 

A patch file from https://github.com/void-linux/void-packages/pull/24514.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbit-24514.patch --]
[-- Type: text/x-diff, Size: 3820 bytes --]

From 81f166c856b393fe8844dc3d3ca211f821db648f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 14:54:16 -0300
Subject: [PATCH 1/4] Revert "libtorrent-rasterbar: update to 1.2.9."

This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512. Add warning about breakages.
---
 srcpkgs/libtorrent-rasterbar/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index f866ac53259..2a67bfa59fc 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,7 +1,9 @@
 # Template file for 'libtorrent-rasterbar'
+# Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.9
-revision=1
+reverts="1.2.9_1"
+version=1.2.7
+revision=3
 build_style=gnu-configure
 configure_args="--enable-examples --enable-python-binding
  --with-boost=${XBPS_CROSS_BASE}/usr
@@ -12,8 +14,8 @@ short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
-distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${version}/libtorrent-rasterbar-${version}.tar.gz"
-checksum=6c986225a1c2d9eb23c5b1ac0692d83208b721a05c968102a17ee3fde01bd709
+distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${version//./_}/libtorrent-rasterbar-${version}.tar.gz"
+checksum=bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 288b0844a09718d9bae1a3fbb54be9959f95d01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 16:30:08 -0300
Subject: [PATCH 2/4] qbittorrent: revbump for libtorrent-rasterbar.

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index caea7a7677f..c20ad4c48b1 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.2.5
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools tar xz"

From ea8b1f6fec7df0138b6c6b21fa4da7cc02c27f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 16:30:08 -0300
Subject: [PATCH 3/4] deluge: revbump for libtorrent-rasterbar.

---
 srcpkgs/deluge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index bb48e58ef6f..9eca5e10f08 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=6
+revision=7
 archs=noarch
 build_style=python3-module
 # TODO package python3-slimit to minify javascript

From e00790d3d3e54d1322714facf158ce967ca8ffed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 27 Aug 2020 16:30:08 -0300
Subject: [PATCH 4/4] btfs: revbump for libtorrent-rasterbar.

---
 srcpkgs/btfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 55a4960e630..35884c436b9 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
 version=2.22
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR REVIEW] Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (8 preceding siblings ...)
  2020-08-27 21:33 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-27 21:34 ` ericonr
  2020-08-28  2:38 ` daniel-eys
  2020-08-28  8:43 ` [PR PATCH] [Merged]: " pullmoll
  11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2020-08-27 21:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#discussion_r478708458

Comment:
No, sorry. Fixed.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (9 preceding siblings ...)
  2020-08-27 21:34 ` [PR REVIEW] " ericonr
@ 2020-08-28  2:38 ` daniel-eys
  2020-08-28  8:43 ` [PR PATCH] [Merged]: " pullmoll
  11 siblings, 0 replies; 13+ messages in thread
From: daniel-eys @ 2020-08-28  2:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

New comment by daniel-eys on void-packages repository

https://github.com/void-linux/void-packages/pull/24514#issuecomment-682291866

Comment:
Looks like upstream libtorrent-rasterbar updated their m4 macros during 1.2.8 -> 1.2.9 which resulted in a makefile with `-std=c++11` and a silent abi breakage with C++14 packages like qbittorrent.

Unfortunately, this slipped through my tests when I was doing the recent libtorrent-rasterbar pr as I was only testing with libtorrent-rasterbar-examples and btfs (C++11).

Rebuilding current libtorrent-rasterbar with C++14 should potentially fix this.
Anyway, let's revert and wait for upstream.


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Merged]: Revert "libtorrent-rasterbar: update to 1.2.9."
  2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
                   ` (10 preceding siblings ...)
  2020-08-28  2:38 ` daniel-eys
@ 2020-08-28  8:43 ` pullmoll
  11 siblings, 0 replies; 13+ messages in thread
From: pullmoll @ 2020-08-28  8:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

There's a merged pull request on the void-packages repository

Revert "libtorrent-rasterbar: update to 1.2.9."
https://github.com/void-linux/void-packages/pull/24514

Description:
This reverts commit 216fdd4f1f998447fd8d2cb4ed22cc216b193fac.

Fixes #24512

@pullmoll 

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2020-08-28  8:43 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-27 18:04 [PR PATCH] Revert "libtorrent-rasterbar: update to 1.2.9." ericonr
2020-08-27 18:07 ` [PR PATCH] [Updated] " ericonr
2020-08-27 18:15 ` ericonr
2020-08-27 18:17 ` ericonr
2020-08-27 18:41 ` pullmoll
2020-08-27 18:48 ` ericonr
2020-08-27 19:30 ` [PR PATCH] [Updated] " ericonr
2020-08-27 19:31 ` ericonr
2020-08-27 19:36 ` [PR REVIEW] " pullmoll
2020-08-27 21:33 ` [PR PATCH] [Updated] " ericonr
2020-08-27 21:34 ` [PR REVIEW] " ericonr
2020-08-28  2:38 ` daniel-eys
2020-08-28  8:43 ` [PR PATCH] [Merged]: " pullmoll

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).