Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > 453115ca82c001fd455cedf88baf9e99 > files > 1

seaview-4.2.2-2.fc13.src.rpm

diff -up seaview/Makefile.chris seaview/Makefile
--- seaview/Makefile.chris	2009-05-26 23:35:00.000000000 +0200
+++ seaview/Makefile	2010-01-08 19:01:35.279746382 +0100
@@ -1,6 +1,6 @@
 #For Debian compilation, uncomment the 2 lines below 
-#HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\"
-#PHYMLNAME= -DPHYMLNAME=\"phyml\"
+HELPFILE= -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\"
+PHYMLNAME= -DPHYMLNAME=\"phyml\"
 
 
 #to compile with PDF (through PDFlib Lite) rather than PostScript output, 
@@ -23,13 +23,14 @@ PDF_PS = postscript
 #to use with FLTK without libXft, comment out the next line
 USE_XFT = -DUSE_XFT -I/usr/include/freetype2
 
-EXTRALIBS= -lXft -lXext -ljpeg -lpng $(LPDF)
+EXTRALIBS= -lXft -lfontconfig -lXext $(LPDF)
 
 CXX = g++
 CSRC = csrc
 
 #DEBUG = -g
-OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
+#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
+OPT = $(RPM_OPT_FLAGS)
 
 CFLAGS  = $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
 
diff -up seaview/seaview.cxx.chris seaview/seaview.cxx
--- seaview/seaview.cxx.chris	2010-01-08 19:06:38.821913203 +0100
+++ seaview/seaview.cxx	2010-01-08 19:06:59.651787543 +0100
@@ -3906,7 +3906,8 @@ if(doing_dnd) {
 	}
 
 if( clipboard_contains_alignment(clipboard) ) {
-	char **seqs, **seqnames, **comments, *p, *message; 
+	char **seqs, **seqnames, **comments, *message; 
+	const char *p;
 	int i, count, num, changedwname = FALSE;
 	p = (char*)strchr(clipboard, ':') + 1;
 	count = read_mase_seqs_header(p, &seqs, &seqnames, 
diff -up seaview/use_mase_files.cxx.chris seaview/use_mase_files.cxx
--- seaview/use_mase_files.cxx.chris	2010-01-04 15:03:28.000000000 +0100
+++ seaview/use_mase_files.cxx	2010-01-08 19:05:14.618421352 +0100
@@ -1543,7 +1543,7 @@ extern "C" { 
 static char seaview_prog_dir[200] = "";
 void inform_prog_dir(const char *arg0)
 {
-char *p;
+const char *p;
 if((p = (char*)strrchr(arg0, '/')) != NULL) {
 	memcpy(seaview_prog_dir, arg0, p - arg0 + 1);
 	seaview_prog_dir[p - arg0 + 1] = 0;