Nilesh Patra pushed to branch master at Debian Med / seaview
Commits: d002f59c by Nilesh Patra at 2020-09-19T15:52:00+05:30 routine-update: Ready to upload to unstable - - - - - d262236e by Nilesh Patra at 2020-09-19T15:59:22+05:30 New upstream version 5.0.4 - - - - - f9794281 by Nilesh Patra at 2020-09-19T15:59:24+05:30 Update upstream source from tag 'upstream/5.0.4' Update to upstream version '5.0.4' with Debian dir 8240aea9c97e162cdc544a6f17159928a5334109 - - - - - 3b0c1998 by Nilesh Patra at 2020-09-19T16:02:02+05:30 Update changelog - - - - - 7 changed files: - csrc/zsockr.c - debian/changelog - macos_extras.mm - seaview.html - svg.cxx - treerecs_draw.cxx - unrooted.cxx Changes: ===================================== csrc/zsockr.c ===================================== @@ -1,9 +1,10 @@ /* functions to handle zlib-compressed data read from socket */ +#include <stdio.h>//essai +#include <stdlib.h>//essai #include <zlib.h> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +//#include <stdio.h> #include <string.h> #ifdef WIN32 #include <winsock.h> ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +seaview (1:5.0.4-1) unstable; urgency=medium + + * Team Upload. + * New upstream version 5.0.4 + + -- Nilesh Patra <[email protected]> Sat, 19 Sep 2020 15:59:30 +0530 + +seaview (1:5.0.2-4) unstable; urgency=medium + + * Team upload. + + -- Nilesh Patra <[email protected]> Sat, 19 Sep 2020 15:52:00 +0530 + seaview (1:5.0.2-3) unstable; urgency=medium * Team Upload. ===================================== macos_extras.mm ===================================== @@ -179,12 +179,20 @@ char *mac_GetOutputFName_Plus(const char *dfault, const char *message, int use_o //run panel NSWindow *key = [NSApp keyWindow]; int retval; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 // MAC_OS_X_VERSION_10_6 if (fl_mac_os_version >= 100600) { - if (dir) [_panel performSelector:@selector(setDirectoryURL:) withObject:[NSURL fileURLWithPath:dir]]; - if (fname) [_panel performSelector:@selector(setNameFieldStringValue:) withObject:fname]; - retval = [_panel runModal]; + if (dir) [_panel setDirectoryURL:[NSURL fileURLWithPath:dir]]; + if (fname) [_panel setNameFieldStringValue:fname]; + __block NSInteger complete = -1; + [_panel beginSheetModalForWindow:key completionHandler:^(NSInteger returnCode) { + complete = returnCode; // this block runs after OK or Cancel was triggered in file dialog + }]; // this message returns immediately and begins the file dialog as a sheet + while (complete < 0) Fl::wait(100); // loop until end of file dialog + retval = complete; } - else { + else +#endif + { retval = [(id)_panel runModalForDirectory:dir file:fname]; } [key makeKeyWindow]; ===================================== seaview.html ===================================== @@ -44,11 +44,11 @@ Molecular Biology and Evolution 27(2):221-224. SEAVIEW and PHYLO_WIN: two graphic tools for sequence alignment and molecular phylogeny.</a> Comput. Appl. Biosci., 12:543-548. <p> -Version 5.0.1 +Version 5.0.4 <p>Binaries and full source code available from <a href=http://doua.prabi.fr/software/seaview>http://doua.prabi.fr/software/seaview</a> -<p>© 1996-2018 Manolo Gouy +<p>© 1996-2020 Manolo Gouy <br>Laboratoire de Biométrie et Biologie Evolutive <br>CNRS / Université de Lyon <p>Licensed under the GNU <a href=http://www.gnu.org/licenses/gpl.txt>General Public Licence</a>. ===================================== svg.cxx ===================================== @@ -221,7 +221,7 @@ void svg_tree_dialog_and_save(FD_nj_plot *fd_nj_plot) { Fl_Native_File_Chooser *chooser = new Fl_Native_File_Chooser(Fl_Native_File_Chooser::BROWSE_SAVE_FILE); chooser->title("Enter SVG filename"); - chooser->filter("SVG Files\t*.{svg}"); + chooser->filter("SVG Files\t*.svg"); char tmp[100]; strcpy(tmp, extract_filename(fd_nj_plot->tree_name)); char *p = strrchr(tmp, '.'); if(p != NULL) *p = 0; ===================================== treerecs_draw.cxx ===================================== @@ -1017,9 +1017,10 @@ int copyfile(const char *to, const char *from) void save_svg_file_callback(Fl_Widget *ob, void *data) { SVG_View_data* svg_data = (SVG_View_data*)data; - Fl_Native_File_Chooser* chooser = new Fl_Native_File_Chooser(); + Fl_Native_File_Chooser* chooser = new Fl_Native_File_Chooser(Fl_Native_File_Chooser::BROWSE_SAVE_FILE); chooser->title("Save file"); - chooser->type(Fl_Native_File_Chooser::BROWSE_SAVE_FILE); + chooser->options(Fl_Native_File_Chooser::USE_FILTER_EXT | chooser->options()); + chooser->filter("SVG files\t*.svg"); const char* filename = run_and_close_native_file_chooser(chooser); if(filename != NULL and strcmp(filename, "") != 0) { ===================================== unrooted.cxx ===================================== @@ -460,7 +460,8 @@ void print_unrooted(FD_unrooted *fd_unrooted, const char *name, bool to_ps_file, if (to_ps_file) ((Fl_PDF_File_Device*)myprinter)->surface_try(&jbuf); if ( (!to_ps_file) || setjmp(*jbuf) == 0) { // replaces PDF_TRY #endif - myprinter->start_page(); + if (to_ps_file) ((Fl_PDF_or_PS_File_Device*)myprinter)->start_page(); + else myprinter->start_page(); fd_unrooted->previous_w = fd_unrooted->previous_h = 0; myprinter->printable_rect( &fd_unrooted->w, &fd_unrooted->h); fd_unrooted->x = fd_unrooted->y = 0; View it on GitLab: https://salsa.debian.org/med-team/seaview/-/compare/d38044a712d908e9647300f29c1fb51c4b49f404...3b0c1998ab339b7a9255540c8c26fde203fd1af9 -- View it on GitLab: https://salsa.debian.org/med-team/seaview/-/compare/d38044a712d908e9647300f29c1fb51c4b49f404...3b0c1998ab339b7a9255540c8c26fde203fd1af9 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
