cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.60; prodded by Brad

Browse Source
This commit is contained in:
naddy 2009-05-10 19:31:44 +00:00
parent 5fd4c6e743
commit dd6fe9527c
13 changed files with 130 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/transmission/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2009/04/14 14:06:26 naddy Exp $ # $OpenBSD: Makefile,v 1.34 2009/05/10 19:31:44 naddy Exp $
COMMENT-main= lightweight BitTorrent command line and daemon client COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gui= lightweight BitTorrent client with graphical interface COMMENT-gui= lightweight BitTorrent client with graphical interface
VER= 1.52 VER= 1.60
DISTNAME= transmission-${VER} DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER} PKGNAME-main= transmission-${VER}
PKGNAME-gui= transmission-gui-${VER} PKGNAME-gui= transmission-gui-${VER}

10
net/transmission/distinfo
View File

@ -1,5 +1,5 @@
MD5 (transmission-1.52.tar.bz2) = KhpijCqIcpNFdctDUbyikQ== MD5 (transmission-1.60.tar.bz2) = izDPGJJA8MUMzRHGGKaQag==
RMD160 (transmission-1.52.tar.bz2) = QnX14XLac0vpOrheomzD/jygRJU= RMD160 (transmission-1.60.tar.bz2) = VSGqgLlTlqi5cCFDu1jZDr+cNXo=
SHA1 (transmission-1.52.tar.bz2) = w99h41BlmWCliGpHXCNPU7f97SY= SHA1 (transmission-1.60.tar.bz2) = yek2QLYLrzOdnhSn89ReeNP9984=
SHA256 (transmission-1.52.tar.bz2) = MOADWYSQHyNI1cGGPoEE31c5sYrN9SIWtJNeHq7iIfo= SHA256 (transmission-1.60.tar.bz2) = ofHa1kAi/TxfggzGF14mMjoetw2MbXm83oL5VmZkifI=
SIZE (transmission-1.52.tar.bz2) = 4641665 SIZE (transmission-1.60.tar.bz2) = 4772222

27
net/transmission/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.12 2009/03/04 20:59:52 naddy Exp $ $OpenBSD: patch-configure,v 1.13 2009/05/10 19:31:44 naddy Exp $
--- configure.orig Sun Mar 1 17:08:56 2009 --- configure.orig Tue May 5 02:41:18 2009
+++ configure Sun Mar 1 17:09:48 2009 +++ configure Thu May 7 19:40:39 2009
@@ -20148,8 +20148,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -20129,8 +20129,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
if test 0 = "0"; then if test 0 = "0"; then
supported_build=yes supported_build=yes
if test "x$GCC" = "xyes" ; then if test "x$GCC" = "xyes" ; then
@ -12,12 +12,21 @@ $OpenBSD: patch-configure,v 1.12 2009/03/04 20:59:52 naddy Exp $
fi fi
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@@ -21544,7 +21544,7 @@ _ACEOF @@ -21526,7 +21526,7 @@ esac
esac
if test "x$GCC" = "xyes" ; then if test "x$GCC" = "xyes" ; then
- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute"
+ : CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -Wextra -Wredundant-decls -Wpointer-arith -Wformat-security -W -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winit-self -Wundef -Wnested-externs -Wmissing-format-attribute" - 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"
+ : 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"
{ $as_echo "$as_me:$LINENO: checking gcc version" >&5
$as_echo_n "checking gcc version... " >&6; }
@@ -21538,7 +21538,7 @@ $as_echo_n "checking gcc version... " >&6; }
{ $as_echo "$as_me:$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
fi fi
{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5

23
net/transmission/patches/patch-daemon_remote_c
View File

@ -1,22 +1,7 @@
$OpenBSD: patch-daemon_remote_c,v 1.4 2009/03/04 20:59:52 naddy Exp $ $OpenBSD: patch-daemon_remote_c,v 1.5 2009/05/10 19:31:44 naddy Exp $
--- daemon/remote.c.orig Fri Feb 27 17:46:36 2009 --- daemon/remote.c.orig Tue May 5 02:40:19 2009
+++ daemon/remote.c Sun Mar 1 17:10:43 2009 +++ daemon/remote.c Thu May 7 19:40:40 2009
@@ -630,11 +630,11 @@ strlratio2( char * buf, double ratio, size_t buflen ) @@ -692,24 +692,24 @@ strlsize( char * buf, int64_t size, size_t buflen )
else if( (int)ratio == TR_RATIO_INF )
tr_strlcpy( buf, "Inf", buflen );
else if( ratio < 10.0 )
- tr_snprintf( buf, buflen, "%'.2f", ratio );
+ tr_snprintf( buf, buflen, "%.2f", ratio );
else if( ratio < 100.0 )
- tr_snprintf( buf, buflen, "%'.1f", ratio );
+ tr_snprintf( buf, buflen, "%.1f", ratio );
else
- tr_snprintf( buf, buflen, "%'.0f", ratio );
+ tr_snprintf( buf, buflen, "%.0f", ratio );
return buf;
}
@@ -662,24 +662,24 @@ strlsize( char * buf, int64_t size, size_t buflen )
if( !size ) if( !size )
tr_strlcpy( buf, "None", buflen ); tr_strlcpy( buf, "None", buflen );
else if( size < (int64_t)KILOBYTE_FACTOR ) else if( size < (int64_t)KILOBYTE_FACTOR )

12
net/transmission/patches/patch-gtk_blocklist_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gtk_blocklist_c,v 1.3 2009/04/14 14:06:26 naddy Exp $
--- gtk/blocklist.c.orig Sun Apr 12 21:55:50 2009
+++ gtk/blocklist.c Tue Apr 14 00:11:22 2009
@@ -145,7 +145,7 @@ blocklistThreadFunc( gpointer gcore )
if( ok )
{
emitProgress( core, TRUE, _(
- "Blocklist updated with %'d entries" ), rules );
+ "Blocklist updated with %d entries" ), rules );
pref_int_set( BLOCKLIST_DATE, time( NULL ) );
}

53
net/transmission/patches/patch-gtk_details_c
View File

@ -1,21 +1,36 @@
$OpenBSD: patch-gtk_details_c,v 1.7 2009/04/14 14:06:26 naddy Exp $ $OpenBSD: patch-gtk_details_c,v 1.8 2009/05/10 19:31:44 naddy Exp $
--- gtk/details.c.orig Sun Apr 12 21:55:50 2009 --- gtk/details.c.orig Tue May 5 02:40:11 2009
+++ gtk/details.c Tue Apr 14 00:11:22 2009 +++ gtk/details.c Thu May 7 19:40:40 2009
@@ -264,7 +264,7 @@ fmtpeercount( GtkWidget * l, @@ -906,7 +906,7 @@ refreshInfo( struct DetailsImpl * di, tr_torrent ** to
else for( i=0; i<n; ++i )
{ sum += infos[i]->pieceCount;
char str[16]; g_snprintf( buf, sizeof( buf ),
- g_snprintf( str, sizeof str, "%'d", count ); - ngettext( "%'d Piece", "%'d Pieces", sum ), sum );
+ g_snprintf( str, sizeof str, "%d", count ); + ngettext( "%d Piece", "%d Pieces", sum ), sum );
gtk_label_set_text( GTK_LABEL( l ), str ); for( i=1; i<n; ++i )
if( baseline != (int)infos[i]->pieceSize )
break;
@@ -1453,11 +1453,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 );
} }
}
@@ -630,7 +630,7 @@ info_page_new( tr_torrent * tor )
hig_workarea_add_section_title( t, &row, _( "Details" ) );
g_snprintf( countStr, sizeof( countStr ), @@ -2058,7 +2058,7 @@ torrent_inspector_set_torrents( GtkWidget * w, GSList
- ngettext( "%'d Piece", "%'d Pieces", info->pieceCount ), {
+ ngettext( "%d Piece", "%d Pieces", info->pieceCount ), file_list_clear( di->file_list );
info->pieceCount ); tracker_list_clear( di->tracker_list );
tr_strlsize( sizeStr, info->pieceSize, sizeof( sizeStr ) ); - g_snprintf( title, sizeof( title ), _( "%'d Torrent Properties" ), len );
g_snprintf( buf, sizeof( buf ), + g_snprintf( title, sizeof( title ), _( "%d Torrent Properties" ), len );
}
gtk_window_set_title( GTK_WINDOW( w ), title );

10
net/transmission/patches/patch-gtk_torrent-cell-renderer_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.3 2008/12/02 15:29:07 naddy Exp $ $OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.4 2009/05/10 19:31:44 naddy Exp $
--- gtk/torrent-cell-renderer.c.orig Mon Nov 10 16:52:26 2008 --- gtk/torrent-cell-renderer.c.orig Tue May 5 02:40:11 2009
+++ gtk/torrent-cell-renderer.c Thu Nov 27 22:33:20 2008 +++ gtk/torrent-cell-renderer.c Thu May 7 19:40:40 2009
@@ -202,8 +202,8 @@ getStatusString( const tr_stat * torStat ) @@ -229,8 +229,8 @@ getStatusString( const tr_stat * torStat )
case TR_STATUS_DOWNLOAD: case TR_STATUS_DOWNLOAD:
g_string_append_printf( gstr, g_string_append_printf( gstr,
@ -12,7 +12,7 @@ $OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.3 2008/12/02 15:29:07 naddy Exp
torStat->peersConnected ), torStat->peersConnected ),
torStat->peersSendingToUs + torStat->peersSendingToUs +
torStat->webseedsSendingToUs, torStat->webseedsSendingToUs,
@@ -213,8 +213,8 @@ getStatusString( const tr_stat * torStat ) @@ -240,8 +240,8 @@ getStatusString( const tr_stat * torStat )
case TR_STATUS_SEED: case TR_STATUS_SEED:
g_string_append_printf( gstr, g_string_append_printf( gstr,

19
net/transmission/patches/patch-gtk_tr-prefs_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-gtk_tr-prefs_c,v 1.5 2009/04/14 14:06:26 naddy Exp $ $OpenBSD: patch-gtk_tr-prefs_c,v 1.6 2009/05/10 19:31:44 naddy Exp $
--- gtk/tr-prefs.c.orig Sun Apr 12 21:55:50 2009 --- gtk/tr-prefs.c.orig Tue May 5 02:40:11 2009
+++ gtk/tr-prefs.c Tue Apr 14 00:11:23 2009 +++ gtk/tr-prefs.c Thu May 7 19:40:40 2009
@@ -319,8 +319,8 @@ updateBlocklistText( GtkWidget * w, @@ -369,8 +369,8 @@ updateBlocklistText( GtkWidget * w, TrCore * core )
const int n = tr_blocklistGetRuleCount( tr_core_session( core ) );
char buf[512]; char buf[512];
g_snprintf( buf, sizeof( buf ), g_snprintf( buf, sizeof( buf ),
- ngettext( "Enable _blocklist (contains %'d rule)", - ngettext( "Enable _blocklist (contains %'d rule)",
- "Enable _blocklist (contains %'d rules)", n ), n ); - "Enable _blocklist (contains %'d rules)", n ), n );
@ -12,3 +12,12 @@ $OpenBSD: patch-gtk_tr-prefs_c,v 1.5 2009/04/14 14:06:26 naddy Exp $
gtk_button_set_label( GTK_BUTTON( w ), buf ); 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 );

21
net/transmission/patches/patch-gtk_tr-window_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-gtk_tr-window_c,v 1.6 2009/04/14 14:06:26 naddy Exp $ $OpenBSD: patch-gtk_tr-window_c,v 1.7 2009/05/10 19:31:44 naddy Exp $
--- gtk/tr-window.c.orig Sun Apr 12 21:55:50 2009 --- gtk/tr-window.c.orig Tue May 5 02:40:11 2009
+++ gtk/tr-window.c Tue Apr 14 00:11:23 2009 +++ gtk/tr-window.c Thu May 7 19:40:40 2009
@@ -703,13 +703,13 @@ updateTorrentCount( PrivateData * p ) @@ -1041,13 +1041,13 @@ updateTorrentCount( PrivateData * p )
*buf = '\0';
if( torrentCount != visibleCount ) else if( torrentCount != visibleCount )
g_snprintf( buf, sizeof( buf ), g_snprintf( buf, sizeof( buf ),
- ngettext( "%1$'d of %2$'d Torrent", - ngettext( "%1$'d of %2$'d Torrent",
- "%1$'d of %2$'d Torrents", - "%1$'d of %2$'d Torrents",
@ -12,10 +12,9 @@ $OpenBSD: patch-gtk_tr-window_c,v 1.6 2009/04/14 14:06:26 naddy Exp $
torrentCount ), torrentCount ),
visibleCount, torrentCount ); visibleCount, torrentCount );
else else
- g_snprintf( buf, sizeof( buf ), ngettext( "%'d Torrent", g_snprintf( buf, sizeof( buf ),
- "%'d Torrents", - ngettext( "%'d Torrent", "%'d Torrents", torrentCount ),
+ g_snprintf( buf, sizeof( buf ), ngettext( "%d Torrent", + ngettext( "%d Torrent", "%d Torrents", torrentCount ),
+ "%d Torrents",
torrentCount ),
torrentCount ); torrentCount );
gtk_label_set_text( GTK_LABEL( p->gutter_lb ), buf ); gtk_label_set_text( GTK_LABEL( p->gutter_lb ), buf );
}

29
net/transmission/patches/patch-gtk_util_c
View File

@ -1,22 +1,7 @@
$OpenBSD: patch-gtk_util_c,v 1.5 2009/04/14 14:06:26 naddy Exp $ $OpenBSD: patch-gtk_util_c,v 1.6 2009/05/10 19:31:44 naddy Exp $
--- gtk/util.c.orig Sun Apr 12 21:55:50 2009 --- gtk/util.c.orig Tue May 5 02:40:11 2009
+++ gtk/util.c Tue Apr 14 00:12:23 2009 +++ gtk/util.c Thu May 7 19:40:40 2009
@@ -58,11 +58,11 @@ tr_strlratio( char * buf, @@ -76,7 +76,7 @@ tr_strlsize( char * buf,
else if( (int)ratio == TR_RATIO_INF )
g_strlcpy( buf, "\xE2\x88\x9E", buflen );
else if( ratio < 10.0 )
- g_snprintf( buf, buflen, "%'.2f", ratio );
+ g_snprintf( buf, buflen, "%.2f", ratio );
else if( ratio < 100.0 )
- g_snprintf( buf, buflen, "%'.1f", ratio );
+ g_snprintf( buf, buflen, "%.1f", ratio );
else
- g_snprintf( buf, buflen, "%'.0f", ratio );
+ g_snprintf( buf, buflen, "%.0f", ratio );
return buf;
}
@@ -87,7 +87,7 @@ tr_strlsize( char * buf,
#else #else
else if( size < (guint64)KILOBYTE_FACTOR ) else if( size < (guint64)KILOBYTE_FACTOR )
g_snprintf( buf, buflen, g_snprintf( buf, buflen,
@ -25,7 +10,7 @@ $OpenBSD: patch-gtk_util_c,v 1.5 2009/04/14 14:06:26 naddy Exp $
(guint)size ), (guint)size ); (guint)size ), (guint)size );
else else
{ {
@@ -95,17 +95,17 @@ tr_strlsize( char * buf, @@ -84,17 +84,17 @@ tr_strlsize( char * buf,
if( size < (guint64)MEGABYTE_FACTOR ) if( size < (guint64)MEGABYTE_FACTOR )
{ {
displayed_size = (gdouble) size / KILOBYTE_FACTOR; displayed_size = (gdouble) size / KILOBYTE_FACTOR;
@ -46,7 +31,7 @@ $OpenBSD: patch-gtk_util_c,v 1.5 2009/04/14 14:06:26 naddy Exp $
} }
} }
#endif #endif
@@ -120,13 +120,13 @@ tr_strlspeed( char * buf, @@ -109,13 +109,13 @@ tr_strlspeed( char * buf,
const double speed = kb_sec; const double speed = kb_sec;
if( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */ if( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */
@ -64,7 +49,7 @@ $OpenBSD: patch-gtk_util_c,v 1.5 2009/04/14 14:06:26 naddy Exp $
return buf; return buf;
} }
@@ -147,14 +147,14 @@ tr_strltime( char * buf, @@ -136,14 +136,14 @@ tr_strltime( char * buf,
minutes = ( seconds % 3600 ) / 60; minutes = ( seconds % 3600 ) / 60;
seconds = ( seconds % 3600 ) % 60; seconds = ( seconds % 3600 ) % 60;

20
net/transmission/patches/patch-libtransmission_utils_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-libtransmission_utils_c,v 1.3 2009/05/10 19:31:44 naddy Exp $
--- libtransmission/utils.c.orig Tue May 5 02:40:08 2009
+++ libtransmission/utils.c Thu May 7 19:40:40 2009
@@ -1540,7 +1540,7 @@ printf_double_without_rounding( char * buf, int buflen
char * pch;
char tmp[128];
int len;
- tr_snprintf( tmp, sizeof( tmp ), "%'.64f", d );
+ tr_snprintf( tmp, sizeof( tmp ), "%.64f", d );
pch = tmp;
while( isdigit( *pch ) ) ++pch; /* walk to the decimal point */
++pch; /* walk over the decimal point */
@@ -1562,6 +1562,6 @@ tr_strratio( char * buf, size_t buflen, double ratio,
else if( ratio < 100.0 )
printf_double_without_rounding( buf, buflen, ratio, 1 );
else
- tr_snprintf( buf, buflen, "%'.0f", ratio );
+ tr_snprintf( buf, buflen, "%.0f", ratio );
return buf;
}

8
net/transmission/pkg/PLIST-gui
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gui,v 1.14 2009/02/15 18:09:29 naddy Exp $ @comment $OpenBSD: PLIST-gui,v 1.15 2009/05/10 19:31:44 naddy Exp $
@bin bin/transmission @bin bin/transmission
@man man/man1/transmission.1 @man man/man1/transmission.1
share/applications/transmission.desktop share/applications/transmission.desktop
@ -25,6 +25,12 @@ share/icons/hicolor/scalable/apps/transmission.svg
share/locale/ar/ share/locale/ar/
share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/transmission.mo share/locale/ar/LC_MESSAGES/transmission.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/transmission.mo
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/transmission.mo
share/locale/bg/LC_MESSAGES/transmission.mo share/locale/bg/LC_MESSAGES/transmission.mo
share/locale/br/ share/locale/br/
share/locale/br/LC_MESSAGES/ share/locale/br/LC_MESSAGES/

5
net/transmission/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2009/04/14 14:06:26 naddy Exp $ @comment $OpenBSD: PLIST-main,v 1.12 2009/05/10 19:31:44 naddy Exp $
@pkgpath net/transmission @pkgpath net/transmission
@bin bin/transmission-daemon @bin bin/transmission-daemon
@bin bin/transmission-remote @bin bin/transmission-remote
@ -12,7 +12,10 @@ share/transmission/web/
share/transmission/web/LICENSE share/transmission/web/LICENSE
share/transmission/web/images/ share/transmission/web/images/
share/transmission/web/images/buttons/ share/transmission/web/images/buttons/
share/transmission/web/images/buttons/file_priority_buttons.png
share/transmission/web/images/buttons/file_wanted_buttons.png
share/transmission/web/images/buttons/info_activity.png share/transmission/web/images/buttons/info_activity.png
share/transmission/web/images/buttons/info_files.png
share/transmission/web/images/buttons/info_general.png share/transmission/web/images/buttons/info_general.png
share/transmission/web/images/buttons/tab_backgrounds.png share/transmission/web/images/buttons/tab_backgrounds.png
share/transmission/web/images/buttons/toolbar_buttons.png share/transmission/web/images/buttons/toolbar_buttons.png