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

Overdue update to 1.22.

Browse Source
This commit is contained in:
naddy 2008-07-09 19:43:42 +00:00
parent 974e3db4b1
commit a0de073c3c
14 changed files with 146 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/transmission/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.26 2008/05/22 18:13:05 naddy Exp $
# $OpenBSD: Makefile,v 1.27 2008/07/09 19:43:42 naddy Exp $
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gui= lightweight BitTorrent client with graphical interface
VER= 1.11
VER= 1.22
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/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# GPLv2
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -26,7 +26,7 @@ FLAVOR?=
MULTI_PACKAGES= -main
WANTLIB= c crypto m pthread
WANTLIB= c crypto idn m pthread ssl z
WANTLIB-main= ${WANTLIB}
MODULES= devel/gettext
@ -50,10 +50,12 @@ WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
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 pixman-1 png pcre z
pangocairo-1.0 pixman-1 png pcre
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}
notify.>=2::devel/libnotify \
curl.>=9::net/curl
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
curl.>=9::net/curl
RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS}
RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main \
::devel/desktop-file-utils ${RUN_DEPENDS}

10
net/transmission/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (transmission-1.22.tar.bz2) = qgotsZsPPb/XWg+zVNbEfQ==
RMD160 (transmission-1.22.tar.bz2) = vfsjmP6xiG7kl9YnpFcxA+crxtw=
SHA1 (transmission-1.22.tar.bz2) = j5QrfhNnrfVe6Vo4qQfy+1K4ypc=
SHA256 (transmission-1.22.tar.bz2) = 1Lo4GxETuhNzLLR+rissuth0ZN7sepCm1Jwpq9HAH5o=
SIZE (transmission-1.22.tar.bz2) = 3987969

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

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-configure,v 1.9 2008/07/09 19:43:42 naddy Exp $
--- configure.orig Fri May 9 21:02:35 2008
+++ configure Wed May 14 17:31:53 2008
@@ -20832,10 +20832,6 @@ else
fi

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

