Update of net/transmission to 2.83. Some of our old patches can
go away and I decided that removing the many warning options isn't
worth the effort.
Untested. It builds, but I've done zero actual data transfers with it.
Does anybody want to take over maintainership of this port? I rarely
use BitTorrent at all these days, and if I do, I only run the daemon
client.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile 3 Feb 2014 13:30:52 -0000 1.93
+++ Makefile 26 May 2014 19:11:51 -0000
@@ -4,10 +4,7 @@ COMMENT-main= BitTorrent command line an
COMMENT-gtk= BitTorrent client with GTK+ interface
COMMENT-qt= BitTorrent client with Qt interface
-VER= 2.82
-REVISION-main= 1
-REVISION-gtk= 1
-REVISION-qt= 0
+VER= 2.83
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gtk= transmission-gtk-${VER}
@@ -17,7 +14,7 @@ HOMEPAGE= http://www.transmissionbt.com/
MAINTAINER= Christian Weisgerber <[email protected]>
-# GPLv2
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://download.transmissionbt.com/files/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo 22 Aug 2013 17:34:33 -0000 1.47
+++ distinfo 26 May 2014 19:11:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.82.tar.xz) =
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
-SIZE (transmission-2.82.tar.xz) = 3172024
+SHA256 (transmission-2.83.tar.xz) =
sOGwUBZ+f3G2jgGo1VuYSoKP6IDfmr+8YoHLKg19FDM=
+SIZE (transmission-2.83.tar.xz) = 3136752
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 3 Feb 2014 13:30:52 -0000 1.32
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-configure,v 1.32 2014/02/03 13:30:52 dcoppa Exp $
-
-Unbreak with miniupnpc>=1.9
-
---- configure.orig Fri Aug 9 04:49:21 2013
-+++ configure Mon Feb 3 13:05:57 2014
-@@ -11800,8 +11800,8 @@ if test 0 = "0"; then
- else
- supported_build=no
- if test "x$GCC" = "xyes" ; then
-- CFLAGS="$CFLAGS -g -O0"
-- CXXFLAGS="$CXXFLAGS -g -O0"
-+ : CFLAGS="$CFLAGS -g -O0"
-+ : CXXFLAGS="$CXXFLAGS -g -O0"
- fi
- fi
- if test "x$supported_build" = "xno"; then
-@@ -16193,7 +16193,7 @@ esac
-
- if test "x$GCC" = "xyes" ; then
-
-- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls
-Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal"
-+ : CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls
-Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
- $as_echo_n "checking gcc version... " >&6; }
-@@ -16205,10 +16205,10 @@ $as_echo_n "checking gcc version... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_VERSION" >&5
- $as_echo "$GCC_VERSION" >&6; }
- if test $GCC_VERSION_NUM -ge 304; then
-- CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement
-Winit-self"
-+ : CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement
-Winit-self"
- fi
- if test $GCC_VERSION_NUM -ge 403; then
-- CFLAGS="$CFLAGS -Wvariadic-macros"
-+ : CFLAGS="$CFLAGS -Wvariadic-macros"
- fi
- fi
-
-@@ -18223,7 +18223,7 @@ main ()
- upnpDiscover( 2000, NULL, NULL, 0, 0, &errno );
- UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) );
- UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype,
-- portStr, "TCP", intClient, intPort, NULL, NULL, NULL
);
-+ portStr, "TCP", NULL, intClient, intPort, NULL, NULL,
NULL );
-
- ;
- return 0;
Index: patches/patch-gtk_main_c
===================================================================
RCS file: patches/patch-gtk_main_c
diff -N patches/patch-gtk_main_c
--- patches/patch-gtk_main_c 18 Nov 2013 16:51:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-gtk_main_c,v 1.1 2013/11/18 16:51:23 naddy Exp $
-
-Disable help entry in menu while the URL returns 404.
-http://www.transmissionbt.com/help/gtk/2.8x/
-
---- gtk/main.c.orig Fri Aug 9 04:46:06 2013
-+++ gtk/main.c Mon Nov 18 16:12:09 2013
-@@ -268,6 +268,9 @@ refresh_actions (gpointer gdata)
- canUpdate = 0;
- gtk_tree_selection_selected_foreach (data->sel,
count_updatable_foreach, &canUpdate);
- gtr_action_set_sensitive ("torrent-reannounce", canUpdate != 0);
-+
-+ /* XXX broken help URI */
-+ gtr_action_set_sensitive ("help", FALSE);
- }
-
- data->refresh_actions_tag = 0;
Index: patches/patch-libtransmission_peer-mgr_c
===================================================================
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libtransmission_peer-mgr_c 26 May 2014 19:11:51 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+time_t printing.
+
+--- libtransmission/peer-mgr.c.orig Sun May 18 22:52:12 2014
++++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
+@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
+ const double mult = MIN (timeSinceCancel, maxHistory) / (double)
maxHistory;
+ const int inc = maxIncrease * mult;
+ maxPeers = s->maxPeers + inc;
+- tordbg (s, "time since last cancel is %li -- increasing the "
++ tordbg (s, "time since last cancel is %lli -- increasing the "
+ "number of peers we're interested in by %d",
+- timeSinceCancel, inc);
++ (long long)timeSinceCancel, inc);
+ }
+ }
+
Index: patches/patch-libtransmission_upnp_c
===================================================================
RCS file: patches/patch-libtransmission_upnp_c
diff -N patches/patch-libtransmission_upnp_c
--- patches/patch-libtransmission_upnp_c 3 Feb 2014 13:30:52 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-libtransmission_upnp_c,v 1.1 2014/02/03 13:30:52 dcoppa Exp $
-
-Unbreak with miniupnpc>=1.9
-
---- libtransmission/upnp.c.orig Mon Feb 3 13:06:25 2014
-+++ libtransmission/upnp.c Mon Feb 3 13:08:40 2014
-@@ -120,7 +120,7 @@ tr_upnpGetSpecificPortMappingEntry (tr_upnp * handle,
- tr_snprintf (portStr, sizeof (portStr), "%d", (int)handle->port);
-
- #if defined (HAVE_MINIUPNP_16)
-- err = UPNP_GetSpecificPortMappingEntry (handle->urls.controlURL,
handle->data.first.servicetype, portStr, proto, intClient, intPort, NULL, NULL,
NULL);
-+ err = UPNP_GetSpecificPortMappingEntry (handle->urls.controlURL,
handle->data.first.servicetype, portStr, proto, NULL, intClient, intPort, NULL,
NULL, NULL);
- #elif defined (HAVE_MINIUPNP_15)
- err = UPNP_GetSpecificPortMappingEntry (handle->urls.controlURL,
handle->data.first.servicetype, portStr, proto, intClient, intPort);
- #else
Index: patches/patch-qt_favicon_cc
===================================================================
RCS file: patches/patch-qt_favicon_cc
diff -N patches/patch-qt_favicon_cc
--- patches/patch-qt_favicon_cc 22 Aug 2013 17:34:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-qt_favicon_cc,v 1.1 2013/08/22 17:34:33 naddy Exp $
---- 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" );
- }
-
Index: patches/patch-qt_file-tree_cc
===================================================================
RCS file: patches/patch-qt_file-tree_cc
diff -N patches/patch-qt_file-tree_cc
--- patches/patch-qt_file-tree_cc 22 Aug 2013 17:34:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-qt_file-tree_cc,v 1.1 2013/08/22 17:34:33 naddy Exp $
---- 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&)),
Index: patches/patch-qt_mainwin_cc
===================================================================
RCS file: patches/patch-qt_mainwin_cc
diff -N patches/patch-qt_mainwin_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-qt_mainwin_cc 26 May 2014 19:11:51 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+We do not support C++11 yet.
+
+--- qt/mainwin.cc.orig Sun May 18 22:52:27 2014
++++ qt/mainwin.cc Sun May 25 00:04:18 2014
+@@ -1165,8 +1165,8 @@ TrMainWindow :: openTorrent ()
+ 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)
++ QGridLayout* l = dynamic_cast<QGridLayout*> (d->layout ());
++ if (l == NULL)
+ {
+ l = new QGridLayout;
+ d->setLayout (l);
+@@ -1313,8 +1313,8 @@ TrMainWindow :: removeTorrents (const bool deleteFiles
+ 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)
++ QGridLayout* layout = dynamic_cast<QGridLayout*>(msgBox.layout());
++ if (layout == NULL)
+ {
+ layout = new QGridLayout;
+ msgBox.setLayout (layout);
Index: patches/patch-qt_qtr_pro
===================================================================
RCS file: /cvs/ports/net/transmission/patches/patch-qt_qtr_pro,v
retrieving revision 1.5
diff -u -p -r1.5 patch-qt_qtr_pro
--- patches/patch-qt_qtr_pro 22 Aug 2013 17:34:33 -0000 1.5
+++ patches/patch-qt_qtr_pro 26 May 2014 19:11:51 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-qt_qtr_pro,v 1.5 2013/08/22 17:34:33 naddy Exp $
---- qt/qtr.pro.orig Fri Aug 9 04:45:47 2013
-+++ qt/qtr.pro Thu Aug 22 16:37:03 2013
+--- qt/qtr.pro.orig Sun May 18 22:52:17 2014
++++ qt/qtr.pro Sat May 24 23:55:23 2014
@@ -8,7 +8,7 @@ target.path = /bin
INSTALLS += target
@@ -9,8 +9,8 @@ $OpenBSD: patch-qt_qtr_pro,v 1.5 2013/08
+man.path = /man/man1/
man.files = transmission-qt.1
- CONFIG += qt thread debug link_pkgconfig
-@@ -26,7 +26,7 @@ LIBS += $${LIBUTP_LIBS}
+ CONFIG += qt thread debug link_pkgconfig c++11 warn_on
+@@ -30,7 +30,7 @@ LIBS += $${LIBUTP_LIBS}
LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
LIBS += $${LIBUPNP_LIBS}
LIBS += $${LIBNATPMP_LIBS}
Index: patches/patch-qt_torrent-filter_cc
===================================================================
RCS file: patches/patch-qt_torrent-filter_cc
diff -N patches/patch-qt_torrent-filter_cc
--- patches/patch-qt_torrent-filter_cc 12 Jul 2013 17:03:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-qt_torrent-filter_cc,v 1.1 2013/07/12 17:03:59 naddy Exp $
---- 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)
- {
--
Christian "naddy" Weisgerber [email protected]
