Date: Thu, 03 Jul 2014 22:22:23 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 191592] New: [PATCH] Update net-p2p/transmission* to 2.84 Message-ID: <bug-191592-13@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191592 Bug ID: 191592 Summary: [PATCH] Update net-p2p/transmission* to 2.84 Product: Ports Tree Version: Latest Hardware: Any OS: Any Status: Needs Triage Severity: Affects Many People Priority: --- Component: Individual Port(s) Assignee: freebsd-ports-bugs@FreeBSD.org Reporter: aberg010@my.hennepintech.edu CC: crees@FreeBSD.org Created attachment 144383 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=144383&action=edit 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"); } -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-191592-13>