mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

- Unbreak after latest KDE Framwork upgrade, 5.49, introduced by r477922

Browse Source 
Syndication::Loader::loadUrl() now always requires a DataRetriever
to be passed as a second argument

Obtained from:	KDE git
This commit is contained in:
Dima Panov 2018-08-26 06:39:08 +00:00
parent 4d3d059d00
commit 255cb80f4a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=478100
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-p2p/ktorrent/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= ktorrent
DISTVERSION= 5.1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-p2p kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION:R}/

44
net-p2p/ktorrent/files/patch-syndication Normal file
View File

@ -0,0 +1,44 @@
From 46a4d7a378372a028522cfba94e77a11c478b36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Fri, 4 May 2018 00:31:44 +0200
Subject: Fix build against new Syndication library
Syndication::Loader::loadUrl() now always requires a DataRetriever
to be passed as a second argument. The behavior of the old method
was basically identical to using FeedRetriever anyway, so we can
use the FeedRetriever here to make it compile against new Syndication
and keep the behavior.
---
plugins/syndication/ktfeed.cpp | 2 +-
plugins/syndication/syndicationactivity.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git ./plugins/syndication/ktfeed.cpp ./plugins/syndication/ktfeed.cpp
index 099cd4f..f20eb2c 100644
--- ./plugins/syndication/ktfeed.cpp
+++ ./plugins/syndication/ktfeed.cpp
@@ -277,7 +277,7 @@ namespace kt
status = DOWNLOADING;
update_timer.stop();
Syndication::Loader* loader = Syndication::Loader::create(this, SLOT(loadingFromDiskComplete(Syndication::Loader*, Syndication::FeedPtr, Syndication::ErrorCode)));
- loader->loadFrom(QUrl(dir + QStringLiteral("feed.xml")));
+ loader->loadFrom(QUrl(dir + QStringLiteral("feed.xml")), new FeedRetriever());
updated();
}
diff --git ./plugins/syndication/syndicationactivity.cpp ./plugins/syndication/syndicationactivity.cpp
index 293540d..61e8039 100644
--- ./plugins/syndication/syndicationactivity.cpp
+++ ./plugins/syndication/syndicationactivity.cpp
@@ -135,7 +135,7 @@ namespace kt
}
else
{
- loader->loadFrom(QUrl(url));
+ loader->loadFrom(QUrl(url), new FeedRetriever());
downloads.insert(loader, url);
}
}
--
cgit v0.11.2