Bug 191592
| Summary: | [PATCH] Update net-p2p/transmission* to 2.84 | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Andrew Berg <berg2839> | ||||||
| Component: | Individual Port(s) | Assignee: | Chris Rees <crees> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Many People | CC: | crees | ||||||
| Priority: | --- | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
Over to maintainer. Thanks, I shall look when I get a chance. Created attachment 144808 [details]
Version bump and removal of conflicting local patches
Whatever compilation issues these 3 local patches fixed seem to be resolved upstream.
The diff didn't come out quite the way I wanted. To be clear: files/patch-qt_favicon_cc files/patch-qt_file-tree_cc files/patch-qt_torrent-filter_cc are to be removed from transmission-cli in addition to the content changes. Committed, thanks. Bear in mind that all of the slaves should be tested too-- I had to fix transmission-qt4 (always a PITA that one!). |
Created attachment 144383 [details] Basic version bump to 2.84 I've made a basic patch to update transmission from 2.82 to 2.84, but one of the patches for transmission-daemon doesn't apply cleanly, and I'm not sure what the best way to fix it is. There's a patch to add these to qt/favicon.cc: #if QT_VERSION >= 0x050000 #include <QStandardPaths> #else #include <QDesktopServices> #endif ... Favicons :: getCacheDir( ) { #if QT_VERSION >= 0x050000 const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation); #else const QString base = QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); #endif return QDir( base ).absoluteFilePath( "favicons" ); } However, upstream has these now: #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include <QDesktopServices> #else #include <QStandardPaths> #endif ... Favicons :: getCacheDir () { const QString base = #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) QDesktopServices::storageLocation (QDesktopServices::CacheLocation); #else QStandardPaths::writableLocation (QStandardPaths::CacheLocation); #endif return QDir(base).absoluteFilePath ("favicons"); }