diff --git a/net/transmission/Makefile b/net/transmission/Makefile index cbd9956e70e..1b5785a74d0 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.44 2009/10/28 19:38:11 naddy Exp $ +# $OpenBSD: Makefile,v 1.45 2009/10/30 18:08:47 naddy Exp $ COMMENT-main= lightweight BitTorrent command line and daemon client COMMENT-gui= lightweight BitTorrent client with graphical interface VER= 1.76 DISTNAME= transmission-${VER} -PKGNAME-main= transmission-${VER} -PKGNAME-gui= transmission-gui-${VER} +PKGNAME-main= transmission-${VER}p0 +PKGNAME-gui= transmission-gui-${VER}p0 CATEGORIES= net HOMEPAGE= http://www.transmissionbt.com/ @@ -64,8 +64,4 @@ RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main \ USE_X11= Yes .endif -# Remove the \' printf flag from the translations, too. -post-patch: - @cd ${WRKSRC}/po; perl -pi.bak -e "s/%'/%/g; s/%(.*?)'d/%\1d/g" *.po - .include diff --git a/net/transmission/patches/patch-daemon_remote_c b/net/transmission/patches/patch-daemon_remote_c deleted file mode 100644 index e0e7b2fa96f..00000000000 --- a/net/transmission/patches/patch-daemon_remote_c +++ /dev/null @@ -1,47 +0,0 @@ -$OpenBSD: patch-daemon_remote_c,v 1.8 2009/09/06 15:03:18 naddy Exp $ ---- daemon/remote.c.orig Tue Aug 25 01:43:02 2009 -+++ daemon/remote.c Thu Sep 3 23:13:47 2009 -@@ -826,10 +826,10 @@ tr_strltime( char * buf, int seconds, size_t buflen ) - minutes = ( seconds % 3600 ) / 60; - seconds = ( seconds % 3600 ) % 60; - -- tr_snprintf( d, sizeof( d ), "%'d day%s", days, days==1?"":"s" ); -- tr_snprintf( h, sizeof( h ), "%'d hour%s", hours, hours==1?"":"s" ); -- tr_snprintf( m, sizeof( m ), "%'d minute%s", minutes, minutes==1?"":"s" ); -- tr_snprintf( s, sizeof( s ), "%'d second%s", seconds, seconds==1?"":"s" ); -+ tr_snprintf( d, sizeof( d ), "%d day%s", days, days==1?"":"s" ); -+ tr_snprintf( h, sizeof( h ), "%d hour%s", hours, hours==1?"":"s" ); -+ tr_snprintf( m, sizeof( m ), "%d minute%s", minutes, minutes==1?"":"s" ); -+ tr_snprintf( s, sizeof( s ), "%d second%s", seconds, seconds==1?"":"s" ); - - if( days ) - { -@@ -891,24 +891,24 @@ strlsize( char * buf, int64_t size, size_t buflen ) - if( !size ) - tr_strlcpy( buf, "None", buflen ); - else if( size < (int64_t)KILOBYTE_FACTOR ) -- tr_snprintf( buf, buflen, "%'" PRId64 " bytes", (int64_t)size ); -+ tr_snprintf( buf, buflen, "%" PRId64 " bytes", (int64_t)size ); - else - { - double displayed_size; - if( size < (int64_t)MEGABYTE_FACTOR ) - { - displayed_size = (double) size / KILOBYTE_FACTOR; -- tr_snprintf( buf, buflen, "%'.1f KB", displayed_size ); -+ tr_snprintf( buf, buflen, "%.1f KB", displayed_size ); - } - else if( size < (int64_t)GIGABYTE_FACTOR ) - { - displayed_size = (double) size / MEGABYTE_FACTOR; -- tr_snprintf( buf, buflen, "%'.1f MB", displayed_size ); -+ tr_snprintf( buf, buflen, "%.1f MB", displayed_size ); - } - else - { - displayed_size = (double) size / GIGABYTE_FACTOR; -- tr_snprintf( buf, buflen, "%'.1f GB", displayed_size ); -+ tr_snprintf( buf, buflen, "%.1f GB", displayed_size ); - } - } - return buf; diff --git a/net/transmission/patches/patch-gtk_details_c b/net/transmission/patches/patch-gtk_details_c deleted file mode 100644 index 595241dd514..00000000000 --- a/net/transmission/patches/patch-gtk_details_c +++ /dev/null @@ -1,46 +0,0 @@ -$OpenBSD: patch-gtk_details_c,v 1.13 2009/10/28 19:38:11 naddy Exp $ ---- gtk/details.c.orig Sun Oct 25 02:47:33 2009 -+++ gtk/details.c Tue Oct 27 23:32:44 2009 -@@ -758,14 +758,14 @@ refreshInfo( struct DetailsImpl * di, tr_torrent ** to - char piecebuf[128]; - tr_strlsize( piecebuf, (uint64_t)pieceSize, sizeof( piecebuf ) ); - g_snprintf( buf, sizeof( buf ), -- ngettext( "%1$s (%2$'d piece @ %3$s)", -- "%1$s (%2$'d pieces @ %3$s)", pieces ), -+ ngettext( "%1$s (%2$d piece @ %3$s)", -+ "%1$s (%2$d pieces @ %3$s)", pieces ), - sizebuf, pieces, piecebuf ); - str = buf; - } else { - g_snprintf( buf, sizeof( buf ), -- ngettext( "%1$s (%2$'d piece)", -- "%1$s (%2$'d pieces)", pieces ), -+ ngettext( "%1$s (%2$d piece)", -+ "%1$s (%2$d pieces)", pieces ), - sizebuf, pieces ); - str = buf; - } -@@ -1365,11 +1365,11 @@ refreshPeers( struct DetailsImpl * di, tr_torrent ** t - leechers = s->leechers; - completed += s->timesCompleted; - } -- g_snprintf( buf, sizeof( buf ), "%'d", seeders ); -+ g_snprintf( buf, sizeof( buf ), "%d", seeders ); - gtk_label_set_text( GTK_LABEL( di->seeders_lb ), buf ); -- g_snprintf( buf, sizeof( buf ), "%'d", leechers ); -+ g_snprintf( buf, sizeof( buf ), "%d", leechers ); - gtk_label_set_text( GTK_LABEL( di->leechers_lb ), buf ); -- g_snprintf( buf, sizeof( buf ), "%'d", completed ); -+ g_snprintf( buf, sizeof( buf ), "%d", completed ); - gtk_label_set_text( GTK_LABEL( di->completed_lb ), buf ); - } - -@@ -1989,7 +1989,7 @@ torrent_inspector_set_torrents( GtkWidget * w, GSList - { - file_list_clear( di->file_list ); - tracker_list_clear( di->tracker_list ); -- g_snprintf( title, sizeof( title ), _( "%'d Torrent Properties" ), len ); -+ g_snprintf( title, sizeof( title ), _( "%d Torrent Properties" ), len ); - } - - gtk_window_set_title( GTK_WINDOW( w ), title ); diff --git a/net/transmission/patches/patch-gtk_makemeta-ui_c b/net/transmission/patches/patch-gtk_makemeta-ui_c deleted file mode 100644 index 61c1852078e..00000000000 --- a/net/transmission/patches/patch-gtk_makemeta-ui_c +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-gtk_makemeta-ui_c,v 1.4 2009/07/22 15:52:07 naddy Exp $ ---- gtk/makemeta-ui.c.orig Sat Jul 18 03:20:55 2009 -+++ gtk/makemeta-ui.c Sun Jul 19 13:59:33 2009 -@@ -266,9 +266,9 @@ refreshFromBuilder( MakeMetaUI * ui ) - else { - tr_strlsize( sizeStr, builder->totalSize, sizeof( sizeStr ) ); - buf = g_strdup_printf( /* %1$s is the torrent size -- %2$'d is its number of files */ -- ngettext( "%1$s; %2$'d File", -- "%1$s; %2$'d Files", -+ %2$d is its number of files */ -+ ngettext( "%1$s; %2$d File", -+ "%1$s; %2$d Files", - builder->fileCount ), - sizeStr, builder->fileCount ); - } -@@ -279,7 +279,7 @@ refreshFromBuilder( MakeMetaUI * ui ) - if( !filename ) - buf = g_strdup( "" ); - else { -- char * countStr = g_strdup_printf( ngettext( "%'d Piece", "%'d Pieces", -+ char * countStr = g_strdup_printf( ngettext( "%d Piece", "%d Pieces", - builder->pieceCount ), - builder->pieceCount ); - tr_strlsize( sizeStr, builder->pieceSize, sizeof( sizeStr ) ); diff --git a/net/transmission/patches/patch-gtk_stats_c b/net/transmission/patches/patch-gtk_stats_c deleted file mode 100644 index 39ce70651e0..00000000000 --- a/net/transmission/patches/patch-gtk_stats_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-gtk_stats_c,v 1.3 2008/12/02 15:29:07 naddy Exp $ ---- gtk/stats.c.orig Mon Nov 10 16:52:26 2008 -+++ gtk/stats.c Thu Nov 27 22:33:20 2008 -@@ -72,7 +72,7 @@ updateStats( gpointer gdata ) - tr_strltime( buf, one.secondsActive, sizeof( buf ) ) ); - setLabelFromRatio( ui->one_ratio_lb, one.ratio ); - -- fmt = ngettext( "Started %'d time", "Started %'d times", -+ fmt = ngettext( "Started %d time", "Started %d times", - (int)all.sessionCount ); - g_snprintf( buf, sizeof( buf ), fmt, (int)all.sessionCount ); - setLabel( ui->all_sessions_lb, buf ); -@@ -153,7 +153,7 @@ stats_dialog_create( GtkWindow * parent, - hig_workarea_add_row( t, &row, _( "Duration:" ), l, NULL ); - hig_workarea_add_section_divider( t, &row ); - hig_workarea_add_section_title( t, &row, _( "Total" ) ); -- l = ui->all_sessions_lb = gtk_label_new( _( "Started %'d time" ) ); -+ l = ui->all_sessions_lb = gtk_label_new( _( "Started %d time" ) ); - hig_workarea_add_label_w( t, row++, l ); - l = ui->all_up_lb = gtk_label_new( NULL ); - hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL ); diff --git a/net/transmission/patches/patch-gtk_torrent-cell-renderer_c b/net/transmission/patches/patch-gtk_torrent-cell-renderer_c deleted file mode 100644 index 3c294d26ccf..00000000000 --- a/net/transmission/patches/patch-gtk_torrent-cell-renderer_c +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.5 2009/09/06 15:03:18 naddy Exp $ ---- gtk/torrent-cell-renderer.c.orig Wed Aug 19 03:02:44 2009 -+++ gtk/torrent-cell-renderer.c Thu Aug 20 19:50:21 2009 -@@ -240,8 +240,8 @@ getStatusString( const tr_stat * torStat, - - case TR_STATUS_DOWNLOAD: - g_string_append_printf( gstr, -- ngettext( "Downloading from %1$'d of %2$'d connected peer", -- "Downloading from %1$'d of %2$'d connected peers", -+ ngettext( "Downloading from %1$d of %2$d connected peer", -+ "Downloading from %1$d of %2$d connected peers", - torStat->peersConnected ), - torStat->peersSendingToUs + - torStat->webseedsSendingToUs, -@@ -251,8 +251,8 @@ getStatusString( const tr_stat * torStat, - - case TR_STATUS_SEED: - g_string_append_printf( gstr, -- ngettext( "Seeding to %1$'d of %2$'d connected peer", -- "Seeding to %1$'d of %2$'d connected peers", -+ ngettext( "Seeding to %1$d of %2$d connected peer", -+ "Seeding to %1$d of %2$d connected peers", - torStat->peersConnected ), - torStat->peersGettingFromUs, - torStat->peersConnected ); diff --git a/net/transmission/patches/patch-gtk_tr-prefs_c b/net/transmission/patches/patch-gtk_tr-prefs_c deleted file mode 100644 index f76b151ba51..00000000000 --- a/net/transmission/patches/patch-gtk_tr-prefs_c +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-gtk_tr-prefs_c,v 1.6 2009/05/10 19:31:44 naddy Exp $ ---- gtk/tr-prefs.c.orig Tue May 5 02:40:11 2009 -+++ gtk/tr-prefs.c Thu May 7 19:40:40 2009 -@@ -369,8 +369,8 @@ updateBlocklistText( GtkWidget * w, TrCore * core ) - const int n = tr_blocklistGetRuleCount( tr_core_session( core ) ); - char buf[512]; - g_snprintf( buf, sizeof( buf ), -- ngettext( "Enable _blocklist (contains %'d rule)", -- "Enable _blocklist (contains %'d rules)", n ), n ); -+ ngettext( "Enable _blocklist (contains %d rule)", -+ "Enable _blocklist (contains %d rules)", n ), n ); - gtk_button_set_label( GTK_BUTTON( w ), buf ); - } - -@@ -399,7 +399,7 @@ onBlocklistUpdateResponse( GtkDialog * dialog, gint re - static void - onBlocklistUpdated( TrCore * core, int n, gpointer gdata ) - { -- const char * s = ngettext( "Blocklist now has %'d rule.", "Blocklist now has %'d rules.", n ); -+ const char * s = ngettext( "Blocklist now has %d rule.", "Blocklist now has %d rules.", n ); - struct blocklist_data * data = gdata; - GtkMessageDialog * d = GTK_MESSAGE_DIALOG( data->updateBlocklistDialog ); - gtk_widget_set_sensitive( data->updateBlocklistButton, TRUE ); diff --git a/net/transmission/patches/patch-gtk_tr-torrent_c b/net/transmission/patches/patch-gtk_tr-torrent_c deleted file mode 100644 index f0d8d1c31c1..00000000000 --- a/net/transmission/patches/patch-gtk_tr-torrent_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-gtk_tr-torrent_c,v 1.5 2009/07/22 15:52:07 naddy Exp $ ---- gtk/tr-torrent.c.orig Sat Jul 18 03:20:55 2009 -+++ gtk/tr-torrent.c Sun Jul 19 13:59:33 2009 -@@ -255,8 +255,8 @@ tr_torrent_status_str( TrTorrent * gtor ) - - case TR_STATUS_SEED: - top = g_strdup_printf( -- ngettext( "Seeding to %1$'d of %2$'d connected peer", -- "Seeding to %1$'d of %2$'d connected peers", -+ ngettext( "Seeding to %1$d of %2$d connected peer", -+ "Seeding to %1$d of %2$d connected peers", - tpeers ), - upeers, tpeers ); - break; diff --git a/net/transmission/patches/patch-gtk_tr-window_c b/net/transmission/patches/patch-gtk_tr-window_c deleted file mode 100644 index ff8629372b2..00000000000 --- a/net/transmission/patches/patch-gtk_tr-window_c +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-gtk_tr-window_c,v 1.11 2009/09/16 19:36:33 naddy Exp $ ---- gtk/tr-window.c.orig Mon Sep 7 08:00:27 2009 -+++ gtk/tr-window.c Wed Sep 9 02:38:05 2009 -@@ -1090,13 +1090,13 @@ updateTorrentCount( PrivateData * p ) - *buf = '\0'; - else if( torrentCount != visibleCount ) - g_snprintf( buf, sizeof( buf ), -- ngettext( "%1$'d of %2$'d Torrent", -- "%1$'d of %2$'d Torrents", -+ ngettext( "%1$d of %2$d Torrent", -+ "%1$d of %2$d Torrents", - torrentCount ), - visibleCount, torrentCount ); - else - g_snprintf( buf, sizeof( buf ), -- ngettext( "%'d Torrent", "%'d Torrents", torrentCount ), -+ ngettext( "%d Torrent", "%d Torrents", torrentCount ), - torrentCount ); - gtk_label_set_text( GTK_LABEL( p->gutter_lb ), buf ); - } diff --git a/net/transmission/patches/patch-gtk_util_c b/net/transmission/patches/patch-gtk_util_c deleted file mode 100644 index 289e64b9e0e..00000000000 --- a/net/transmission/patches/patch-gtk_util_c +++ /dev/null @@ -1,70 +0,0 @@ -$OpenBSD: patch-gtk_util_c,v 1.7 2009/09/06 15:03:18 naddy Exp $ ---- gtk/util.c.orig Wed Aug 19 03:02:44 2009 -+++ gtk/util.c Thu Aug 20 19:50:22 2009 -@@ -117,7 +117,7 @@ tr_strlsize( char * buf, - #else - else if( size < (guint64)KILOBYTE_FACTOR ) - g_snprintf( buf, buflen, -- ngettext( "%'u byte", "%'u bytes", -+ ngettext( "%u byte", "%u bytes", - (guint)size ), (guint)size ); - else - { -@@ -125,17 +125,17 @@ tr_strlsize( char * buf, - if( size < (guint64)MEGABYTE_FACTOR ) - { - displayed_size = (gdouble) size / KILOBYTE_FACTOR; -- g_snprintf( buf, buflen, _( "%'.1f KB" ), displayed_size ); -+ g_snprintf( buf, buflen, _( "%.1f KB" ), displayed_size ); - } - else if( size < (guint64)GIGABYTE_FACTOR ) - { - displayed_size = (gdouble) size / MEGABYTE_FACTOR; -- g_snprintf( buf, buflen, _( "%'.1f MB" ), displayed_size ); -+ g_snprintf( buf, buflen, _( "%.1f MB" ), displayed_size ); - } - else - { - displayed_size = (gdouble) size / GIGABYTE_FACTOR; -- g_snprintf( buf, buflen, _( "%'.1f GB" ), displayed_size ); -+ g_snprintf( buf, buflen, _( "%.1f GB" ), displayed_size ); - } - } - #endif -@@ -150,13 +150,13 @@ tr_strlspeed( char * buf, - const double speed = kb_sec; - - if( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */ -- g_snprintf( buf, buflen, _( "%'.1f KB/s" ), speed ); -+ g_snprintf( buf, buflen, _( "%.1f KB/s" ), speed ); - else if( speed < 102400.0 ) /* 0.98 MB to 99.99 MB */ -- g_snprintf( buf, buflen, _( "%'.2f MB/s" ), ( speed / KILOBYTE_FACTOR ) ); -+ g_snprintf( buf, buflen, _( "%.2f MB/s" ), ( speed / KILOBYTE_FACTOR ) ); - else if( speed < 1024000.0 ) /* 100.0 MB to 999.9 MB */ -- g_snprintf( buf, buflen, _( "%'.1f MB/s" ), ( speed / MEGABYTE_FACTOR ) ); -+ g_snprintf( buf, buflen, _( "%.1f MB/s" ), ( speed / MEGABYTE_FACTOR ) ); - else /* insane speeds */ -- g_snprintf( buf, buflen, _( "%'.2f GB/s" ), ( speed / GIGABYTE_FACTOR ) ); -+ g_snprintf( buf, buflen, _( "%.2f GB/s" ), ( speed / GIGABYTE_FACTOR ) ); - - return buf; - } -@@ -177,14 +177,14 @@ tr_strltime( char * buf, - minutes = ( seconds % 3600 ) / 60; - seconds = ( seconds % 3600 ) % 60; - -- g_snprintf( d, sizeof( d ), ngettext( "%'d day", "%'d days", -+ g_snprintf( d, sizeof( d ), ngettext( "%d day", "%d days", - days ), days ); -- g_snprintf( h, sizeof( h ), ngettext( "%'d hour", "%'d hours", -+ g_snprintf( h, sizeof( h ), ngettext( "%d hour", "%d hours", - hours ), hours ); - g_snprintf( m, sizeof( m ), -- ngettext( "%'d minute", "%'d minutes", minutes ), minutes ); -+ ngettext( "%d minute", "%d minutes", minutes ), minutes ); - g_snprintf( s, sizeof( s ), -- ngettext( "%'d second", "%'d seconds", seconds ), seconds ); -+ ngettext( "%d second", "%d seconds", seconds ), seconds ); - - if( days ) - { diff --git a/net/transmission/patches/patch-libtransmission_blocklist_c b/net/transmission/patches/patch-libtransmission_blocklist_c deleted file mode 100644 index 6d7050f5f5d..00000000000 --- a/net/transmission/patches/patch-libtransmission_blocklist_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-libtransmission_blocklist_c,v 1.3 2009/02/15 18:09:29 naddy Exp $ ---- libtransmission/blocklist.c.orig Sat Jan 17 16:25:46 2009 -+++ libtransmission/blocklist.c Tue Jan 20 20:59:57 2009 -@@ -107,7 +107,7 @@ blocklistLoad( tr_blocklist * b ) - - { - char * base = tr_basename( b->filename ); -- tr_inf( _( "Blocklist \"%s\" contains %'zu entries" ), base, b->ruleCount ); -+ tr_inf( _( "Blocklist \"%s\" contains %zu entries" ), base, b->ruleCount ); - tr_free( base ); - } - } -@@ -300,7 +300,7 @@ _tr_blocklistSetContent( tr_blocklist * b, - - { - char * base = tr_basename( b->filename ); -- tr_inf( _( "Blocklist \"%1$s\" updated with %2$'d entries" ), base, lineCount ); -+ tr_inf( _( "Blocklist \"%1$s\" updated with %2$d entries" ), base, lineCount ); - tr_free( base ); - } - diff --git a/net/transmission/patches/patch-libtransmission_utils_c b/net/transmission/patches/patch-libtransmission_utils_c deleted file mode 100644 index 120bea3ec09..00000000000 --- a/net/transmission/patches/patch-libtransmission_utils_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libtransmission_utils_c,v 1.8 2009/10/28 19:38:11 naddy Exp $ ---- libtransmission/utils.c.orig Sun Oct 25 02:47:21 2009 -+++ libtransmission/utils.c Tue Oct 27 23:32:44 2009 -@@ -1346,7 +1346,7 @@ tr_strratio( char * buf, size_t buflen, double ratio, - else if( ratio < 100.0 ) - tr_snprintf( buf, buflen, "%.1f", tr_truncd( ratio, 1 ) ); - else -- tr_snprintf( buf, buflen, "%'.0f", ratio ); -+ tr_snprintf( buf, buflen, "%.0f", ratio ); - return buf; - } -