@ -1,7 +1,16 @@
$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)
$OpenBSD: patch-gtk_details_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/details.c.orig Fri May 9 21:00:55 2008
+++ gtk/details.c Wed May 14 17:50:12 2008
@@ -407,7 +407,7 @@ fmtpeercount (GtkWidget * l, int count)
gtk_label_set_text( GTK_LABEL(l), "?" );
} else {
char str[16];
- g_snprintf( str, sizeof str, "%'d", count );
+ g_snprintf( str, sizeof str, "%d", count );
gtk_label_set_text( GTK_LABEL(l), str );
}
}
@@ -733,10 +733,10 @@ info_page_new (tr_torrent * tor)
tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
g_snprintf( buf, sizeof( buf ),

27
net/transmission/patches/patch-gtk_makemeta-ui_c
View File

@ -1,30 +1,27 @@
$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) );
$OpenBSD: patch-gtk_makemeta-ui_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/makemeta-ui.c.orig Fri May 9 21:00:55 2008
+++ gtk/makemeta-ui.c Wed May 14 17:50:12 2008
@@ -212,9 +212,9 @@ refreshFromBuilder( MakeMetaUI * ui )
tr_strlsize( sizeStr, builder->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 ),
- "<i>%1$s; %2$'d Files</i>", builder->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 );
+ "<i>%1$s; %2$d Files</i>", builder->fileCount ),
sizeStr, builder->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) );
@@ -226,8 +226,8 @@ refreshFromBuilder( MakeMetaUI * ui )
g_snprintf( buf, sizeof( buf ),
- /* %1$'s is number of pieces;
+ /* %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 );
builder->pieceCount ),
builder->pieceCount, sizeStr );
}

10
net/transmission/patches/patch-gtk_stats_c
View File

@ -1,7 +1,7 @@
$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 )
$OpenBSD: patch-gtk_stats_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/stats.c.orig Sat Jun 14 00:00:43 2008
+++ gtk/stats.c Thu Jun 19 15:38:51 2008
@@ -65,7 +65,7 @@ updateStats( gpointer gdata )
setLabel( ui->one_time_lb, tr_strltime( buf, one.secondsActive, sizeof(buf) ) );
setLabelFromRatio( ui->one_ratio_lb, one.ratio );
@ -10,7 +10,7 @@ $OpenBSD: patch-gtk_stats_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
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
@@ -131,7 +131,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") );

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.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 )
$OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/torrent-cell-renderer.c.orig Fri May 9 21:00:55 2008
+++ gtk/torrent-cell-renderer.c Wed May 14 17:50:12 2008
@@ -196,8 +196,8 @@ getStatusString( const tr_stat * torStat )
case TR_STATUS_DOWNLOAD:
g_string_append_printf( gstr,
@ -13,7 +13,7 @@ $OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.1 2008/04/22 16:50:43 naddy Exp
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",

16
net/transmission/patches/patch-gtk_tr-icon_c
View File

@ -1,9 +1,9 @@
$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 ) );
$OpenBSD: patch-gtk_tr-icon_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/tr-icon.c.orig Fri May 9 21:00:55 2008
+++ gtk/tr-icon.c Wed May 14 17:50:12 2008
@@ -67,11 +67,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,
@ -13,6 +13,6 @@ $OpenBSD: patch-gtk_tr-icon_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
%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,
stats.seedingCount,
stats.downloadCount,
downStr, upStr );

23
net/transmission/patches/patch-gtk_tr-prefs_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-gtk_tr-prefs_c,v 1.1 2008/07/09 19:43:42 naddy Exp $
--- gtk/tr-prefs.c.orig Sat Jun 14 00:00:43 2008
+++ gtk/tr-prefs.c Thu Jun 19 15:38:51 2008
@@ -298,8 +298,8 @@ updateBlocklistText( GtkWidget * w, TrCore * core )
const int n = tr_blocklistGetRuleCount( tr_core_handle( core ) );
char buf[512];
g_snprintf( buf, sizeof( buf ),
- ngettext( "Ignore the %'d _blocklisted peer",
- "Ignore the %'d _blocklisted peers", n ), n );
+ ngettext( "Ignore the %d _blocklisted peer",
+ "Ignore the %d _blocklisted peers", n ), n );
gtk_button_set_label( GTK_BUTTON( w ), buf );
}
static gboolean
@@ -390,7 +390,7 @@ got_blocklist( tr_handle * handle UNUSED,
if( ok && !data->abortFlag )
{
g_snprintf( data->secondary, sizeof( data->secondary ),
- _( "Blocklist updated with %'d entries" ), rules );
+ _( "Blocklist updated with %d entries" ), rules );
g_idle_add( blocklistDialogSetSecondary, data );
g_idle_add( blocklistDialogAllowClose, data->dialog );
g_idle_add( updateBlocklistTextFromData, data );

17
net/transmission/patches/patch-gtk_tr-torrent_c
View File

@ -1,16 +1,7 @@
$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;
$OpenBSD: patch-gtk_tr-torrent_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/tr-torrent.c.orig Fri May 9 21:00:55 2008
+++ gtk/tr-torrent.c Wed May 14 17:50:12 2008
@@ -299,8 +299,8 @@ tr_torrent_status_str ( TrTorrent * gtor )
case TR_STATUS_SEED:
top = g_strdup_printf(

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

@ -1,7 +1,7 @@
$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 )
$OpenBSD: patch-gtk_tr-window_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/tr-window.c.orig Fri May 9 21:00:55 2008
+++ gtk/tr-window.c Wed May 14 17:50:12 2008
@@ -590,13 +590,13 @@ updateTorrentCount( PrivateData * p )
const int visibleCount = gtk_tree_model_iter_n_children( p->filter_model, NULL );
if( torrentCount != visibleCount )

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

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-gtk_util_c,v 1.2 2008/07/09 19:43:42 naddy Exp $
--- gtk/util.c.orig Fri May 9 21:00:55 2008
+++ gtk/util.c Wed May 14 17:50:12 2008
@@ -63,11 +63,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 )
@ -16,7 +16,7 @@ $OpenBSD: patch-gtk_util_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
return buf;
}
@@ -83,18 +83,18 @@ tr_strlsize( char * buf, guint64 size, size_t buflen )
@@ -88,18 +88,18 @@ tr_strlsize( char * buf, guint64 size, size_t buflen )
}
#else
else if( size < (guint64)KILOBYTE_FACTOR )
@ -39,7 +39,7 @@ $OpenBSD: patch-gtk_util_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
}
}
#endif
@@ -107,13 +107,13 @@ tr_strlspeed( char * buf, double kb_sec, size_t buflen
@@ -112,13 +112,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 */
@ -57,7 +57,7 @@ $OpenBSD: patch-gtk_util_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
return buf;
}
@@ -129,14 +129,14 @@ tr_strltime( char * buf, int seconds, size_t buflen )
@@ -134,14 +134,14 @@ tr_strltime( char * buf, int seconds, size_t buflen )
if( seconds < 60 )
{
@ -74,7 +74,7 @@ $OpenBSD: patch-gtk_util_c,v 1.1 2008/04/22 16:50:43 naddy Exp $
return buf;
}
@@ -149,20 +149,20 @@ tr_strltime( char * buf, int seconds, size_t buflen )
@@ -154,20 +154,20 @@ tr_strltime( char * buf, int seconds, size_t buflen )
const int minutes = ( seconds - hours * 60 * 60 + 30 ) / 60;

