svn commit: r490800 - in head/net-p2p: transmission-cli transmission-cli/files transmission-daemon transmission-gtk transmission-qt
Tijl Coosemans
tijl at FreeBSD.org
Mon Jan 21 10:42:03 UTC 2019
On Sun, 20 Jan 2019 17:02:27 +0000 (UTC) Alexandre C. Guimarães <rigoletto at FreeBSD.org> wrote:
> Author: rigoletto
> Date: Sun Jan 20 17:02:27 2019
> New Revision: 490800
> URL: https://svnweb.freebsd.org/changeset/ports/490800
>
> Log:
> net-p2p/transmission-cli: change transmission's data size unit
> conversion factors from 1000 to 1024, to match FreeBSD's blocksize.
What blocksize? The disk block sizes are determined by the hardware so
FreeBSD isn't any different from Linux. Why should the application
behave differently on FreeBSD than it does on Linux?
> Added: head/net-p2p/transmission-cli/files/patch-Units
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/net-p2p/transmission-cli/files/patch-Units Sun Jan 20 17:02:27 2019 (r490800)
> @@ -0,0 +1,152 @@
> +--- cli/cli.c.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ cli/cli.c 2019-01-18 17:21:27.893302000 -0800
> +@@ -46,14 +46,14 @@
> + #define MEM_G_STR "GiB"
> + #define MEM_T_STR "TiB"
Since they use GiB and TiB here...
> +-#define DISK_K 1000
> ++#define DISK_K 1024
> + #define DISK_B_STR "B"
> + #define DISK_K_STR "kB"
> + #define DISK_M_STR "MB"
> + #define DISK_G_STR "GB"
> + #define DISK_T_STR "TB"
...you should use KiB, MiB, GiB and TiB here...
> +-#define SPEED_K 1000
> ++#define SPEED_K 1024
> + #define SPEED_B_STR "B/s"
> + #define SPEED_K_STR "kB/s"
> + #define SPEED_M_STR "MB/s"
...and here as well (although using 1024 for bandwidth is weird).
Similar for all cases below.
But really I think you should revert this change. If the submitter wants
this he can discuss that with the transmission developers.
> +--- daemon/daemon.c.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ daemon/daemon.c 2019-01-18 17:21:55.699919000 -0800
> +@@ -50,14 +50,14 @@
> + #define MEM_G_STR "GiB"
> + #define MEM_T_STR "TiB"
> +
> +-#define DISK_K 1000
> ++#define DISK_K 1024
> + #define DISK_B_STR "B"
> + #define DISK_K_STR "kB"
> + #define DISK_M_STR "MB"
> + #define DISK_G_STR "GB"
> + #define DISK_T_STR "TB"
> +
> +-#define SPEED_K 1000
> ++#define SPEED_K 1024
> + #define SPEED_B_STR "B/s"
> + #define SPEED_K_STR "kB/s"
> + #define SPEED_M_STR "MB/s"
> +--- daemon/remote.c.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ daemon/remote.c 2019-01-18 18:03:10.333078000 -0800
> +@@ -44,14 +44,14 @@
> + #define MEM_G_STR "GiB"
> + #define MEM_T_STR "TiB"
> +
> +-#define DISK_K 1000
> ++#define DISK_K 1024
> + #define DISK_B_STR "B"
> + #define DISK_K_STR "kB"
> + #define DISK_M_STR "MB"
> + #define DISK_G_STR "GB"
> + #define DISK_T_STR "TB"
> +
> +-#define SPEED_K 1000
> ++#define SPEED_K 1024
> + #define SPEED_B_STR "B/s"
> + #define SPEED_K_STR "kB/s"
> + #define SPEED_M_STR "MB/s"
> +--- gtk/util.c.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ gtk/util.c 2019-01-18 17:23:10.918334000 -0800
> +@@ -39,13 +39,13 @@
> + const char * mem_G_str = N_("GiB");
> + const char * mem_T_str = N_("TiB");
> +
> +-const int disk_K = 1000;
> ++const int disk_K = 1024;
> + const char * disk_K_str = N_("kB");
> + const char * disk_M_str = N_("MB");
> + const char * disk_G_str = N_("GB");
> + const char * disk_T_str = N_("TB");
> +
> +-const int speed_K = 1000;
> ++const int speed_K = 1024;
> + const char * speed_K_str = N_("kB/s");
> + const char * speed_M_str = N_("MB/s");
> + const char * speed_G_str = N_("GB/s");
> +--- libtransmission/libtransmission-test.c.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ libtransmission/libtransmission-test.c 2019-01-18 17:23:43.535466000 -0800
> +@@ -200,14 +200,14 @@
> + #define MEM_G_STR "GiB"
> + #define MEM_T_STR "TiB"
> +
> +-#define DISK_K 1000
> ++#define DISK_K 1024
> + #define DISK_B_STR "B"
> + #define DISK_K_STR "kB"
> + #define DISK_M_STR "MB"
> + #define DISK_G_STR "GB"
> + #define DISK_T_STR "TB"
> +
> +-#define SPEED_K 1000
> ++#define SPEED_K 1024
> + #define SPEED_B_STR "B/s"
> + #define SPEED_K_STR "kB/s"
> + #define SPEED_M_STR "MB/s"
> +--- qt/Formatter.cc.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ qt/Formatter.cc 2019-01-18 17:25:58.166361000 -0800
> +@@ -29,7 +29,7 @@
> + void
> + Formatter::initUnits ()
> + {
> +- speed_K = 1000;
> ++ speed_K = 1024;
> + unitStrings[SPEED][B] = tr ( "B/s");
> + unitStrings[SPEED][KB] = tr ("kB/s");
> + unitStrings[SPEED][MB] = tr ("MB/s");
> +@@ -41,7 +41,7 @@
> + unitStrings[SPEED][GB].toUtf8().constData(),
> + unitStrings[SPEED][TB].toUtf8().constData());
> +
> +- size_K = 1000;
> ++ size_K = 1024;
> + unitStrings[SIZE][B] = tr ( "B");
> + unitStrings[SIZE][KB] = tr ("kB");
> + unitStrings[SIZE][MB] = tr ("MB");
> +--- utils/units.h.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ utils/units.h 2019-01-18 17:26:23.460607000 -0800
> +@@ -16,14 +16,14 @@
> + #define MEM_G_STR "GiB"
> + #define MEM_T_STR "TiB"
> +
> +-#define DISK_K 1000
> ++#define DISK_K 1024
> + #define DISK_B_STR "B"
> + #define DISK_K_STR "kB"
> + #define DISK_M_STR "MB"
> + #define DISK_G_STR "GB"
> + #define DISK_T_STR "TB"
> +
> +-#define SPEED_K 1000
> ++#define SPEED_K 1024
> + #define SPEED_B_STR "B/s"
> + #define SPEED_K_STR "kB/s"
> + #define SPEED_M_STR "MB/s"
> +--- web/javascript/formatter.js.orig 2018-05-01 10:18:29.000000000 -0700
> ++++ web/javascript/formatter.js 2019-01-18 17:26:43.307090000 -0800
> +@@ -7,14 +7,14 @@
> +
> + Transmission.fmt = (function()
> + {
> +- var speed_K = 1000;
> ++ var speed_K = 1024;
> + var speed_B_str = 'B/s';
> + var speed_K_str = 'kB/s';
> + var speed_M_str = 'MB/s';
> + var speed_G_str = 'GB/s';
> + var speed_T_str = 'TB/s';
> +
> +- var size_K = 1000;
> ++ var size_K = 1024;
> + var size_B_str = 'B';
> + var size_K_str = 'kB';
> + var size_M_str = 'MB';
>
> Modified: head/net-p2p/transmission-daemon/Makefile
> ==============================================================================
> --- head/net-p2p/transmission-daemon/Makefile Sun Jan 20 14:56:18 2019 (r490799)
> +++ head/net-p2p/transmission-daemon/Makefile Sun Jan 20 17:02:27 2019 (r490800)
> @@ -1,6 +1,6 @@
> # $FreeBSD$
>
> -PORTREVISION= 1
> +PORTREVISION= 2
> PKGNAMESUFFIX= -daemon
>
> USES= ssl
>
> Modified: head/net-p2p/transmission-gtk/Makefile
> ==============================================================================
> --- head/net-p2p/transmission-gtk/Makefile Sun Jan 20 14:56:18 2019 (r490799)
> +++ head/net-p2p/transmission-gtk/Makefile Sun Jan 20 17:02:27 2019 (r490800)
> @@ -1,7 +1,6 @@
> # $FreeBSD$
>
> -PORTREVISION= 2
> -
> +PORTREVISION= 3
> PKGNAMESUFFIX= -gtk
>
> LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
>
> Modified: head/net-p2p/transmission-qt/Makefile
> ==============================================================================
> --- head/net-p2p/transmission-qt/Makefile Sun Jan 20 14:56:18 2019 (r490799)
> +++ head/net-p2p/transmission-qt/Makefile Sun Jan 20 17:02:27 2019 (r490800)
> @@ -1,6 +1,6 @@
> # $FreeBSD$
>
> -PORTREVISION= 5
> +PORTREVISION= 6
> PKGNAMESUFFIX= -${FLAVOR}
>
> LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
>
More information about the svn-ports-all
mailing list