[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-6-14-ga86a746
Anton Gladky
gladky.anton at gmail.com
Tue May 8 17:23:25 UTC 2012
The following commit has been merged in the master branch:
commit dd6645e540897f626ebe5ebc1c4ce005d64b302f
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue May 8 19:20:13 2012 +0200
Fix cairolatex driver with monochrome keyword. (Closes: #668339)
diff --git a/debian/patches/11_fix_cairolatex_monochrome.patch b/debian/patches/11_fix_cairolatex_monochrome.patch
new file mode 100644
index 0000000..7e33574
--- /dev/null
+++ b/debian/patches/11_fix_cairolatex_monochrome.patch
@@ -0,0 +1,41 @@
+Description: Fix cairolatex driver with monochrome keyword
+Author: sfeam
+Reviewed-By: Anton Gladky <gladky.anton at gmail.com>
+Bug-Debian: http://bugs.debian.org/668339
+Applied-Upstream: http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/term/pslatex.trm?r1=1.80.2.1&r2=1.80.2.2&sortby=file
+Applied-Upstream: http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/term/cairo.trm?r1=1.51.2.2&r2=1.51.2.3&sortby=file
+Last-Update: 2012-05-08
+
+--- a/term/cairo.trm
++++ b/term/cairo.trm
+@@ -1259,7 +1259,7 @@
+ 1 /* vtic */ , 1 /* htic */ ,
+ cairotrm_options, cairotrm_init, cairotrm_reset, cairotrm_text, null_scale, cairotrm_graphics,
+ cairotrm_move, cairotrm_vector,
+- EPSLATEX_linetype, EPSLATEX_put_text,
++ cairotrm_linetype, EPSLATEX_put_text,
+ PS_text_angle, PS_justify_text,
+ cairotrm_point, do_arrow, cairotrm_set_font,
+ cairotrm_pointsize,
+--- a/term/pslatex.trm
++++ b/term/pslatex.trm
+@@ -129,7 +129,6 @@
+ /* support for cairolatex */
+ #ifdef HAVE_CAIROPDF
+ #define ISCAIROTERMINAL ((strcmp(term->name, "cairolatex") == 0))
+-TERM_PUBLIC void cairotrm_linetype __PROTO ((int linetype));
+ TERM_PUBLIC void cairotrm_set_color __PROTO ((t_colorspec *colorspec));
+ #else
+ #define ISCAIROTERMINAL (FALSE)
+@@ -886,11 +885,6 @@
+ {
+ t_colorspec tempcol = {TC_LT, 0, 0.0};
+ tempcol.lt = linetype;
+-#ifdef HAVE_CAIROPDF
+- if (ISCAIROTERMINAL)
+- cairotrm_linetype(linetype);
+- else
+-#endif
+ PS_linetype(linetype);
+
+ /* This leads to redundant *.eps output */
diff --git a/debian/patches/series b/debian/patches/series
index 206409a..3cf25a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
08_do_not_set_qt_default_term.patch
09_fix_typo_qt_terminal.patch
10_fix_batch_mode_stop.patch
+11_fix_cairolatex_monochrome.patch
--
Gnuplot. Interactive plotting program
More information about the debian-science-commits
mailing list