21
net/transmission/patches/patch-third-party_libevent_test_bench_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-third-party_libevent_test_bench_c,v 1.1 2008/07/09 19:43:42 naddy Exp $
--- third-party/libevent/test/bench.c.orig Wed Jul 9 21:22:08 2008
+++ third-party/libevent/test/bench.c Wed Jul 9 21:22:27 2008
@@ -68,7 +68,7 @@ static struct event *events;
static void
read_cb(int fd, short which, void *arg)
{
- int idx = (int) arg, widx = idx + 1;
+ int idx = (int)(long) arg, widx = idx + 1;
u_char ch;
count += read(fd, &ch, sizeof(ch));
@@ -89,7 +89,7 @@ run_once(void)
for (cp = pipes, i = 0; i < num_pipes; i++, cp += 2) {
event_del(&events[i]);
- event_set(&events[i], cp[0], EV_READ | EV_PERSIST, read_cb, (void *) i);
+ event_set(&events[i], cp[0], EV_READ | EV_PERSIST, read_cb, (void *)(long) i);
event_add(&events[i], NULL);
}

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gui,v 1.10 2008/04/22 16:50:43 naddy Exp $
@comment $OpenBSD: PLIST-gui,v 1.11 2008/07/09 19:43:42 naddy Exp $
bin/transmission
@man man/man1/transmission.1
share/applications/transmission.desktop
@ -22,30 +22,53 @@ 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/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/transmission.mo
share/locale/bg/LC_MESSAGES/transmission.mo
share/locale/ca/LC_MESSAGES/transmission.mo
share/locale/cs/LC_MESSAGES/transmission.mo
share/locale/da/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/fa/
share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/transmission.mo
share/locale/fi/LC_MESSAGES/transmission.mo
share/locale/fr/LC_MESSAGES/transmission.mo
share/locale/ga/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/ja/LC_MESSAGES/transmission.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/transmission.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/transmission.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/transmission.mo
share/locale/mt/
share/locale/mt/LC_MESSAGES/
share/locale/mt/LC_MESSAGES/transmission.mo
share/locale/nb/LC_MESSAGES/transmission.mo
share/locale/nl/LC_MESSAGES/transmission.mo
share/locale/nn/LC_MESSAGES/transmission.mo
share/locale/pl/LC_MESSAGES/transmission.mo
share/locale/pt/LC_MESSAGES/transmission.mo
share/locale/pt_BR/LC_MESSAGES/transmission.mo
share/locale/ro/LC_MESSAGES/transmission.mo
share/locale/ru/LC_MESSAGES/transmission.mo
share/locale/sk/LC_MESSAGES/transmission.mo
share/locale/sl/LC_MESSAGES/transmission.mo
share/locale/sv/LC_MESSAGES/transmission.mo
share/locale/tr/LC_MESSAGES/transmission.mo
share/locale/zh_CN/LC_MESSAGES/transmission.mo
share/locale/zh_TW/LC_MESSAGES/transmission.mo
share/pixmaps/
share/pixmaps/transmission.png
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true