diff options
author | wiz <wiz@pkgsrc.org> | 2002-11-11 14:01:32 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2002-11-11 14:01:32 +0000 |
commit | 36d8e71df864916dbf9c38f98f27ed3b2cecc87b (patch) | |
tree | 548b73aeabb8b512feec6cbaf38f3bba27fbcf9e /net | |
parent | 2455e5f62bffca5d7f1f21d945c9c8efb88865cc (diff) | |
download | pkgsrc-36d8e71df864916dbf9c38f98f27ed3b2cecc87b.tar.gz |
Update to 0.65. Changes:
- Dutch translation of the GUI updated by Myckel Habets.
- fix the compilation problem with Berkeley DB4. (open function of db4.0 has the
same prototype as DB3 one but db4.1 does not).
- fix erroneous tooltip of virtual share entry.
- In find popup menu and user share list popup menu, only GDL having the same
size as the selected rows are displayed in the first level of the menu.
- In find popup menu and user share list popup menu, GDL entries were modified.
GDL ID is not displayed and GDL size is displayed using locale format.
- file size and upload position of the upload list is now displayed using locale
format.
- Support of new flag added: IGNORE_PUBMSG.
- it is now possible to flag user from the public chat by selecting a line (or
part of a line) containing a nickname. It is even possible to flag virtual
user like Hub-Security.
Diffstat (limited to 'net')
-rw-r--r-- | net/dc_gui/Makefile | 7 | ||||
-rw-r--r-- | net/dc_gui/distinfo | 10 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ac | 17 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ad | 99 |
4 files changed, 16 insertions, 117 deletions
diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile index 02599390700..02f09a1b2db 100644 --- a/net/dc_gui/Makefile +++ b/net/dc_gui/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2002/11/03 21:32:24 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/11/11 14:01:32 wiz Exp $ # -DISTNAME= dc_gui-0.64 +DISTNAME= dc_gui-0.65 CATEGORIES= net MASTER_SITES= http://www.ac2i.tzo.com/dctc/ @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ac2i.tzo.com/dctc/ COMMENT= graphical user interface for DCTC -DEPENDS+= dctc>=0.83.7:../../net/dctc +DEPENDS+= dctc>=0.83.8:../../net/dctc GNU_CONFIGURE= YES USE_BUILDLINK2= YES @@ -17,6 +17,7 @@ CONFIGURE_ARGS+= --enable-manual-db-detect USE_GMAKE= YES CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 +CPPFLAGS+= -DNO_PRINTF_LOCALE post-configure: @${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h diff --git a/net/dc_gui/distinfo b/net/dc_gui/distinfo index e2b85280b63..5a186cc009e 100644 --- a/net/dc_gui/distinfo +++ b/net/dc_gui/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2002/11/03 21:32:25 wiz Exp $ +$NetBSD: distinfo,v 1.9 2002/11/11 14:01:32 wiz Exp $ -SHA1 (dc_gui-0.64.tar.gz) = 2c608ba0e8e7e10c7ddba212f006142e2abfbd20 -Size (dc_gui-0.64.tar.gz) = 454778 bytes -SHA1 (patch-ac) = a3b0f1d28c2b4d9dfb60442c11a8ad7e0a39401d -SHA1 (patch-ad) = 1fdb94cf8897fb333a5aac11f843b1cc05129a74 +SHA1 (dc_gui-0.65.tar.gz) = dc42a0621d89ba60e139eab79981a71d6333f056 +Size (dc_gui-0.65.tar.gz) = 459177 bytes +SHA1 (patch-ac) = 4cfccfb3641c475a6307e82957554c2fc9d0a0f3 +SHA1 (patch-ad) = 03bab16dee554b5df86d868ac64e5008edf80b51 SHA1 (patch-ae) = f2e9fe445efea23fe52f27ff14d5dcc5c0775af0 SHA1 (patch-af) = cd6f3c4f8af7c540064e17c0e9714ddc13050641 SHA1 (patch-ag) = d2c699a09b220c7f53e5fefe35aee3b4d71d74e4 diff --git a/net/dc_gui/patches/patch-ac b/net/dc_gui/patches/patch-ac index 21d160633a3..6701d5f92dc 100644 --- a/net/dc_gui/patches/patch-ac +++ b/net/dc_gui/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.4 2002/11/03 21:32:25 wiz Exp $ +$NetBSD: patch-ac,v 1.5 2002/11/11 14:01:32 wiz Exp $ ---- src/callbacks.c.orig Sun Nov 3 08:12:20 2002 +--- src/callbacks.c.orig Sat Nov 9 16:54:13 2002 +++ src/callbacks.c @@ -2,6 +2,13 @@ # include <config.h> @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.4 2002/11/03 21:32:25 wiz Exp $ #include <gnome.h> #include <glib.h> #include <time.h> -@@ -1632,7 +1638,7 @@ on_find_entry_activate ( +@@ -1733,7 +1739,7 @@ on_find_entry_activate ( val=atof(gtk_entry_get_text(GTK_ENTRY(w))); @@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.4 2002/11/03 21:32:25 wiz Exp $ } w=get_widget_by_widget_name("find_result"); -@@ -2875,7 +2881,7 @@ on_apply_pref_clicked ( +@@ -2975,7 +2981,7 @@ on_apply_pref_clicked ( } if(i==4) i=0; @@ -42,12 +42,3 @@ $NetBSD: patch-ac,v 1.4 2002/11/03 21:32:25 wiz Exp $ send_data_to_dctc(out->str); } } -@@ -3447,7 +3453,7 @@ static void reload_ls_cache_clist(int ev - LS_CACHE_CL_ENTRY *lcce; - - strftime(dl_time,sizeof(dl_time)-1,"%c",localtime(&(lsch.retrieve_time))); -- sprintf(buf,"%'llu", lsch.share_size); -+ sprintf(buf,"%llu", lsch.share_size); - - nw[0]=obj->d_name; - nw[1]=buf; diff --git a/net/dc_gui/patches/patch-ad b/net/dc_gui/patches/patch-ad index d9d946f198f..11f1214ef09 100644 --- a/net/dc_gui/patches/patch-ad +++ b/net/dc_gui/patches/patch-ad @@ -1,92 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2002/11/03 21:32:25 wiz Exp $ +$NetBSD: patch-ad,v 1.5 2002/11/11 14:01:33 wiz Exp $ ---- src/dctc_process.c.orig Sat Nov 2 18:01:44 2002 +--- src/dctc_process.c.orig Sat Nov 9 17:00:01 2002 +++ src/dctc_process.c -@@ -463,7 +463,7 @@ static void user__fnc(const GString *s) - vsize=lu.share_size; - - if(vsize>(1024.0*1024.0*1024.0)) -- g_string_sprintf(fsize,"%'.2fGB",vsize/(1024.0*1024.0*1024.0)); -+ g_string_sprintf(fsize,"%.2fGB",vsize/(1024.0*1024.0*1024.0)); - else if(vsize>(1024.0*1024.0)) - g_string_sprintf(fsize,"%.2fMB",vsize/(1024.0*1024.0)); - else if(vsize>(1024.0)) -@@ -565,9 +565,9 @@ static void update_users_info(void) - } - - if( (amount/(1024.0*1024.0*1024.0)) > 1024.0) -- sprintf(buf,"%'d users (%'.2lfTB)",clst->rows,amount/(1024.0*1024.0*1024.0*1024.0)); -+ sprintf(buf,"%d users (%.2fTB)",clst->rows,amount/(1024.0*1024.0*1024.0*1024.0)); - else -- sprintf(buf,"%'d users (%'.2lfGB)",clst->rows,amount/(1024.0*1024.0*1024.0)); -+ sprintf(buf,"%d users (%.2fGB)",clst->rows,amount/(1024.0*1024.0*1024.0)); - w=get_widget_by_widget_name("users_info_label"); - if(w==NULL) - return; -@@ -722,7 +722,7 @@ static void uinfo_fnc(const GString *s) - fsize=g_string_new(""); - - if(vsize>(1024.0*1024.0*1024.0)) -- g_string_sprintf(fsize,"%'.2fGB",vsize/(1024.0*1024.0*1024.0)); -+ g_string_sprintf(fsize,"%.2fGB",vsize/(1024.0*1024.0*1024.0)); - else if(vsize>(1024.0*1024.0)) - g_string_sprintf(fsize,"%.2fMB",vsize/(1024.0*1024.0)); - else if(vsize>(1024.0)) -@@ -1169,7 +1169,7 @@ static void srest_fnc(const GString *s) - nickuinfo.cnx_type[0]='\0'; /* no information available */ - } - sscanf(size,"%lu",&fsize); -- sprintf(buf_size,"%'lu",fsize); -+ sprintf(buf_size,"%lu",fsize); - - sscanf(dl_ratio,"%u/%u",&free_slot,&ttl_slot); - -@@ -2938,7 +2938,7 @@ static void recursive_insert_new_user_cl - - nw[UFLC_TREE_COL]=new_leaf->c.file.filename+cur_string_pos; - nw[UFLC_SIZE_COL]=bf; -- sprintf(bf,"%'lu",new_leaf->c.file.file_size); -+ sprintf(bf,"%lu",new_leaf->c.file.file_size); - - leaf_node=gtk_ctree_insert_node(ctree,*last_inserted_node,NULL,nw,5,NULL,NULL,NULL,NULL,TRUE,TRUE); /* it is a leaf */ - gtk_ctree_node_set_row_data_full(ctree,leaf_node, new_leaf, (void*)free_user_file_cl_entry); -@@ -3783,7 +3783,7 @@ void second_level_glst_end_fnc(GtkCTree - gtk_ctree_node_set_text(ctree,cnode,2,strv[i]+temp_str_len); - #else - char buf_size[64]; -- sprintf(buf_size,"%'lu",cur_size); -+ sprintf(buf_size,"%lu",cur_size); - gtk_ctree_node_set_text(ctree,cnode,2,buf_size); - #endif - gce->c.active_segment.remote_file_size=cur_size; -@@ -3890,7 +3890,7 @@ static void second_level_add_newly_creat - unsigned long cur_size; - - cur_size=strtoul(f4[2],NULL,10); -- sprintf(buf_size,"%'lu",cur_size); -+ sprintf(buf_size,"%lu",cur_size); - - ent_array[0]=f4[0]; - ent_array[1]=f4[1]; -@@ -3936,7 +3936,7 @@ static void second_level_add_newly_creat - char out_range[512]; - unsigned long lower, upper; - sscanf(f2[1],"[%lu;%lu]",&lower,&upper); -- sprintf(out_range,"[%'lu : %'lu]",lower,upper); -+ sprintf(out_range,"[%lu : %lu]",lower,upper); - - ent_array[0]=""; - ent_array[1]=f2[0]; -@@ -4050,7 +4050,7 @@ static void first_level_glst_end_fnc(Gtk - missing_bytes=gce_root->c.root.gdl_size-gce_root->c.root.received_bytes; - - spd_str=g_string_new(""); -- g_string_sprintf(spd_str,"%'15lu (%.2f%%) ",gce_root->c.root.received_bytes,100.0*(double)gce_root->c.root.received_bytes/(double)gce_root->c.root.gdl_size); -+ g_string_sprintf(spd_str,"%15lu (%.2f%%) ",gce_root->c.root.received_bytes,100.0*(double)gce_root->c.root.received_bytes/(double)gce_root->c.root.gdl_size); - - cur_size=gce_root->c.root.received_bytes-gce_root->c.root.byte_offset; /* number of bytes downloaded */ - duration=time(NULL)-gce_root->c.root.start_time; -@@ -4058,11 +4058,11 @@ static void first_level_glst_end_fnc(Gtk +@@ -4100,11 +4100,11 @@ static void first_level_glst_end_fnc(Gtk spd=(double)(gce_root->c.root.last_10sec_speed)/10.0; /* compute the speed of the last 10 seconds */ if(spd<1024.0) { @@ -100,12 +16,3 @@ $NetBSD: patch-ad,v 1.4 2002/11/03 21:32:25 wiz Exp $ } /* Estimated Time to Arrival computation: now (in second) + missing_bytes/spd */ -@@ -4145,7 +4145,7 @@ void glst_end_fnc(const GString *in) - unsigned long size_gdl=strtoul(k[2],NULL,10); - - /* remove an entry with the same gdl_id */ -- sprintf(buf_size,"%'lu",size_gdl); -+ sprintf(buf_size,"%lu",size_gdl); - - /* add a new entry in the root list */ - gce=new_gdl_ct_entry_as_root( strtoul(k[0],NULL,10), |