Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
a1c8534c
Verified
Commit
a1c8534c
authored
2 years ago
by
alice
Browse files
Options
Downloads
Patches
Plain Diff
community/qbittorrent: fix rss on qt 6.3.0
parent
b0366e84
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!54607
main/sofia-sip: backport support for forking SIP calls
,
!41733
community/linux-edge: fix build on x86_64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/qbittorrent/APKBUILD
+3
-1
3 additions, 1 deletion
community/qbittorrent/APKBUILD
community/qbittorrent/rss-qt-6.3.0.patch
+45
-0
45 additions, 0 deletions
community/qbittorrent/rss-qt-6.3.0.patch
with
48 additions
and
1 deletion
community/qbittorrent/APKBUILD
+
3
−
1
View file @
a1c8534c
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
# Maintainer: psykose <alice@ayaya.dev>
# Maintainer: psykose <alice@ayaya.dev>
pkgname
=
qbittorrent
pkgname
=
qbittorrent
pkgver
=
4.4.3.1
pkgver
=
4.4.3.1
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"qBittorrent client"
pkgdesc
=
"qBittorrent client"
url
=
"https://www.qbittorrent.org/"
url
=
"https://www.qbittorrent.org/"
arch
=
"all !s390x"
# qt6-qttools
arch
=
"all !s390x"
# qt6-qttools
...
@@ -27,6 +27,7 @@ subpackages="
...
@@ -27,6 +27,7 @@ subpackages="
source
=
"
$pkgname
-
$pkgver
.tar.gz::https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-
$pkgver
.tar.gz
source
=
"
$pkgname
-
$pkgver
.tar.gz::https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-
$pkgver
.tar.gz
qbittorrent-nox.initd
qbittorrent-nox.initd
qbittorrent-nox.confd
qbittorrent-nox.confd
rss-qt-6.3.0.patch
"
"
builddir
=
"
$srcdir
/qBittorrent-release-
$pkgver
"
builddir
=
"
$srcdir
/qBittorrent-release-
$pkgver
"
...
@@ -88,4 +89,5 @@ sha512sums="
...
@@ -88,4 +89,5 @@ sha512sums="
e3d63c4090e27387f4a5524d0daab26eab70f70ef81ad607e9661e128ccccbf33f2d240cd219bbb1fb138d6e78493ce73055d5128bf888e0ad3949922774efba qbittorrent-4.4.3.1.tar.gz
e3d63c4090e27387f4a5524d0daab26eab70f70ef81ad607e9661e128ccccbf33f2d240cd219bbb1fb138d6e78493ce73055d5128bf888e0ad3949922774efba qbittorrent-4.4.3.1.tar.gz
e84943b4e53717d4c53dc0a454aae2c43390b90afbd7e9d48c50cb914ac9041152a197677343ec81c6881bceb55228a2519bca9fffc158a713305214d0570711 qbittorrent-nox.initd
e84943b4e53717d4c53dc0a454aae2c43390b90afbd7e9d48c50cb914ac9041152a197677343ec81c6881bceb55228a2519bca9fffc158a713305214d0570711 qbittorrent-nox.initd
5cc840181f8b9febdc99b28dca9fe3f6b27a36bad0b20266e46d6ff148dfc9c5d9e6cba552198cd3d1b8ac5c21e2881d7defd8f13fcc8a862b93f4c80c1d4b19 qbittorrent-nox.confd
5cc840181f8b9febdc99b28dca9fe3f6b27a36bad0b20266e46d6ff148dfc9c5d9e6cba552198cd3d1b8ac5c21e2881d7defd8f13fcc8a862b93f4c80c1d4b19 qbittorrent-nox.confd
2e70f4c92d58337300714301c79d608ad4a77c81c865c606e799082187cfb3e95d143a65c4c4dce3d3de3d7c2bdafc74f8537e5fe2ac01a20720e588bf149701 rss-qt-6.3.0.patch
"
"
This diff is collapsed.
Click to expand it.
community/qbittorrent/rss-qt-6.3.0.patch
0 → 100644
+
45
−
0
View file @
a1c8534c
Patch-Source: https://github.com/qbittorrent/qBittorrent/commit/fd5136254539d601b1b0d03de28bf70b8a65583c
From fd5136254539d601b1b0d03de28bf70b8a65583c Mon Sep 17 00:00:00 2001
From: brvphoenix <30111323+brvphoenix@users.noreply.github.com>
Date: Mon, 30 May 2022 13:10:29 +0800
Subject: [PATCH] Don't decompress the reply data for Qt 6.3
PR #17120.
---
src/base/net/downloadhandlerimpl.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/base/net/downloadhandlerimpl.cpp b/src/base/net/downloadhandlerimpl.cpp
index b2de6213ace..a578fa817ec 100644
--- a/src/base/net/downloadhandlerimpl.cpp
+++ b/src/base/net/downloadhandlerimpl.cpp
@@ -34,10 +34,13 @@
#include "base/3rdparty/expected.hpp"
#include "base/utils/fs.h"
-#include "base/utils/gzip.h"
#include "base/utils/io.h"
#include "base/utils/misc.h"
+#if (QT_VERSION < QT_VERSION_CHECK(6, 3, 0))
+#include "base/utils/gzip.h"
+#endif
+
const int MAX_REDIRECTIONS = 20; // the common value for web browsers
namespace
@@ -121,9 +124,13 @@
void DownloadHandlerImpl::processFinishedDownload()
}
// Success
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
+ m_result.data = m_reply->readAll();
+#else
m_result.data = (m_reply->rawHeader("Content-Encoding") == "gzip")
? Utils::Gzip::decompress(m_reply->readAll())
: m_reply->readAll();
+#endif
if (m_downloadRequest.saveToFile())
{
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment