Update to 1.11.

This commit is contained in:
naddy 2008-04-22 16:50:42 +00:00
parent 25533eba4a
commit 5371258c2e
13 changed files with 295 additions and 56 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.23 2008/04/17 08:10:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2008/04/22 16:50:42 naddy Exp $
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gui= lightweight BitTorrent client with graphical interface
VER= 1.06
VER= 1.11
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gui= transmission-gui-${VER}p0
PKGNAME-gui= transmission-gui-${VER}
CATEGORIES= net
HOMEPAGE= http://www.transmissionbt.com/
@ -29,10 +29,12 @@ MULTI_PACKAGES= -main
WANTLIB= c crypto m pthread
WANTLIB-main= ${WANTLIB}
MODULES= devel/gettext
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-shared --without-wx
CONFIGURE_ARGS= --disable-shared --disable-wx
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
OPENSSL_CFLAGS="-I/usr/include" \
@ -41,20 +43,25 @@ LIBTOOL_FLAGS= --tag=disable-shared
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/third-party/libevent
.if ${FLAVOR:L:Mno_gui}
CONFIGURE_ARGS+=--without-gtk
CONFIGURE_ARGS+=--disable-gtk
.else
MULTI_PACKAGES+=-gui
MODULES= devel/gettext
WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \
fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gthread-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 png pcre z
LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
LIB_DEPENDS-main=
RUN_DEPENDS-main=
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
dbus-glib-1 expat fontconfig freetype gio-2.0 glib-2.0 glitz \
gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \
pangocairo-1.0 png pcre z
LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
notify.>=2::devel/libnotify
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS}
RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main \
::devel/desktop-file-utils ${RUN_DEPENDS}
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 <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (transmission-1.06.tar.bz2) = Rx5L1A4UZAZ6PiZuzzy3JA==
RMD160 (transmission-1.06.tar.bz2) = SyA5kcRbEWfNYncl4cIDQ7yCe70=
SHA1 (transmission-1.06.tar.bz2) = WFy9FbOAE/rArqDr6ZUUqtBk/+k=
SHA256 (transmission-1.06.tar.bz2) = RM/6v1d/duvvEEBeM3xVysKgBkRVHauPaN4oVvIUd4Y=
SIZE (transmission-1.06.tar.bz2) = 4232766
MD5 (transmission-1.11.tar.bz2) = RYLXr/SJqUJbFHY0ZT3x0Q==
RMD160 (transmission-1.11.tar.bz2) = WbD3ynkMlEWBDpOlFA+E3B3TS/Q=
SHA1 (transmission-1.11.tar.bz2) = DSSxXFTBMsHU3zwQ/hvho+vyUzQ=
SHA256 (transmission-1.11.tar.bz2) = p9TyuM82H6jRd86vnEC+jzytJ3aSdGJMzyrLpjdDc+4=
SIZE (transmission-1.11.tar.bz2) = 4375576

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2008/01/29 16:33:08 naddy Exp $
--- configure.orig Tue Jan 29 17:21:15 2008
+++ configure Tue Jan 29 17:21:25 2008
@@ -20782,10 +20782,6 @@ else
$OpenBSD: patch-configure,v 1.8 2008/04/22 16:50:43 naddy Exp $
--- configure.orig Sat Mar 29 01:05:44 2008
+++ configure Sun Mar 30 22:16:01 2008
@@ -20808,10 +20808,6 @@ else
fi

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-gtk_details_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/details.c.orig Sat Mar 29 01:02:21 2008
+++ gtk/details.c Wed Apr 2 02:24:36 2008
@@ -672,10 +672,10 @@ info_page_new (tr_torrent * tor)
tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
g_snprintf( buf, sizeof( buf ),
- /* %1$'d is number of pieces
+ /* %1$d is number of pieces
%2$s is how big each piece is */
- ngettext( "%1$'d Piece @ %2$s",
- "%1$'d Pieces @ %2$s",
+ ngettext( "%1$d Piece @ %2$s",
+ "%1$d Pieces @ %2$s",
info->pieceCount ),
info->pieceCount, sizeStr );
l = gtk_label_new (buf);

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-gtk_makemeta-ui_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/makemeta-ui.c.orig Tue Apr 1 17:12:09 2008
+++ gtk/makemeta-ui.c Tue Apr 1 17:12:35 2008
@@ -205,9 +205,9 @@ onSelectionChanged( GtkFileChooser *chooser, gpointer
tr_strlsize( sizeStr, totalSize, sizeof(sizeStr) );
g_snprintf( buf, sizeof( buf ),
/* %1$s is the torrent size
- %2$'d is its number of files */
- ngettext( "<i>%1$s; %2$'d File</i>",
- "<i>%1$s; %2$'d Files</i>", fileCount ),
+ %2$d is its number of files */
+ ngettext( "<i>%1$s; %2$d File</i>",
+ "<i>%1$s; %2$d Files</i>", fileCount ),
sizeStr, fileCount );
}
gtk_label_set_markup ( GTK_LABEL(ui->size_lb), buf );
@@ -217,10 +217,10 @@ onSelectionChanged( GtkFileChooser *chooser, gpointer
else {
tr_strlsize( sizeStr, pieceSize, sizeof(sizeStr) );
g_snprintf( buf, sizeof( buf ),
- /* %1$'s is number of pieces;
+ /* %1$s is number of pieces;
%2$s is how big each piece is */
- ngettext( "<i>%1$'d Piece @ %2$s</i>",
- "<i>%1$'d Pieces @ %2$s</i>",
+ ngettext( "<i>%1$d Piece @ %2$s</i>",
+ "<i>%1$d Pieces @ %2$s</i>",
pieceCount ),
pieceCount, sizeStr );
}

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-gtk_stats_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/stats.c.orig Tue Apr 1 16:26:37 2008
+++ gtk/stats.c Tue Apr 1 16:27:13 2008
@@ -60,7 +60,7 @@ updateStats( gpointer gdata )
setLabel( ui->one_time_lb, tr_strltime( buf, one.secondsActive, sizeof(buf) ) );
setLabelFromRatio( ui->one_ratio_lb, one.ratio );
- fmt = ngettext( "Started %'d time", "Started %'d times", (int)all.sessionCount );
+ 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 );
setLabel( ui->all_up_lb, tr_strlsize( buf, all.uploadedBytes, sizeof(buf) ) );
@@ -108,7 +108,7 @@ stats_dialog_create( GtkWindow * parent, TrCore * core
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 );

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/torrent-cell-renderer.c.orig Tue Apr 1 17:13:40 2008
+++ gtk/torrent-cell-renderer.c Tue Apr 1 17:13:53 2008
@@ -195,8 +195,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->peersConnected );
@@ -205,8 +205,8 @@ getStatusString( const tr_stat * torStat )
case TR_STATUS_DONE:
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 );

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gtk_tr-icon_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/tr-icon.c.orig Tue Apr 1 17:13:04 2008
+++ gtk/tr-icon.c Tue Apr 1 17:13:22 2008
@@ -63,11 +63,11 @@ refresh_tooltip_cb( gpointer data )
tr_strlspeed( downStr, stats->clientDownloadSpeed, sizeof( downStr ) );
tr_strlspeed( upStr, stats->clientUploadSpeed, sizeof( upStr ) );
g_snprintf( tip, sizeof( tip ),
- /* %1$'d is the number of torrents we're seeding,
- %2$'d is the number of torrents we're downloading,
+ /* %1$d is the number of torrents we're seeding,
+ %2$d is the number of torrents we're downloading,
%3$s is our download speed,
%4$s is our upload speed */
- _( "%1$'d Seeding, %2$'d Downloading\nDown: %3$s, Up: %4$s" ),
+ _( "%1$d Seeding, %2$d Downloading\nDown: %3$s, Up: %4$s" ),
stats->seedingCount,
stats->downloadCount,
downStr, upStr );

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-gtk_tr-torrent_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/tr-torrent.c.orig Tue Apr 1 17:10:00 2008
+++ gtk/tr-torrent.c Tue Apr 1 17:10:37 2008
@@ -297,15 +297,15 @@ tr_torrent_status_str ( TrTorrent * gtor )
case TR_STATUS_DONE:
top = g_strdup_printf(
- ngettext( "Uploading to %1$'d of %2$'d connected peer",
- "Uploading to %1$'d of %2$'d connected peers", tpeers ),
+ ngettext( "Uploading to %1$d of %2$d connected peer",
+ "Uploading to %1$d of %2$d connected peers", tpeers ),
upeers, tpeers );
break;
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", tpeers ),
+ ngettext( "Seeding to %1$d of %2$d connected peer",
+ "Seeding to %1$d of %2$d connected peers", tpeers ),
upeers, tpeers );
break;

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-gtk_tr-window_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/tr-window.c.orig Sat Mar 29 01:02:21 2008
+++ gtk/tr-window.c Tue Apr 1 17:11:18 2008
@@ -596,13 +596,13 @@ updateTorrentCount( PrivateData * p )
const int visibleCount = gtk_tree_model_iter_n_children( p->filter_model, NULL );
if( torrentCount != visibleCount )
- g_snprintf( buf, sizeof( buf ), ngettext( "%1$'d of %2$'d Torrent",
- "%1$'d of %2$'d Torrents",
+ g_snprintf( buf, sizeof( buf ), 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",
+ g_snprintf( buf, sizeof( buf ), ngettext( "%d Torrent",
+ "%d Torrents",
torrentCount ),
torrentCount );
gtk_label_set_text( GTK_LABEL( p->gutter_lb ), buf );

View File

@ -0,0 +1,101 @@
$OpenBSD: patch-gtk_util_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
--- gtk/util.c.orig Tue Apr 1 16:26:37 2008
+++ gtk/util.c Tue Apr 1 16:28:05 2008
@@ -58,11 +58,11 @@ tr_strlratio( char * buf, double ratio, size_t buflen
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;
}
@@ -83,18 +83,18 @@ tr_strlsize( char * buf, guint64 size, size_t buflen )
}
#else
else if( size < (guint64)KILOBYTE_FACTOR )
- g_snprintf( buf, buflen, ngettext("%'u byte", "%'u bytes", (guint)size), (guint)size );
+ g_snprintf( buf, buflen, ngettext("%u byte", "%u bytes", (guint)size), (guint)size );
else {
gdouble displayed_size;
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
@@ -107,13 +107,13 @@ tr_strlspeed( char * buf, double kb_sec, size_t buflen
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/1024) );
+ g_snprintf( buf, buflen, _( "%.2f MB/s" ), (speed/1024) );
else if( speed < 1024000.0 ) /* 100.0 MB to 999.9 MB */
- g_snprintf( buf, buflen, _( "%'.1f MB/s" ), (speed/1024) );
+ g_snprintf( buf, buflen, _( "%.1f MB/s" ), (speed/1024) );
else /* insane speeds */
- g_snprintf( buf, buflen, _( "%'.2f GB/s" ), (speed/1048576) );
+ g_snprintf( buf, buflen, _( "%.2f GB/s" ), (speed/1048576) );
return buf;
}
@@ -129,14 +129,14 @@ tr_strltime( char * buf, int seconds, size_t buflen )
if( seconds < 60 )
{
- g_snprintf( buf, buflen, ngettext( "%'d second", "%'d seconds", (int)seconds ), (int) seconds );
+ g_snprintf( buf, buflen, ngettext( "%d second", "%d seconds", (int)seconds ), (int) seconds );
return buf;
}
if( seconds < ( 60 * 60 ) )
{
const int minutes = ( seconds + 30 ) / 60;
- g_snprintf( buf, buflen, ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
+ g_snprintf( buf, buflen, ngettext( "%d minute", "%d minutes", minutes ), minutes );
return buf;
}
@@ -149,20 +149,20 @@ tr_strltime( char * buf, int seconds, size_t buflen )
const int minutes = ( seconds - hours * 60 * 60 + 30 ) / 60;
- g_snprintf( h, sizeof(h), ngettext( "%'d hour", "%'d hours", hours ), hours );
- g_snprintf( m, sizeof(m), ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
+ g_snprintf( h, sizeof(h), ngettext( "%d hour", "%d hours", hours ), hours );
+ g_snprintf( m, sizeof(m), ngettext( "%d minute", "%d minutes", minutes ), minutes );
g_snprintf( buf, buflen, "%s, %s", h, m );
return buf;
}
if( hours < 24 )
{
- g_snprintf( buf, buflen, ngettext( "%'d hour", "%'d hours", hours ), hours );
+ g_snprintf( buf, buflen, ngettext( "%d hour", "%d hours", hours ), hours );
return buf;
}
days = seconds / ( 60 * 60 * 24 );
- g_snprintf( buf, buflen, ngettext( "%'d day", "%'d days", days ), days );
+ g_snprintf( buf, buflen, ngettext( "%d day", "%d days", days ), days );
return buf;
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gui,v 1.9 2008/04/17 08:10:11 ajacoutot Exp $
@comment $OpenBSD: PLIST-gui,v 1.10 2008/04/22 16:50:43 naddy Exp $
bin/transmission
@man man/man1/transmission.1
share/applications/transmission.desktop
@ -22,12 +22,20 @@ share/icons/hicolor/48x48/apps/transmission.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/transmission.svg
share/locale/bg/LC_MESSAGES/transmission.mo
share/locale/ca/LC_MESSAGES/transmission.mo
share/locale/de/LC_MESSAGES/transmission.mo
share/locale/el/LC_MESSAGES/transmission.mo
share/locale/es/LC_MESSAGES/transmission.mo
share/locale/fi/LC_MESSAGES/transmission.mo
share/locale/fr/LC_MESSAGES/transmission.mo
share/locale/gl/LC_MESSAGES/transmission.mo
share/locale/he/LC_MESSAGES/transmission.mo
share/locale/hu/LC_MESSAGES/transmission.mo
share/locale/it/LC_MESSAGES/transmission.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/transmission.mo
share/locale/nl/LC_MESSAGES/transmission.mo
share/locale/pl/LC_MESSAGES/transmission.mo
share/locale/pt/LC_MESSAGES/transmission.mo

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.7 2008/02/17 21:59:32 naddy Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2008/04/22 16:50:43 naddy Exp $
@pkgpath net/transmission
bin/benc2php
bin/transmission-daemon
bin/transmission-proxy
bin/transmission-remote
@ -9,36 +10,3 @@ bin/transmissioncli
@man man/man1/transmission-remote.1
@man man/man1/transmissioncli.1
@comment share/applications/
@comment share/locale/
@comment share/locale/de/
@comment share/locale/de/LC_MESSAGES/
@comment share/locale/es/
@comment share/locale/es/LC_MESSAGES/
@comment share/locale/fi/
@comment share/locale/fi/LC_MESSAGES/
@comment share/locale/fr/
@comment share/locale/fr/LC_MESSAGES/
@comment share/locale/hu/
@comment share/locale/hu/LC_MESSAGES/
@comment share/locale/it/
@comment share/locale/it/LC_MESSAGES/
@comment share/locale/nl/
@comment share/locale/nl/LC_MESSAGES/
@comment share/locale/pl/
@comment share/locale/pl/LC_MESSAGES/
@comment share/locale/pt/
@comment share/locale/pt/LC_MESSAGES/
@comment share/locale/pt_BR/
@comment share/locale/pt_BR/LC_MESSAGES/
@comment share/locale/ro/
@comment share/locale/ro/LC_MESSAGES/
@comment share/locale/ru/
@comment share/locale/ru/LC_MESSAGES/
@comment share/locale/sk/
@comment share/locale/sk/LC_MESSAGES/
@comment share/locale/sv/
@comment share/locale/sv/LC_MESSAGES/
@comment share/locale/tr/
@comment share/locale/tr/LC_MESSAGES/
@comment share/locale/zh_CN/
@comment share/locale/zh_CN/LC_MESSAGES/