[gnuplot5] 03/04: Remove patch, applied by upstrem.
Anton Gladky
gladk at moszumanska.debian.org
Mon Feb 22 21:39:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot5.
commit 29a7ef25168ee7a41e6d992dbd5b79563bc96f92
Author: Anton Gladky <gladk at debian.org>
Date: Mon Feb 22 18:59:04 2016 +0100
Remove patch, applied by upstrem.
---
debian/patches/15_fix_format_not_a_string.patch | 188 ------------------------
debian/patches/series | 1 -
2 files changed, 189 deletions(-)
diff --git a/debian/patches/15_fix_format_not_a_string.patch b/debian/patches/15_fix_format_not_a_string.patch
deleted file mode 100644
index 68dfd54..0000000
--- a/debian/patches/15_fix_format_not_a_string.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-Description: Fix format not a string error.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-02-08
-
-Index: gnuplot-5.0.3/term/tkcanvas.trm
-===================================================================
---- gnuplot-5.0.3.orig/term/tkcanvas.trm
-+++ gnuplot-5.0.3/term/tkcanvas.trm
-@@ -951,17 +951,17 @@ TK_flush_line(void)
- */
- /* prepare the binding mechanism */
- if (tk_interactive && !is_3d_plot)
-- fprintf(gpoutfile, tk_bind_init[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_bind_init[tk_script_language]);
-
- /* draw a line segment */
-- fprintf(gpoutfile, tk_line_segment_start[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_line_segment_start[tk_script_language]);
- for (i = 0; i < tk_polygon_points; i++)
- fprintf(gpoutfile, tk_poly_point[tk_script_language], tk_path_x[i], tk_path_y[i]);
- fprintf(gpoutfile, tk_line_segment_opt[tk_script_language], tk_color, tk_linewidth,
- tk_rounded ? "round" : "butt", tk_rounded ? "round" : "miter");
- if (tk_dashpattern[0] != NUL)
- fprintf(gpoutfile, tk_line_segment_dash[tk_script_language], tk_dashpattern);
-- fprintf(gpoutfile, tk_line_segment_end[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_line_segment_end[tk_script_language]);
-
- /* finish the binding mechanism
- * (which calls 'gnuplot_xy' for the line segment pointed to by
-@@ -984,28 +984,28 @@ TK_flush_line(void)
- TK_REAL_VALUE(TK_X_VALUE(0.5 * (x + tk_lastx)),
- FIRST_X_AXIS));
- else
-- fprintf(gpoutfile, tk_bind_nil[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_bind_nil[tk_script_language]);
- if (axis_array[FIRST_Y_AXIS].log)
- fprintf(gpoutfile, tk_bind_f[tk_script_language],
- TK_REAL_VALUE(TK_Y_VALUE(0.5 * (y + tk_lasty)),
- FIRST_Y_AXIS));
- else
-- fprintf(gpoutfile, tk_bind_nil[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_bind_nil[tk_script_language]);
- if (axis_array[SECOND_X_AXIS].log)
- fprintf(gpoutfile, tk_bind_f[tk_script_language],
- TK_REAL_VALUE(TK_X_VALUE(0.5 * (x + tk_lastx)),
- SECOND_X_AXIS));
- else
-- fprintf(gpoutfile, tk_bind_nil[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_bind_nil[tk_script_language]);
- if (axis_array[SECOND_Y_AXIS].log)
- fprintf(gpoutfile, tk_bind_f[tk_script_language],
- TK_REAL_VALUE(TK_Y_VALUE(0.5 * (y + tk_lasty)),
- SECOND_Y_AXIS));
- else
-- fprintf(gpoutfile, tk_bind_nil[tk_script_language]);
-- fprintf(gpoutfile, tk_bind_end[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_bind_nil[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_bind_end[tk_script_language]);
- } else {
-- fprintf(gpoutfile, tk_nobind[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_nobind[tk_script_language]);
- }
- tk_polygon_points = 0;
- tk_in_path = FALSE;
-@@ -1157,14 +1157,14 @@ TK_put_noenhanced_text(unsigned int x, u
- fprintf(gpoutfile, tk_create_text_begin[tk_script_language],
- x, y, quoted_str, tk_color, tk_anchor);
- if (tk_next_text_use_font) {
-- fprintf(gpoutfile, tk_create_text_font[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_create_text_font[tk_script_language]);
- tk_next_text_use_font = FALSE;
- }
- if (tk_angle != 0)
- fprintf(gpoutfile, tk_create_text_angle[tk_script_language], tk_angle);
- if (tk_boxed)
- fprintf(gpoutfile, tk_tag[tk_script_language], "boxedtext");
-- fprintf(gpoutfile, tk_create_text_end[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_create_text_end[tk_script_language]);
-
- if (quoted_str != str)
- free(quoted_str);
-@@ -1294,9 +1294,9 @@ TK_set_font(const char *font)
- if (size > 0)
- fprintf(gpoutfile, tk_set_fsize[tk_script_language], size);
- if (isbold)
-- fprintf(gpoutfile, tk_set_fbold[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_set_fbold[tk_script_language]);
- if (isitalic)
-- fprintf(gpoutfile, tk_set_fitalic[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_set_fitalic[tk_script_language]);
- fputs(tk_font_end[tk_script_language], gpoutfile);
- tk_next_text_use_font = TRUE;
-
-@@ -1344,9 +1344,9 @@ TK_enhanced_open(char *fontname, double
- if (fontsize > 0)
- fprintf(gpoutfile, tk_set_fsize[tk_script_language], (int) (fontsize));
- if (isbold)
-- fprintf(gpoutfile, tk_set_fbold[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_set_fbold[tk_script_language]);
- if (isitalic)
-- fprintf(gpoutfile, tk_set_fitalic[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_set_fitalic[tk_script_language]);
- fputs(tk_font_end[tk_script_language], gpoutfile);
- tk_next_text_use_font = TRUE;
- free(family);
-@@ -1408,14 +1408,14 @@ TK_enhanced_flush()
- fprintf(gpoutfile, tk_enhanced_text_begin[tk_script_language],
- "xenh", "yenh", str, tk_color, tk_anchor);
- if (tk_next_text_use_font) {
-- fprintf(gpoutfile, tk_create_text_font[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_create_text_font[tk_script_language]);
- tk_next_text_use_font = FALSE;
- }
- if (!tk_boxed)
- fprintf(gpoutfile, tk_tag[tk_script_language], "enhancedtext");
- else
- fprintf(gpoutfile, tk_tag[tk_script_language], "boxedtext");
-- fprintf(gpoutfile, tk_enhanced_text_end[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_enhanced_text_end[tk_script_language]);
-
- if (!tk_enhanced_widthflag)
- /* don't update position */
-@@ -1594,7 +1594,7 @@ void TK_arrow(unsigned int usx, unsigned
- if (curr_arrow_headfilled >= AS_FILLED) { /* AS_FILLED, AS_NOBORDER */
- assert(abs(head) <= BOTH_HEADS);
-
-- fprintf(gpoutfile, tk_line_segment_start[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_line_segment_start[tk_script_language]);
- fprintf(gpoutfile, tk_poly_point[tk_script_language], sx, TK_YMAX - sy);
- fprintf(gpoutfile, tk_poly_point[tk_script_language], ex, TK_YMAX - ey);
- fprintf(gpoutfile, tk_line_segment_opt[tk_script_language], tk_color, tk_linewidth,
-@@ -1629,8 +1629,8 @@ void TK_arrow(unsigned int usx, unsigned
- }
- if (tk_dashpattern[0] != NUL)
- fprintf(gpoutfile, tk_line_segment_dash[tk_script_language], tk_dashpattern);
-- fprintf(gpoutfile, tk_line_segment_end[tk_script_language]);
-- fprintf(gpoutfile, tk_nobind[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_line_segment_end[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_nobind[tk_script_language]);
- } else { /* AS_NOFILL, AS_EMPTY */
- /* fall back to internal routine since we cannot do non-filled arrows */
- do_arrow(sx, sy, ex, ey, head);
-@@ -1822,7 +1822,7 @@ TK_text()
- */
-
- TK_flush_line();
-- fprintf(gpoutfile, tk_endblock[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_endblock[tk_script_language]);
- if (!is_3d_plot)
- fprintf(gpoutfile, tk_info_procs[tk_script_language],
- plot_bounds.xleft, plot_bounds.xright, TK_YMAX - plot_bounds.ytop, TK_YMAX - plot_bounds.ybot,
-@@ -1957,7 +1957,7 @@ TK_filled_polygon(int points, gpiPoint *
- if ((points > 2) && (corners[0].x == corners[points-1].x) && (corners[0].y == corners[points-1].y))
- points--;
-
-- fprintf(gpoutfile, tk_poly_begin[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_poly_begin[tk_script_language]);
- for (i = 0; i < points; i++)
- fprintf(gpoutfile, tk_poly_point[tk_script_language], corners[i].x, TK_YMAX - corners[i].y);
- fprintf(gpoutfile, tk_poly_end[tk_script_language], tk_color);
-@@ -1977,15 +1977,15 @@ TK_path(int p)
-
- FPRINTF((stderr, "tkcanvas: closepath: %i points\n", tk_polygon_points));
- if (tk_polygon_points > 1) {
-- fprintf(gpoutfile, tk_line_segment_start[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_line_segment_start[tk_script_language]);
- for (i = 0; i < tk_polygon_points; i++)
- fprintf(gpoutfile, tk_poly_point[tk_script_language], tk_path_x[i], tk_path_y[i]);
- fprintf(gpoutfile, tk_line_segment_opt[tk_script_language], tk_color, tk_linewidth,
- tk_rounded ? "round" : "butt", tk_rounded ? "round" : "miter");
- if (tk_dashpattern[0] != NUL)
- fprintf(gpoutfile, tk_line_segment_dash[tk_script_language], tk_dashpattern);
-- fprintf(gpoutfile, tk_line_segment_end[tk_script_language]);
-- fprintf(gpoutfile, tk_nobind[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_line_segment_end[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_nobind[tk_script_language]);
- }
- tk_in_path = FALSE;
- tk_polygon_points = 0;
-@@ -2088,7 +2088,7 @@ TK_boxed_text(unsigned int x, unsigned i
- fprintf(gpoutfile, tk_box[tk_script_language], "", "black");
- /* fall through, this also ends text box mode */
- case TEXTBOX_FINISH:
-- fprintf(gpoutfile, tk_box_finish[tk_script_language]);
-+ fprintf(gpoutfile, "%s", tk_box_finish[tk_script_language]);
- tk_boxed = FALSE;
- break;
- case TEXTBOX_MARGINS:
diff --git a/debian/patches/series b/debian/patches/series
index 14c52e0..519eb43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
10_removepicins.patch
11_fix_linkage_wx.patch
12_info.patch
-15_fix_format_not_a_string.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git
More information about the debian-science-commits
mailing list