unblock-udeb pango1.0/1.40.5-1
Hi KiBi,
I would like to unblock pango1.0/1.40.5-1 and is therefore asking for a
d-i ack on this.
The changes upstream are described below in summary:
--- pango1.0-1.40.4/NEWS 2017-02-27 20:03:43.000000000 +0000
+++ pango1.0-1.40.5/NEWS 2017-04-08 17:47:58.000000000 +0000
@@ -1,3 +1,10 @@
+Overview of changes between 1.40.4 and 1.40.5
+=============================================
+- Add missing introspection annotations (#778663)
+- Fix line-end handling in pango_read_line (#778816)
+- Make alpha attribute work without color (#773767)
+- win32: Enable rendering colored texti and underlines (#768779)
Attached is a filtered debdiff removing some autogenerated files and
some win32 only files. Generated with:
filterdiff -x '*/docs/*' -x '*/win32/*' -x '*/aclocal.m4' \
-x '*/config.h.win32' -x '*/configure' -x '*/pangowin32.*'
Thanks,
~Niels
diff -Nru pango1.0-1.40.4/ChangeLog pango1.0-1.40.5/ChangeLog
--- pango1.0-1.40.4/ChangeLog 2017-02-27 20:20:39.000000000 +0000
+++ pango1.0-1.40.5/ChangeLog 2017-04-08 17:55:01.000000000 +0000
@@ -1,3 +1,206 @@
+commit 6c5d1d35061a91c3c0792f7720da3f8308ebff65
+Author: Matthias Clasen <mclasen@redhat.com>
+Date: Sat Apr 8 13:48:25 2017 -0400
+
+ 1.40.5
+
+ NEWS | 7 +++++++
+ configure.ac | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+commit 5188156587cc388b86962fb43815a303448aeb64
+Author: Matthias Clasen <mclasen@redhat.com>
+Date: Sat Apr 8 00:58:58 2017 -0400
+
+ Avoid a compiler warning
+
+ The compiler complains that rightmost_space may be used
+ uninitialized. And it may be right.
+
+ pango/pango-layout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7fc77e1c5a9b04da172d032f8d1a2bd04a1c92a1
+Author: Philip Withnall <withnall@endlessm.com>
+Date: Wed Feb 15 11:06:36 2017 +0000
+
+ docs: Fix some introspection annotation syntax
+
+ Signed-off-by: Philip Withnall <withnall@endlessm.com>
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=778663
+
+ pango/pango-engine.h | 4 ++--
+ pango/pango-layout.h | 2 +-
+ pango/pangofc-fontmap.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 6df7fcde9cde8c808344cd7242b0492e92ec10f1
+Author: Philip Withnall <withnall@endlessm.com>
+Date: Wed Feb 15 11:06:03 2017 +0000
+
+ docs: Add (skip) annotation to some non-introspectable deprecated
+ funcs
+
+ To make it a bit more explicit that there窶冱 no need to worry about
+ introspecting them.
+
+ Signed-off-by: Philip Withnall <withnall@endlessm.com>
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=778663
+
+ pango/modules.c | 4 ++--
+ pango/pango-engine.h | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 9ab6ddd41723e0f0f8f0d57ca6bb37763c910d3c
+Author: Philip Withnall <withnall@endlessm.com>
+Date: Wed Feb 15 11:05:27 2017 +0000
+
+ docs: Add a few missing (transfer) annotations
+
+ This should fix a few scanner warnings, but this is not an attempt to
+ fix them all.
+
+ Signed-off-by: Philip Withnall <withnall@endlessm.com>
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=778663
+
+ pango/fonts.c | 2 +-
+ pango/pangoft2-fontmap.c | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 6f0648043fe2a084db15a6cdded8402625676aef
+Author: Philip Withnall <withnall@endlessm.com>
+Date: Fri Feb 17 09:27:36 2017 +0000
+
+ pango-utils: Fix non-escaped \r\n line endings in pango_read_line()
+
+ The handling for \r or \r\n line endings in pango_read_line() was
+ broken. It should have discarded the \r or \r\n, but was only
+ doing this
+ for \n or \n\r. The condition (c == EOF) could never have been
+ reached.
+
+ Coverity ID: 1391696
+
+ Signed-off-by: Philip Withnall <withnall@endlessm.com>
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=778816
+
+ pango/pango-utils.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 97fc6fbffe65d9ca4e92fc8979808faebed0ee35
+Author: Matthias Clasen <mclasen@redhat.com>
+Date: Fri Apr 7 22:49:00 2017 -0400
+
+ attributes: Make alpha work without color
+
+ Improve the behavior of the cairo renderer to take
+ alpha into account even if no color specified.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=773767
+
+ pango/pangocairo-render.c | 37 +++++++++++++++++++++++++++++--------
+ 1 file changed, 29 insertions(+), 8 deletions(-)
+
+commit bab5cf24b746527020f51548e020c410dee63f71
+Author: Nicolas Hake <nh@nosebud.de>
+Date: Mon Jul 11 14:27:08 2016 +0200
+
+ Win32: Remove "uncolored" from docs
+
+ Since win32_render_layout and win32_render_layout_line now support
+ rendering in color, that word no longer applies.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=768679
+
+ pango/pangowin32.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 8de443dd9f426c325673d029786618da9476f6a0
+Author: Nicolas Hake <nh@nosebud.de>
+Date: Mon Jul 11 13:27:31 2016 +0200
+
+ Win32: Fix background rect bounds
+
+ Rectangle() uses x1, y1, x2, y2 coordinates instead of x, y, w, h. Fix
+ the coordinates passed to the function so it draws the background
+ in the
+ correct location.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=768679
+
+ pango/pangowin32.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 3166cbf809d5b005b587319ee2ef3e73e00d466e
+Author: Nicolas Hake <nh@nosebud.de>
+Date: Mon Jul 11 13:26:44 2016 +0200
+
+ Win32: Draw background box in correct color
+
+ Adding 128 to the component value would overflow in colors with full
+ brightness and set the component to 0.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=768679
+
+ pango/pangowin32.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+commit 72e16506d6bd43efe4db24ebc3f69537f7208b1a
+Author: Nicolas Hake <nh@nosebud.de>
+Date: Mon Jul 11 13:22:05 2016 +0200
+
+ Win32: Reset BkMode so ETO doesn't draw its own
+
+ If the DC's background mode is set to OPAQUE, ExtTextOut will draw its
+ own background boxes around glyph items. Since we don't place any
+ requirements on the DC, set the background mode to TRANSPARENT before
+ rendering any glyphs (and reset it to its original value afterwards).
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=768679
+
+ pango/pangowin32.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit f7927ff53afb8bbfdf7cc8f7b621c811f53ac6c5
+Author: Nicolas Hake <nh@nosebud.de>
+Date: Mon Jul 11 13:20:41 2016 +0200
+
+ Win32: Enable colored underline drawing
+
+ Underline drawing was using the pen selected into DC before
+ pango_win32_render_layout_line was called. Since layout allow the
+ user to
+ select underline colors, we have to create a temporary pen in
+ the correct
+ color before drawing it.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=768679
+
+ pango/pangowin32.c | 35 ++++++++++++++++++++++++++++++++---
+ 1 file changed, 32 insertions(+), 3 deletions(-)
+
+commit bb774bce7f99e839851834c1688c12d898f9c5ab
+Author: Nicolas Hake <nh@nosebud.de>
+Date: Mon Jul 11 13:03:32 2016 +0200
+
+ Win32: Enable rendering colored text
+
+ Increasing the component values by 128 may overflow and result in that
+ component being treated as 0. Additionally, using a brush to
+ color text
+ is wrong; ExtTextOut instead uses the color set by SetTextColor
+ to draw
+ glyphs.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=768679
+
+ pango/pangowin32.c | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
commit 43b9668ba688b01553abb7b453aeb206d7fd56fa
Author: Matthias Clasen <mclasen@redhat.com>
Date: Mon Feb 27 15:03:59 2017 -0500
diff -Nru pango1.0-1.40.4/configure.ac pango1.0-1.40.5/configure.ac
--- pango1.0-1.40.4/configure.ac 2017-02-27 20:03:54.000000000 +0000
+++ pango1.0-1.40.5/configure.ac 2017-04-08 17:48:10.000000000 +0000
@@ -22,7 +22,7 @@
dnl The triplet
m4_define([pango_version_major], [1])
m4_define([pango_version_minor], [40])
-m4_define([pango_version_micro], [4])
+m4_define([pango_version_micro], [5])
m4_define([pango_version],
[pango_version_major.pango_version_minor.pango_version_micro])
diff -Nru pango1.0-1.40.4/debian/changelog pango1.0-1.40.5/debian/changelog
--- pango1.0-1.40.4/debian/changelog 2017-02-28 18:59:30.000000000 +0000
+++ pango1.0-1.40.5/debian/changelog 2017-04-08 23:12:25.000000000 +0000
@@ -1,3 +1,9 @@
+pango1.0 (1.40.5-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org> Sun, 09 Apr 2017 01:12:25 +0200
+
pango1.0 (1.40.4-1) unstable; urgency=medium
* New upstream release.
diff -Nru pango1.0-1.40.4/NEWS pango1.0-1.40.5/NEWS
--- pango1.0-1.40.4/NEWS 2017-02-27 20:03:43.000000000 +0000
+++ pango1.0-1.40.5/NEWS 2017-04-08 17:47:58.000000000 +0000
@@ -1,3 +1,10 @@
+Overview of changes between 1.40.4 and 1.40.5
+=============================================
+- Add missing introspection annotations (#778663)
+- Fix line-end handling in pango_read_line (#778816)
+- Make alpha attribute work without color (#773767)
+- win32: Enable rendering colored texti and underlines (#768779)
+
Overview of changes between 1.40.3 and 1.40.4
=============================================
- Fix some Coverity findings (#778601, #778602, #778654, #778656)
diff -Nru pango1.0-1.40.4/pango/fonts.c pango1.0-1.40.5/pango/fonts.c
--- pango1.0-1.40.4/pango/fonts.c 2016-10-22 05:00:40.000000000 +0000
+++ pango1.0-1.40.5/pango/fonts.c 2017-04-08 04:57:28.000000000 +0000
@@ -1549,7 +1549,7 @@
* Finds the best matching shaper for a font for a particular
* language tag and character point.
*
- * Return value: the best matching shaper.
+ * Return value: (transfer none): the best matching shaper.
**/
PangoEngineShape *
pango_font_find_shaper (PangoFont *font,
diff -Nru pango1.0-1.40.4/pango/modules.c pango1.0-1.40.5/pango/modules.c
--- pango1.0-1.40.4/pango/modules.c 2016-10-22 05:00:40.000000000 +0000
+++ pango1.0-1.40.5/pango/modules.c 2017-04-08 04:57:28.000000000 +0000
@@ -52,7 +52,7 @@
}
/**
- * pango_map_get_engine:
+ * pango_map_get_engine: (skip)
* @map: a #PangoMap
* @script: a #PangoScript
*
@@ -70,7 +70,7 @@
}
/**
- * pango_map_get_engines:
+ * pango_map_get_engines: (skip)
* @map: a #PangoMap
* @script: a #PangoScript
* @exact_engines: location to store list of engines that exactly
diff -Nru pango1.0-1.40.4/pango/pangocairo.rc pango1.0-1.40.5/pango/pangocairo.rc
--- pango1.0-1.40.4/pango/pangocairo.rc 2017-02-27 20:17:16.000000000 +0000
+++ pango1.0-1.40.5/pango/pangocairo.rc 2017-04-08 17:53:06.000000000 +0000
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,40,4,0
- PRODUCTVERSION 1,40,4,0
+ FILEVERSION 1,40,5,0
+ PRODUCTVERSION 1,40,5,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoCairo"
- VALUE "FileVersion", "1.40.4.0"
+ VALUE "FileVersion", "1.40.5.0"
VALUE "InternalName", "pangocairo-1.0-0"
VALUE "LegalCopyright", "Copyright ｩ 2010 Red Hat Software."
VALUE "OriginalFilename", "pangocairo-1.0-0.dll"
VALUE "ProductName", "PangoCairo"
- VALUE "ProductVersion", "1.40.4"
+ VALUE "ProductVersion", "1.40.5"
END
END
BLOCK "VarFileInfo"
diff -Nru pango1.0-1.40.4/pango/pangocairo-render.c pango1.0-1.40.5/pango/pangocairo-render.c
--- pango1.0-1.40.4/pango/pangocairo-render.c 2016-10-22 05:00:36.000000000 +0000
+++ pango1.0-1.40.5/pango/pangocairo-render.c 2017-04-08 04:43:42.000000000 +0000
@@ -191,17 +191,38 @@
PangoRenderPart part)
{
PangoColor *color = pango_renderer_get_color ((PangoRenderer *) (crenderer), part);
- guint16 alpha = pango_renderer_get_alpha ((PangoRenderer *) (crenderer), part);
+ guint16 a = pango_renderer_get_alpha ((PangoRenderer *) (crenderer), part);
+ gdouble red, green, blue, alpha;
- if (!alpha)
- alpha = 0xffff;
+ if (!a && !color)
+ return;
if (color)
- cairo_set_source_rgba (crenderer->cr,
- color->red / 65535.,
- color->green / 65535.,
- color->blue / 65535.,
- alpha / 65535.);
+ {
+ red = color->red / 65535.;
+ green = color->green / 65535.;
+ blue = color->blue / 65535.;
+ alpha = 1.;
+ }
+ else
+ {
+ cairo_pattern_t *pattern = cairo_get_source (crenderer->cr);
+
+ if (pattern && cairo_pattern_get_type (pattern) == CAIRO_PATTERN_TYPE_SOLID)
+ cairo_pattern_get_rgba (pattern, &red, &green, &blue, &alpha);
+ else
+ {
+ red = 0.;
+ green = 0.;
+ blue = 0.;
+ alpha = 1.;
+ }
+ }
+
+ if (a)
+ alpha = a / 65535.;
+
+ cairo_set_source_rgba (crenderer->cr, red, green, blue, alpha);
}
/* note: modifies crenderer->cr without doing cairo_save/restore() */
diff -Nru pango1.0-1.40.4/pango/pango-engine.h pango1.0-1.40.5/pango/pango-engine.h
--- pango1.0-1.40.4/pango/pango-engine.h 2016-10-22 05:00:39.000000000 +0000
+++ pango1.0-1.40.5/pango/pango-engine.h 2017-04-08 04:57:28.000000000 +0000
@@ -169,7 +169,7 @@
typedef struct _PangoEngineShapeClass PangoEngineShapeClass;
/**
- * PangoEngineShape
+ * PangoEngineShape:
*
* The #PangoEngineShape class is implemented by engines that
* customize the rendering-system dependent part of the
@@ -241,7 +241,7 @@
typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
/**
- * PangoEngineScriptInfo
+ * PangoEngineScriptInfo:
* @script: a #PangoScript. The value %PANGO_SCRIPT_COMMON has
* the special meaning here of "all scripts"
* @langs: a semicolon separated list of languages that this
@@ -288,7 +288,7 @@
};
/**
- * script_engine_list:
+ * script_engine_list: (skip)
* @engines: location to store a pointer to an array of engines.
* @n_engines: location to store the number of elements in @engines.
*
@@ -301,7 +301,7 @@
int *n_engines);
/**
- * script_engine_init:
+ * script_engine_init: (skip)
* @module: a #GTypeModule structure used to associate any
* GObject types created in this module with the module.
*
@@ -314,7 +314,7 @@
/**
- * script_engine_exit:
+ * script_engine_exit: (skip)
*
* Do not use.
*
@@ -324,7 +324,7 @@
void script_engine_exit (void);
/**
- * script_engine_create:
+ * script_engine_create: (skip)
* @id: the ID of an engine as reported by script_engine_list.
*
* Do not use.
diff -Nru pango1.0-1.40.4/pango/pangofc-fontmap.c pango1.0-1.40.5/pango/pangofc-fontmap.c
--- pango1.0-1.40.4/pango/pangofc-fontmap.c 2017-02-27 19:58:45.000000000 +0000
+++ pango1.0-1.40.5/pango/pangofc-fontmap.c 2017-04-08 04:57:28.000000000 +0000
@@ -1831,7 +1831,7 @@
/**
* pango_fc_font_map_set_config:
* @fcfontmap: a #PangoFcFontMap
- * @fcconfig: (nullable) a #FcConfig, or %NULL
+ * @fcconfig: (nullable): a #FcConfig, or %NULL
*
* Set the FcConfig for this font map to use. The default value
* is %NULL, which causes Fontconfig to use its global "current config".
diff -Nru pango1.0-1.40.4/pango/pango-features.h pango1.0-1.40.5/pango/pango-features.h
--- pango1.0-1.40.4/pango/pango-features.h 2017-02-27 20:04:49.000000000 +0000
+++ pango1.0-1.40.5/pango/pango-features.h 2017-04-08 17:49:13.000000000 +0000
@@ -4,9 +4,9 @@
#define PANGO_VERSION_MAJOR 1
#define PANGO_VERSION_MINOR 40
-#define PANGO_VERSION_MICRO 4
+#define PANGO_VERSION_MICRO 5
-#define PANGO_VERSION_STRING "1.40.4"
+#define PANGO_VERSION_STRING "1.40.5"
#endif
diff -Nru pango1.0-1.40.4/pango/pangoft2-fontmap.c pango1.0-1.40.5/pango/pangoft2-fontmap.c
--- pango1.0-1.40.4/pango/pangoft2-fontmap.c 2016-10-22 05:00:39.000000000 +0000
+++ pango1.0-1.40.5/pango/pangoft2-fontmap.c 2017-04-08 04:57:28.000000000 +0000
@@ -253,7 +253,8 @@
*
* Create a #PangoContext for the given fontmap.
*
- * Return value: the newly created context; free with g_object_unref().
+ * Return value: (transfer full): the newly created context; free with
+ * g_object_unref().
*
* Since: 1.2
*
@@ -276,7 +277,7 @@
* (see pango_ft2_font_map_for_display()) and sets the resolution
* for the default fontmap to @dpi_x by @dpi_y.
*
- * Return value: the new #PangoContext
+ * Return value: (transfer full): the new #PangoContext
*
* Deprecated: 1.22: Use pango_font_map_create_context() instead.
**/
@@ -302,7 +303,7 @@
* global PangoFT2 fontmap is deprecated; use pango_ft2_font_map_new()
* instead.
*
- * Return value: a #PangoFT2FontMap.
+ * Return value: (transfer none): a #PangoFT2FontMap.
**/
PangoFontMap *
pango_ft2_font_map_for_display (void)
diff -Nru pango1.0-1.40.4/pango/pangoft2.rc pango1.0-1.40.5/pango/pangoft2.rc
--- pango1.0-1.40.4/pango/pangoft2.rc 2017-02-27 20:17:16.000000000 +0000
+++ pango1.0-1.40.5/pango/pangoft2.rc 2017-04-08 17:53:06.000000000 +0000
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,40,4,0
- PRODUCTVERSION 1,40,4,0
+ FILEVERSION 1,40,5,0
+ PRODUCTVERSION 1,40,5,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoFT2"
- VALUE "FileVersion", "1.40.4.0"
+ VALUE "FileVersion", "1.40.5.0"
VALUE "InternalName", "pangoft2-1.0-0"
VALUE "LegalCopyright", "Copyright ｩ 1999 Red Hat Software. Copyright ｩ 2000 Tor Lillqvist"
VALUE "OriginalFilename", "pangoft2-1.0-0.dll"
VALUE "ProductName", "PangoFT2"
- VALUE "ProductVersion", "1.40.4"
+ VALUE "ProductVersion", "1.40.5"
END
END
BLOCK "VarFileInfo"
diff -Nru pango1.0-1.40.4/pango/pango-layout.c pango1.0-1.40.5/pango/pango-layout.c
--- pango1.0-1.40.4/pango/pango-layout.c 2017-02-27 19:58:45.000000000 +0000
+++ pango1.0-1.40.5/pango/pango-layout.c 2017-04-08 04:58:50.000000000 +0000
@@ -5194,7 +5194,7 @@
{
gboolean leftedge = TRUE;
PangoGlyphString *rightmost_glyphs = NULL;
- int rightmost_space;
+ int rightmost_space = 0;
int residual = 0;
added_so_far = 0;
diff -Nru pango1.0-1.40.4/pango/pango-layout.h pango1.0-1.40.5/pango/pango-layout.h
--- pango1.0-1.40.4/pango/pango-layout.h 2016-10-22 05:00:40.000000000 +0000
+++ pango1.0-1.40.5/pango/pango-layout.h 2017-04-08 04:57:28.000000000 +0000
@@ -99,7 +99,7 @@
* @layout: (allow-none): the layout this line belongs to, might be %NULL
* @start_index: start of line as byte index into layout->text
* @length: length of line in bytes
- * @runs: (allow-none) (element-type: Pango.LayoutRun): list of runs in the
+ * @runs: (allow-none) (element-type Pango.LayoutRun): list of runs in the
* line, from left to right
* @is_paragraph_start: #TRUE if this is the first line of the paragraph
* @resolved_dir: #Resolved PangoDirection of line
diff -Nru pango1.0-1.40.4/pango/pango.rc pango1.0-1.40.5/pango/pango.rc
--- pango1.0-1.40.4/pango/pango.rc 2017-02-27 20:17:16.000000000 +0000
+++ pango1.0-1.40.5/pango/pango.rc 2017-04-08 17:53:06.000000000 +0000
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,40,4,0
- PRODUCTVERSION 1,40,4,0
+ FILEVERSION 1,40,5,0
+ PRODUCTVERSION 1,40,5,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "Pango"
- VALUE "FileVersion", "1.40.4.0"
+ VALUE "FileVersion", "1.40.5.0"
VALUE "InternalName", "pango-1.0-0"
VALUE "LegalCopyright", "Copyright ｩ 1999 Red Hat Software."
VALUE "OriginalFilename", "pango-1.0-0.dll"
VALUE "ProductName", "Pango"
- VALUE "ProductVersion", "1.40.4"
+ VALUE "ProductVersion", "1.40.5"
END
END
BLOCK "VarFileInfo"
diff -Nru pango1.0-1.40.4/pango/pango-utils.c pango1.0-1.40.5/pango/pango-utils.c
--- pango1.0-1.40.4/pango/pango-utils.c 2016-10-22 05:00:36.000000000 +0000
+++ pango1.0-1.40.5/pango/pango-utils.c 2017-04-08 04:55:32.000000000 +0000
@@ -338,11 +338,12 @@
if (!comment)
quoted = TRUE;
break;
+ case '\r':
case '\n':
{
int next_c = getc_unlocked (stream);
- if (!(c == EOF ||
+ if (!(next_c == EOF ||
(c == '\r' && next_c == '\n') ||
(c == '\n' && next_c == '\r')))
ungetc (next_c, stream);
diff -Nru pango1.0-1.40.4/pango/pangoxft.rc pango1.0-1.40.5/pango/pangoxft.rc
--- pango1.0-1.40.4/pango/pangoxft.rc 2017-02-27 20:17:16.000000000 +0000
+++ pango1.0-1.40.5/pango/pangoxft.rc 2017-04-08 17:53:06.000000000 +0000
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,40,4,0
- PRODUCTVERSION 1,40,4,0
+ FILEVERSION 1,40,5,0
+ PRODUCTVERSION 1,40,5,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "Pangoxft"
- VALUE "FileVersion", "1.40.4.0"
+ VALUE "FileVersion", "1.40.5.0"
VALUE "InternalName", "pangoxft-1.0-0"
VALUE "LegalCopyright", "Copyright ｩ 1999 Red Hat Software."
VALUE "OriginalFilename", "pangoxft-1.0-0.dll"
VALUE "ProductName", "Pangoxft"
- VALUE "ProductVersion", "1.40.4"
+ VALUE "ProductVersion", "1.40.5"
END
END
BLOCK "VarFileInfo"
diff -Nru pango1.0-1.40.4/pango-view/pango-view.1.in pango1.0-1.40.5/pango-view/pango-view.1.in
--- pango1.0-1.40.4/pango-view/pango-view.1.in 2017-02-27 20:18:19.000000000 +0000
+++ pango1.0-1.40.5/pango-view/pango-view.1.in 2017-04-08 17:53:42.000000000 +0000
@@ -1 +1,113 @@
-help2man is required to generate this file.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
+.TH PANGO-VIEW "1" "April 2017" "pango-view (pango) 1.40.5" "User Commands"
+.SH NAME
+pango-view \- Pango text viewer
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+pango\-view [OPTION秉&.ｦ] \- FILE
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-cairo\fR
+Options understood by the cairo backend
+.SS "Cairo backend options:"
+.TP
+\fB\-\-annotate\fR=\fI\,1\/\fR or 2
+Annotate the output
+.SS "Application Options:"
+.TP
+\fB\-\-no\-auto\-dir\fR
+No layout direction according to contents
+.TP
+\fB\-\-backend\fR=\fI\,cairo\/\fR/xft/ft2
+Pango backend to use for rendering (default: cairo)
+.TP
+\fB\-\-background\fR=\fI\,red\/\fR/#rrggbb/#rrggbbaa/transparent
+Set the background color
+.TP
+\fB\-q\fR, \fB\-\-no\-display\fR
+Do not display (just write to file or whatever)
+.TP
+\fB\-\-dpi\fR=\fI\,number\/\fR
+Set the resolution
+.TP
+\fB\-\-align\fR=\fI\,left\/\fR/center/right
+Text alignment
+.TP
+\fB\-\-ellipsize\fR=\fI\,start\/\fR/middle/end
+Ellipsization mode
+.TP
+\fB\-\-font\fR=\fI\,description\/\fR
+Set the font description
+.TP
+\fB\-\-foreground\fR=\fI\,red\/\fR/#rrggbb/#rrggbbaa
+Set the text color
+.TP
+\fB\-\-gravity\fR=\fI\,south\/\fR/east/north/west/auto
+Base gravity: glyph rotation
+.TP
+\fB\-\-gravity\-hint\fR=\fI\,natural\/\fR/strong/line
+Gravity hint
+.TP
+\fB\-\-header\fR
+Display the options in the output
+.TP
+\fB\-\-height=\fR+points/\-numlines
+Height in points (positive) or number of lines (negative) for ellipsizing
+.TP
+\fB\-\-hinting\fR=\fI\,none\/\fR/auto/full
+Hinting style
+.TP
+\fB\-\-indent\fR=\fI\,points\/\fR
+Width in points to indent paragraphs
+.TP
+\fB\-\-justify\fR
+Align paragraph lines to be justified
+.TP
+\fB\-\-language\fR=\fI\,en_US\/\fR/etc
+Language to use for font selection
+.TP
+\fB\-\-margin\fR=\fI\,CSS\-style\/\fR numbers in pixels
+Set the margin on the output in pixels
+.TP
+\fB\-\-markup\fR
+Interpret text as Pango markup
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fI\,file\/\fR
+Save rendered image to output file
+.TP
+\fB\-\-pixels\fR
+Use pixel units instead of points (sets dpi to 72)
+.TP
+\fB\-\-rtl\fR
+Set base direction to right\-to\-left
+.TP
+\fB\-\-rotate\fR=\fI\,degrees\/\fR
+Angle at which to rotate results
+.TP
+\fB\-n\fR, \fB\-\-runs\fR=\fI\,integer\/\fR
+Run Pango layout engine this many times
+.TP
+\fB\-\-single\-par\fR
+Enable single\-paragraph mode
+.TP
+\fB\-t\fR, \fB\-\-text\fR=\fI\,string\/\fR
+Text to display (instead of a file)
+.TP
+\fB\-\-version\fR
+Show version numbers
+.TP
+\fB\-\-waterfall\fR
+Create a waterfall display
+.TP
+\fB\-w\fR, \fB\-\-width\fR=\fI\,points\/\fR
+Width in points to which to wrap lines or ellipsize
+.TP
+\fB\-\-wrap\fR=\fI\,word\/\fR/char/word\-char
+Text wrapping mode (needs a width to be set)
Reply to: