[med-svn] r19558 - in trunk/packages/seaview/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-07-07 14:32:28 +0000 (Tue, 07 Jul 2015)
New Revision: 19558

Added:
   trunk/packages/seaview/trunk/debian/patches/add_lib_dl.patch
   trunk/packages/seaview/trunk/debian/patches/work_around_fltk1.3.3.patch
Removed:
   trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch
Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/patches/series
Log:
New upstream version (requiring some patches)


Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2015-07-07 12:48:14 UTC (rev 19557)
+++ trunk/packages/seaview/trunk/debian/changelog	2015-07-07 14:32:28 UTC (rev 19558)
@@ -1,8 +1,8 @@
-seaview (1:4.5.4.4-1) UNRELEASED; urgency=medium
+seaview (1:4.5.4.4-1) unstable; urgency=medium
 
   * New upstream version
 
- -- Andreas Tille <tille at debian.org>  Mon, 06 Jul 2015 19:42:32 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 07 Jul 2015 16:20:43 +0200
 
 seaview (1:4.5.3.1-2) unstable; urgency=medium
 

Added: trunk/packages/seaview/trunk/debian/patches/add_lib_dl.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/add_lib_dl.patch	                        (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/add_lib_dl.patch	2015-07-07 14:32:28 UTC (rev 19558)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Updated: Tue, 07 Jul 2015 16:20:43 +0200
+Description: Add missing libraries
+
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@
+ CONFIG ?= fltk-config
+ PDF_PS_FLAGS ?= -DNO_PDF
+ 
+-EXTRALIBS = `$(CONFIG) --use-images --ldflags`
++EXTRALIBS = `$(CONFIG) --use-images --ldflags` -lz -lpthread -ldl
+ 
+ CC = gcc
+ CXX = g++

Modified: trunk/packages/seaview/trunk/debian/patches/series
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/series	2015-07-07 12:48:14 UTC (rev 19557)
+++ trunk/packages/seaview/trunk/debian/patches/series	2015-07-07 14:32:28 UTC (rev 19558)
@@ -1 +1,2 @@
-#use-dpkg-buildflags.patch
+work_around_fltk1.3.3.patch
+add_lib_dl.patch

Deleted: trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch	2015-07-07 12:48:14 UTC (rev 19557)
+++ trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch	2015-07-07 14:32:28 UTC (rev 19558)
@@ -1,15 +0,0 @@
-Description: Allow users to override CFLAGS.
-Last-Update: Thu, 20 Sep 2012 13:16:04 +0900
-Forwarded: Manolo Gouy <mgouy at biomserv.univ-lyon1.fr>
-
---- seaview-4.3.3.orig/Makefile
-+++ seaview-4.3.3/Makefile
-@@ -29,7 +29,7 @@
- #DEBUG = -g
- OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
- 
--CFLAGS  = $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
-+CFLAGS  += $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
- 
- 
- OBJECTS = seaview.o custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o \

Added: trunk/packages/seaview/trunk/debian/patches/work_around_fltk1.3.3.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/work_around_fltk1.3.3.patch	                        (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/work_around_fltk1.3.3.patch	2015-07-07 14:32:28 UTC (rev 19558)
@@ -0,0 +1,16 @@
+Author: Manolo Gouy <manolo.gouy at univ-lyon1.fr>
+Last-Update: Mon, 6 Jul 2015 22:15:22 -0400
+Forwarded-Upstream: yes (patch is actually provided by upstream)
+Description: Avoid functions that are new in fltk 1.3.3
+
+--- a/treedraw.cxx
++++ b/treedraw.cxx
+@@ -3096,7 +3096,7 @@ void print_plot(FD_nj_plot *fd_nj_plot,
+     myprinter->start_page();
+     fl_push_clip(title_rect_x, title_rect_y, title_rect_w, title_height);
+     char *p = fd_nj_plot->tree_name;
+-    if (!p) p = (char*)fd_nj_plot->panel->top_window()->label();
++    if (!p) p = (char*)fd_nj_plot->panel->window()->window()->label();
+     print_title(title_rect_x, title_rect_y + title_rect_h - 1, p,
+ 				  FL_TIMES, 10, page, fd_nj_plot->page_count);
+     fl_pop_clip();