From 3c5285ac94a90e5b5d29fda9ca87688d07355c10 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 20 Dec 2008 14:36:28 +0100 Subject: [PATCH] debian/patches: Removed bts493553-pango-utf-8. This patch is now included upstream. --- debian/changelog | 3 ++- debian/patches/bts493553-pango-utf-8 | 34 ---------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 debian/patches/bts493553-pango-utf-8 diff --git a/debian/changelog b/debian/changelog index bec6892..69d3f5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ rrdtool (1.3.5-1) unstable; urgency=low - Updated bts428778-floating-point-exception to apply to the latest version of rrdtool; use rrd_free2() instead of rrd_free() to not leak memory. + - Removed bts493553-pango-utf-8 - included upstream. - -- Sebastian Harl Sat, 20 Dec 2008 14:32:12 +0100 + -- Sebastian Harl Sat, 20 Dec 2008 14:36:01 +0100 rrdtool (1.3.1-4) unstable; urgency=high diff --git a/debian/patches/bts493553-pango-utf-8 b/debian/patches/bts493553-pango-utf-8 deleted file mode 100644 index f016688..0000000 --- a/debian/patches/bts493553-pango-utf-8 +++ /dev/null @@ -1,34 +0,0 @@ -diff a/src/rrd_gfx.c b/src/rrd_gfx.c ---- a/src/rrd_gfx.c -+++ b/src/rrd_gfx.c -@@ -133,6 +133,8 @@ static PangoLayout *gfx_prep_text( - long tab_shift = fmod(x, tabwidth); - int border = im->text_prop[TEXT_PROP_LEGEND].size * 2.0; - -+ gchar *utf8_text; -+ - PangoTabArray *tab_array; - PangoContext *pango_context; - -@@ -156,10 +158,19 @@ static PangoLayout *gfx_prep_text( - font_desc = pango_font_description_from_string(font); - pango_font_description_set_size(font_desc, size * PANGO_SCALE); - pango_layout_set_font_description(layout, font_desc); -+ -+ /* pango expects the string to be utf-8 encoded */ -+ utf8_text = g_locale_to_utf8((const gchar *)text, -1, NULL, NULL, NULL); -+ -+ /* In case of an error, i.e. utf8_text == NULL (locale settings messed -+ * up?), we fall back to a possible "invalid UTF-8 string" warning instead -+ * of provoking a failed assertion in libpango. */ - if (im->with_markup) -- pango_layout_set_markup(layout, text, -1); -+ pango_layout_set_markup(layout, utf8_text ? utf8_text : text, -1); - else -- pango_layout_set_text(layout, text, -1); -+ pango_layout_set_text(layout, utf8_text ? utf8_text : text, -1); -+ -+ g_free(utf8_text); - return layout; - } - diff --git a/debian/patches/series b/debian/patches/series index 9d1b116..7c87e23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ bts428778-floating-point-exception -bts493553-pango-utf-8 setup.py-module-name no-rpath-for-ruby no-rpath-for-perl -- 2.30.2