1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Update to 2.84

PR:		ports/191592
Submitted by:	Andrew Berg
This commit is contained in:
Chris Rees 2014-07-21 15:02:21 +00:00
parent 2c955f1376
commit 514cf3f193
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362440
8 changed files with 32 additions and 63 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= transmission PORTNAME= transmission
PORTVERSION= 2.82 PORTVERSION= 2.84
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES?= net-p2p CATEGORIES?= net-p2p
#MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ #MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/
@ -36,13 +36,15 @@ GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
# This is master port of transmission-*, so don't override USES definition # This is master port of transmission-*, so don't override USES definition
USES+= gmake pkgconfig iconv USES+= gmake pkgconfig iconv tar:xz
USE_OPENSSL= yes USE_OPENSSL= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
CONFIGURE_ARGS=--with-zlib=/usr \ CONFIGURE_ARGS=--with-zlib=/usr \
${EXTRA_CONF_ARGS} ${EXTRA_CONF_ARGS}
CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LDFLAGS} \
OPENSSL_CFLAGS=${OPENSSL_CFLAGS},-I${OPENSSLINC}
EXTRA_CONF_ARGS?=--enable-cli \ EXTRA_CONF_ARGS?=--enable-cli \
--disable-daemon \ --disable-daemon \
--without-gtk \ --without-gtk \
@ -56,8 +58,6 @@ CONFIGURE_ARGS+=--enable-lightweight
EXTRA_PATCHES= ${PATCHDIR}/disable-web EXTRA_PATCHES= ${PATCHDIR}/disable-web
.endif .endif
USE_XZ= yes
DOCS= AUTHORS NEWS README DOCS= AUTHORS NEWS README
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}

View File

@ -1,2 +1,2 @@
SHA256 (transmission-2.82.tar.xz) = 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA256 (transmission-2.84.tar.xz) = a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb
SIZE (transmission-2.82.tar.xz) = 3172024 SIZE (transmission-2.84.tar.xz) = 3077836

View File

@ -0,0 +1,24 @@
--- qt/mainwin.cc.orig 2014-07-21 14:31:59.381934558 +0100
+++ qt/mainwin.cc 2014-07-21 14:35:42.020934743 +0100
@@ -1165,8 +1165,8 @@
QCheckBox * b = new QCheckBox (tr ("Show &options dialog"));
b->setChecked (myPrefs.getBool (Prefs::OPTIONS_PROMPT));
b->setObjectName (SHOW_OPTIONS_CHECKBOX_NAME);
- auto l = dynamic_cast<QGridLayout*> (d->layout ());
- if (l == nullptr)
+ auto QGridLayout * l = dynamic_cast<QGridLayout*> (d->layout ());
+ if (l == NULL)
{
l = new QGridLayout;
d->setLayout (l);
@@ -1313,8 +1313,8 @@
msgBox.setDefaultButton (QMessageBox::Cancel);
msgBox.setIcon (QMessageBox::Question);
// hack needed to keep the dialog from being too narrow
- auto layout = dynamic_cast<QGridLayout*>(msgBox.layout());
- if (layout == nullptr)
+ auto QGridLayout * layout = dynamic_cast<QGridLayout*>(msgBox.layout());
+ if (layout == NULL)
{
layout = new QGridLayout;
msgBox.setLayout (layout);

View File

@ -1,28 +0,0 @@
$OpenBSD$
--- qt/favicon.cc.orig Fri Aug 9 04:45:47 2013
+++ qt/favicon.cc Thu Aug 22 16:39:50 2013
@@ -14,7 +14,12 @@
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
+
+#if QT_VERSION >= 0x050000
#include <QStandardPaths>
+#else
+#include <QDesktopServices>
+#endif
#include "favicon.h"
@@ -40,7 +45,11 @@ Favicons :: ~Favicons( )
QString
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" );
}

View File

@ -1,15 +0,0 @@
$OpenBSD$
--- qt/file-tree.cc.orig Fri Aug 9 04:45:54 2013
+++ qt/file-tree.cc Thu Aug 22 16:40:53 2013
@@ -885,7 +885,11 @@ FileTreeView :: FileTreeView (QWidget * parent, bool i
for (int i=0; i<NUM_COLUMNS; ++i)
{
setColumnHidden (i, (i<FIRST_VISIBLE_COLUMN) || (LAST_VISIBLE_COLUMN<i));
+#if QT_VERSION >= 0x050000
header()->setSectionResizeMode(i, QHeaderView::Interactive);
+#else
+ header()->setResizeMode(i, QHeaderView::Interactive);
+#endif
}
connect (this, SIGNAL(clicked(const QModelIndex&)),

View File

@ -1,12 +0,0 @@
$OpenBSD$
--- qt/torrent-filter.cc.orig Sat Jul 6 22:21:17 2013
+++ qt/torrent-filter.cc Sat Jul 6 22:29:10 2013
@@ -211,7 +211,7 @@ TorrentFilter :: hiddenRowCount( ) const
void
TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
{
- std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0);
+ std::fill_n (setmeCounts, int(FilterMode::NUM_MODES), 0);
for (int row(0); ; ++row)
{

View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 1 PORTREVISION= 0
PKGNAMESUFFIX= -daemon PKGNAMESUFFIX= -daemon
MAINTAINER= crees@FreeBSD.org MAINTAINER= crees@FreeBSD.org

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= transmission PORTNAME= transmission
PORTVERSION= 2.82 PORTVERSION= 2.84
CATEGORIES= net-p2p CATEGORIES= net-p2p
MASTER_SITES= # empty MASTER_SITES= # empty
DISTFILES= # empty DISTFILES= # empty