Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2018-08-28 09:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango" Tue Aug 28 09:21:52 2018 rev:119 rq:630658 version:1.42.4 Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2018-08-03 12:31:18.527037935 +0200 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2018-08-28 09:21:56.636359954 +0200 @@ -1,0 +2,15 @@ +Mon Aug 20 18:18:25 UTC 2018 - bjorn....@gmail.com + +- Update to version 1.42.4: + + Prevent an assertion with invalid Unicode sequences. + + Fix build failure in C89 mode. + + Fix build failure on Mac OS X 10.5 and earlier. +- Drop pango-emoji-bsc1103877.patch: Fixed upstream. + +------------------------------------------------------------------- +Sat Aug 18 00:01:23 UTC 2018 - sree...@suse.com + +- Add pango-emoji-bsc1103877.patch: Fix denial of service + when parsing emoji (bsc#1103877, CVE-2018-15120) + +------------------------------------------------------------------- Old: ---- pango-1.42.3.tar.xz New: ---- pango-1.42.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.zXIq9k/_old 2018-08-28 09:21:57.032361189 +0200 +++ /var/tmp/diff_new_pack.zXIq9k/_new 2018-08-28 09:21:57.032361189 +0200 @@ -17,7 +17,7 @@ Name: pango -Version: 1.42.3 +Version: 1.42.4 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1-or-later ++++++ pango-1.42.3.tar.xz -> pango-1.42.4.tar.xz ++++++ ++++ 5515 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/ChangeLog new/pango-1.42.4/ChangeLog --- old/pango-1.42.3/ChangeLog 2018-07-30 20:01:03.000000000 +0200 +++ new/pango-1.42.4/ChangeLog 2018-08-20 17:08:51.000000000 +0200 @@ -1,3 +1,85 @@ +commit a6a89818246b0b14c0fe3d00d6120929fc0a11d9 +Author: Matthias Clasen <mcla...@redhat.com> +Date: Mon Aug 20 10:21:39 2018 -0400 + + 1.42.4 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 71aaeaf020340412b8d012fe23a556c0420eda5f +Author: Matthias Clasen <mcla...@redhat.com> +Date: Fri Aug 17 22:29:36 2018 -0400 + + Prevent an assertion with invalid Unicode sequences + + Invalid Unicode sequences, such as 0x2665 0xfe0e 0xfe0f, + can trick the Emoji iter code into returning an empty + segment, which then triggers an assertion in the itemizer. + + Prevent this by ensuring that we make progress. + + This issue was reported by Jeffrey M. + + pango/pango-emoji.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit ccfd3b466ca43b202681ce951600aac8f97d8dc4 +Merge: 0cbae46c 3d04cc2b +Author: Khaled Hosny <khaledho...@eglug.org> +Date: Sat Aug 4 20:12:22 2018 +0000 + + Merge branch 'c89' into 'master' + + Fix build failure in C89 mode + + See merge request GNOME/pango!10 + +commit 0cbae46ca1d0a1bbf50ddd69553e047118812be5 +Merge: 67471cbf dce7ba63 +Author: Khaled Hosny <khaledho...@eglug.org> +Date: Sat Aug 4 20:11:11 2018 +0000 + + Merge branch 'surrogate' into 'master' + + Fix build failure on Mac OS X 10.5 and earlier + + Closes #263 + + See merge request GNOME/pango!11 + +commit dce7ba63ed8b0567f674ade72da827d4a4c1b603 +Author: Ryan Schmidt <g...@ryandesign.com> +Date: Sat Aug 4 12:20:02 2018 -0500 + + Fix build failure on Mac OS X 10.5 and earlier + + Provides definitions of CFStringIsSurrogateHighCharacter, + CFStringIsSurrogateLowCharacter and + CFStringGetLongCharacterForSurrogatePair. + + Closes #263 + + pango/pangocoretext-shape.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 3d04cc2bbdce0a8b561d0e19255309f8d470816e +Author: Ryan Schmidt <g...@ryandesign.com> +Date: Sat Aug 4 11:57:31 2018 -0500 + + Fix build failure in C89 mode + + Fixes build error with default compilers on Mac OS X 10.6 and earlier: + + pangocoretext-fontmap.c: In function + ‘pango_core_text_fontset_new’: + pangocoretext-fontmap.c:1563: error: ‘for’ loop initial + declaration used outside C99 mode + + pango/pangocoretext-fontmap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + commit 67471cbfe24cd4418e9e97837ac85207f0d974de Author: Matthias Clasen <mcla...@redhat.com> Date: Mon Jul 30 13:32:51 2018 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/NEWS new/pango-1.42.4/NEWS --- old/pango-1.42.3/NEWS 2018-07-30 19:31:04.000000000 +0200 +++ new/pango-1.42.4/NEWS 2018-08-20 16:21:21.000000000 +0200 @@ -1,7 +1,7 @@ -Overview of changes in 1.42.3 +Overview of changes in 1.42.4 ============================= -- Fix handling of font lists on OS X (#252) -- Fix a memory leak +- Fix build failures (OS X, C89) +- Prevent an assertion with invalid Unicode sequences Overview of changes in 1.42.2 ============================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/compile new/pango-1.42.4/compile --- old/pango-1.42.3/compile 2018-07-30 19:33:29.000000000 +0200 +++ new/pango-1.42.4/compile 2018-08-20 17:06:51.000000000 +0200 @@ -1,9 +1,9 @@ -#! /bin/sh +#!/bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/config.h.win32 new/pango-1.42.4/config.h.win32 --- old/pango-1.42.3/config.h.win32 2018-07-30 19:33:37.000000000 +0200 +++ new/pango-1.42.4/config.h.win32 2018-08-20 17:07:02.000000000 +0200 @@ -113,7 +113,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.42.3" +#define PACKAGE_STRING "pango 1.42.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -122,19 +122,19 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.42.3" +#define PACKAGE_VERSION "1.42.4" /* PANGO binary age */ -#define PANGO_BINARY_AGE 4203 +#define PANGO_BINARY_AGE 4204 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 3 +#define PANGO_INTERFACE_AGE 4 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 3 +#define PANGO_VERSION_MICRO 4 /* PANGO minor version */ #define PANGO_VERSION_MINOR 42 @@ -143,7 +143,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.42.3" +#define VERSION "1.42.4" /* defines how to decorate public symbols while building */ #ifdef _MSC_VER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/configure.ac new/pango-1.42.4/configure.ac --- old/pango-1.42.3/configure.ac 2018-07-30 19:31:37.000000000 +0200 +++ new/pango-1.42.4/configure.ac 2018-08-20 16:21:35.000000000 +0200 @@ -22,7 +22,7 @@ dnl The triplet m4_define([pango_version_major], [1]) m4_define([pango_version_minor], [42]) -m4_define([pango_version_micro], [3]) +m4_define([pango_version_micro], [4]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/PangoRenderer.html new/pango-1.42.4/docs/html/PangoRenderer.html --- old/pango-1.42.3/docs/html/PangoRenderer.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/PangoRenderer.html 2018-08-20 17:08:53.000000000 +0200 @@ -223,7 +223,7 @@ </div> <div class="refsect1"> <a name="PangoRenderer.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GEnum +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">╰──</span> PangoRenderPart GObject <span class="lineart">╰──</span> PangoRenderer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/index.html new/pango-1.42.4/docs/html/index.html --- old/pango-1.42.3/docs/html/index.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/index.html 2018-08-20 17:08:53.000000000 +0200 @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Pango Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for Pango 1.42.3 +<div><p class="releaseinfo">for Pango 1.42.4 </p></div> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Bidirectional-Text.html new/pango-1.42.4/docs/html/pango-Bidirectional-Text.html --- old/pango-1.42.3/docs/html/pango-Bidirectional-Text.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Bidirectional-Text.html 2018-08-20 17:08:53.000000000 +0200 @@ -96,7 +96,7 @@ </div> <div class="refsect1"> <a name="pango-Bidirectional-Text.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GEnum +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">├──</span> PangoBidiType <span class="lineart">╰──</span> PangoDirection </pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Cairo-Rendering.html new/pango-1.42.4/docs/html/pango-Cairo-Rendering.html --- old/pango-1.42.3/docs/html/pango-Cairo-Rendering.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Cairo-Rendering.html 2018-08-20 17:08:53.000000000 +0200 @@ -75,7 +75,7 @@ </tr> <tr> <td class="function_type"> -<span class="returnvalue">cairo_font_type_t</span> +<a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="returnvalue">cairo_font_type_t</span></a> </td> <td class="function_name"> <a class="link" href="pango-Cairo-Rendering.html#pango-cairo-font-map-get-font-type" title="pango_cairo_font_map_get_font_type ()">pango_cairo_font_map_get_font_type</a> <span class="c_punctuation">()</span> @@ -107,7 +107,7 @@ </tr> <tr> <td class="function_type"> -<span class="returnvalue">cairo_scaled_font_t</span> * +<a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-t"><span class="returnvalue">cairo_scaled_font_t</span></a> * </td> <td class="function_name"> <a class="link" href="pango-Cairo-Rendering.html#pango-cairo-font-get-scaled-font" title="pango_cairo_font_get_scaled_font ()">pango_cairo_font_get_scaled_font</a> <span class="c_punctuation">()</span> @@ -138,7 +138,7 @@ </td> </tr> <tr> -<td class="function_type">const <span class="returnvalue">cairo_font_options_t</span> * +<td class="function_type">const <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html#cairo-font-options-t"><span class="returnvalue">cairo_font_options_t</span></a> * </td> <td class="function_name"> <a class="link" href="pango-Cairo-Rendering.html#pango-cairo-context-get-font-options" title="pango_cairo_context_get_font_options ()">pango_cairo_context_get_font_options</a> <span class="c_punctuation">()</span> @@ -296,7 +296,7 @@ </div> <div class="refsect1"> <a name="pango-Cairo-Rendering.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GInterface +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a> <span class="lineart">├──</span> PangoCairoFont <span class="lineart">╰──</span> PangoCairoFontMap </pre> @@ -449,7 +449,7 @@ <span class="normal"> </span><span class="comment">/* Center coordinates on the middle of the region we are drawing</span> <span class="comment"> */</span> -<span class="normal"> </span><span class="function">cairo_translate</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> RADIUS</span><span class="symbol">,</span><span class="normal"> RADIUS</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Transformations.html#cairo-translate">cairo_translate</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> RADIUS</span><span class="symbol">,</span><span class="normal"> RADIUS</span><span class="symbol">);</span> <span class="normal"> </span><span class="comment">/* Create a PangoLayout, set the font and text */</span> <span class="normal"> layout </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="pango-Cairo-Rendering.html#pango-cairo-create-layout">pango_cairo_create_layout</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> @@ -466,22 +466,22 @@ <span class="normal"> </span><span class="type">double</span><span class="normal"> angle </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="number">360</span><span class="symbol">.</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> i</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> N_WORDS</span><span class="symbol">;</span> <span class="normal"> </span><span class="type">double</span><span class="normal"> red</span><span class="symbol">;</span> -<span class="normal"> </span><span class="function">cairo_save</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-save">cairo_save</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> <span class="normal"> </span><span class="comment">/* Gradient from red at angle == 60 to blue at angle == 240 */</span> <span class="normal"> red </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="number">1</span><span class="normal"> </span><span class="symbol">+</span><span class="normal"> </span><span class="function">cos</span><span class="normal"> </span><span class="symbol">((</span><span class="normal">angle </span><span class="symbol">-</span><span class="normal"> </span><span class="number">60</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> G_PI </span><span class="symbol">/</span><span class="normal"> </span><span class="number">180</span><span class="symbol">.))</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">;</span> -<span class="normal"> </span><span class="function">cairo_set_source_rgb</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> red</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> red</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-source-rgb">cairo_set_source_rgb</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> red</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> red</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_rotate</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> angle </span><span class="symbol">*</span><span class="normal"> G_PI </span><span class="symbol">/</span><span class="normal"> </span><span class="number">180</span><span class="symbol">.);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Transformations.html#cairo-rotate">cairo_rotate</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> angle </span><span class="symbol">*</span><span class="normal"> G_PI </span><span class="symbol">/</span><span class="normal"> </span><span class="number">180</span><span class="symbol">.);</span> <span class="normal"> </span><span class="comment">/* Inform Pango to re-layout the text with the new transformation */</span> <span class="normal"> </span><span class="function"><a href="pango-Cairo-Rendering.html#pango-cairo-update-layout">pango_cairo_update_layout</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> layout</span><span class="symbol">);</span> <span class="normal"> </span><span class="function"><a href="pango-Layout-Objects.html#pango-layout-get-size">pango_layout_get_size</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">layout</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">width</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">height</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_move_to</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> </span><span class="symbol">((</span><span class="type">double</span><span class="symbol">)</span><span class="normal">width </span><span class="symbol">/</span><span class="normal"> <a href="pango-Glyph-Storage.html#PANGO-SCALE:CAPS">PANGO_SCALE</a></span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> RADIUS</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Paths.html#cairo-move-to">cairo_move_to</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> </span><span class="symbol">((</span><span class="type">double</span><span class="symbol">)</span><span class="normal">width </span><span class="symbol">/</span><span class="normal"> <a href="pango-Glyph-Storage.html#PANGO-SCALE:CAPS">PANGO_SCALE</a></span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal"> RADIUS</span><span class="symbol">);</span> <span class="normal"> </span><span class="function"><a href="pango-Cairo-Rendering.html#pango-cairo-show-layout">pango_cairo_show_layout</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> layout</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_restore</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-restore">cairo_restore</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> <span class="normal"> </span><span class="cbracket">}</span> <span class="normal"> </span><span class="comment">/* free the layout object */</span> @@ -503,19 +503,19 @@ <span class="normal"> filename </span><span class="symbol">=</span><span class="normal"> argv</span><span class="symbol">[</span><span class="number">1</span><span class="symbol">];</span> -<span class="normal"> surface </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_image_surface_create</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">CAIRO_FORMAT_ARGB32</span><span class="symbol">,</span> +<span class="normal"> surface </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#cairo-image-surface-create">cairo_image_surface_create</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html#CAIRO-FORMAT-ARGB32:CAPS">CAIRO_FORMAT_ARGB32</a></span><span class="symbol">,</span> <span class="normal"> </span><span class="number">2</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> RADIUS</span><span class="symbol">,</span><span class="normal"> </span><span class="number">2</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> RADIUS</span><span class="symbol">);</span> -<span class="normal"> cr </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_create</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="normal"> cr </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-create">cairo_create</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_set_source_rgb</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_paint</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-source-rgb">cairo_set_source_rgb</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-paint">cairo_paint</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> <span class="normal"> </span><span class="function">draw_text</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-destroy">cairo_destroy</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span> -<span class="normal"> status </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_surface_write_to_png</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> filename</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">cairo_surface_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> +<span class="normal"> status </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-PNG-Support.html#cairo-surface-write-to-png">cairo_surface_write_to_png</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">,</span><span class="normal"> filename</span><span class="symbol">);</span> +<span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-destroy">cairo_surface_destroy</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span> -<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status </span><span class="symbol">!=</span><span class="normal"> CAIRO_STATUS_SUCCESS</span><span class="symbol">)</span> +<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">status </span><span class="symbol">!=</span><span class="normal"> <a href="/usr/share/gtk-doc/html/cairo/cairo-Error-handling.html#CAIRO-STATUS-SUCCESS:CAPS">CAIRO_STATUS_SUCCESS</a></span><span class="symbol">)</span> <span class="normal"> </span><span class="cbracket">{</span> <span class="normal"> </span><span class="function">g_printerr</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Could not save png to '%s'</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> filename</span><span class="symbol">);</span> <span class="normal"> </span><span class="keyword">return</span><span class="normal"> </span><span class="number">1</span><span class="symbol">;</span> @@ -628,7 +628,7 @@ <a name="pango-cairo-font-map-new-for-font-type"></a><h3>pango_cairo_font_map_new_for_font_type ()</h3> <pre class="programlisting"><a class="link" href="pango-Fonts.html#PangoFontMap"><span class="returnvalue">PangoFontMap</span></a> * pango_cairo_font_map_new_for_font_type - (<em class="parameter"><code><span class="type">cairo_font_type_t</span> fonttype</code></em>);</pre> + (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> fonttype</code></em>);</pre> <p>Creates a new <a class="link" href="pango-Cairo-Rendering.html#PangoCairoFontMap"><span class="type">PangoCairoFontMap</span></a> object of the type suitable to be used with cairo font backend of type <em class="parameter"><code>fonttype</code></em> .</p> @@ -647,7 +647,7 @@ </colgroup> <tbody><tr> <td class="parameter_name"><p>fonttype</p></td> -<td class="parameter_description"><p>desired <span class="type">cairo_font_type_t</span></p></td> +<td class="parameter_description"><p>desired <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a></p></td> <td class="parameter_annotations"> </td> </tr></tbody> </table></div> @@ -665,7 +665,7 @@ <hr> <div class="refsect2"> <a name="pango-cairo-font-map-get-font-type"></a><h3>pango_cairo_font_map_get_font_type ()</h3> -<pre class="programlisting"><span class="returnvalue">cairo_font_type_t</span> +<pre class="programlisting"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="returnvalue">cairo_font_type_t</span></a> pango_cairo_font_map_get_font_type (<em class="parameter"><code><a class="link" href="pango-Cairo-Rendering.html#PangoCairoFontMap"><span class="type">PangoCairoFontMap</span></a> *fontmap</code></em>);</pre> <p>Gets the type of Cairo font backend that <em class="parameter"><code>fontmap</code></em> uses.</p> @@ -686,7 +686,7 @@ </div> <div class="refsect3"> <a name="pango-cairo-font-map-get-font-type.returns"></a><h4>Returns</h4> -<p> the <span class="type">cairo_font_type_t</span> cairo font backend type</p> +<p> the <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> cairo font backend type</p> </div> <p class="since">Since: <a class="link" href="api-index-1-18.html#api-index-1.18">1.18</a></p> </div> @@ -787,12 +787,12 @@ <hr> <div class="refsect2"> <a name="pango-cairo-font-get-scaled-font"></a><h3>pango_cairo_font_get_scaled_font ()</h3> -<pre class="programlisting"><span class="returnvalue">cairo_scaled_font_t</span> * +<pre class="programlisting"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-t"><span class="returnvalue">cairo_scaled_font_t</span></a> * pango_cairo_font_get_scaled_font (<em class="parameter"><code><a class="link" href="pango-Cairo-Rendering.html#PangoCairoFont"><span class="type">PangoCairoFont</span></a> *font</code></em>);</pre> -<p>Gets the <span class="type">cairo_scaled_font_t</span> used by <em class="parameter"><code>font</code></em> +<p>Gets the <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> used by <em class="parameter"><code>font</code></em> . The scaled font can be referenced and kept using -<code class="function">cairo_scaled_font_reference()</code>.</p> +<a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a>.</p> <div class="refsect3"> <a name="pango-cairo-font-get-scaled-font.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -810,7 +810,7 @@ </div> <div class="refsect3"> <a name="pango-cairo-font-get-scaled-font.returns"></a><h4>Returns</h4> -<p>the <span class="type">cairo_scaled_font_t</span> used by <em class="parameter"><code>font</code></em> +<p>the <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> used by <em class="parameter"><code>font</code></em> , or <code class="literal">NULL</code> if <em class="parameter"><code>font</code></em> is <code class="literal">NULL</code>. </p> @@ -887,7 +887,7 @@ <a name="pango-cairo-context-set-font-options"></a><h3>pango_cairo_context_set_font_options ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> pango_cairo_context_set_font_options (<em class="parameter"><code><a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a> *context</code></em>, - <em class="parameter"><code>const <span class="type">cairo_font_options_t</span> *options</code></em>);</pre> + <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> *options</code></em>);</pre> <p>Sets the font options used when rendering text with this context. These options override any options that <a class="link" href="pango-Cairo-Rendering.html#pango-cairo-update-context" title="pango_cairo_update_context ()"><code class="function">pango_cairo_update_context()</code></a> derives from the target surface.</p> @@ -907,7 +907,7 @@ </tr> <tr> <td class="parameter_name"><p>options</p></td> -<td class="parameter_description"><p>a <span class="type">cairo_font_options_t</span>, or <code class="literal">NULL</code> to unset +<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>, or <code class="literal">NULL</code> to unset any previously set options. A copy is made. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td> </tr> @@ -919,7 +919,7 @@ <hr> <div class="refsect2"> <a name="pango-cairo-context-get-font-options"></a><h3>pango_cairo_context_get_font_options ()</h3> -<pre class="programlisting">const <span class="returnvalue">cairo_font_options_t</span> * +<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html#cairo-font-options-t"><span class="returnvalue">cairo_font_options_t</span></a> * pango_cairo_context_get_font_options (<em class="parameter"><code><a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a> *context</code></em>);</pre> <p>Retrieves any font rendering options previously set with <a class="link" href="pango-Cairo-Rendering.html#pango-cairo-context-set-font-options" title="pango_cairo_context_set_font_options ()"><code class="function">pango_cairo_context_set_font_options()</code></a>. This function does not report options @@ -952,7 +952,7 @@ <div class="refsect2"> <a name="PangoCairoShapeRendererFunc"></a><h3>PangoCairoShapeRendererFunc ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -<span class="c_punctuation">(</span>*PangoCairoShapeRendererFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +<span class="c_punctuation">(</span>*PangoCairoShapeRendererFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Text-Attributes.html#PangoAttrShape" title="struct PangoAttrShape"><span class="type">PangoAttrShape</span></a> *attr</code></em>, <em class="parameter"><code><span class="type">gboolean</span> do_path</code></em>, <em class="parameter"><code><span class="type">gpointer</span> data</code></em>);</pre> @@ -1095,7 +1095,7 @@ <div class="refsect2"> <a name="pango-cairo-create-context"></a><h3>pango_cairo_create_context ()</h3> <pre class="programlisting"><a class="link" href="pango-Text-Processing.html#PangoContext"><span class="returnvalue">PangoContext</span></a> * -pango_cairo_create_context (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>);</pre> +pango_cairo_create_context (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>);</pre> <p>Creates a context object set up to match the current transformation and target surface of the Cairo context. This context can then be used to create a layout using <a class="link" href="pango-Layout-Objects.html#pango-layout-new" title="pango_layout_new ()"><code class="function">pango_layout_new()</code></a>.</p> @@ -1132,7 +1132,7 @@ <div class="refsect2"> <a name="pango-cairo-update-context"></a><h3>pango_cairo_update_context ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_update_context (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_update_context (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a> *context</code></em>);</pre> <p>Updates a <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a> previously created for use with Cairo to match the current transformation and target surface of a Cairo @@ -1167,7 +1167,7 @@ <div class="refsect2"> <a name="pango-cairo-create-layout"></a><h3>pango_cairo_create_layout ()</h3> <pre class="programlisting"><a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="returnvalue">PangoLayout</span></a> * -pango_cairo_create_layout (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>);</pre> +pango_cairo_create_layout (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>);</pre> <p>Creates a layout object set up to match the current transformation and target surface of the Cairo context. This layout can then be used for text measurement with functions like @@ -1206,7 +1206,7 @@ <div class="refsect2"> <a name="pango-cairo-update-layout"></a><h3>pango_cairo_update_layout ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_update_layout (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_update_layout (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> *layout</code></em>);</pre> <p>Updates the private <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a> of a <a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> created with <a class="link" href="pango-Cairo-Rendering.html#pango-cairo-create-layout" title="pango_cairo_create_layout ()"><code class="function">pango_cairo_create_layout()</code></a> to match the current transformation @@ -1239,7 +1239,7 @@ <div class="refsect2"> <a name="pango-cairo-show-glyph-string"></a><h3>pango_cairo_show_glyph_string ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_show_glyph_string (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_show_glyph_string (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Fonts.html#PangoFont"><span class="type">PangoFont</span></a> *font</code></em>, <em class="parameter"><code><a class="link" href="pango-Glyph-Storage.html#PangoGlyphString"><span class="type">PangoGlyphString</span></a> *glyphs</code></em>);</pre> <p>Draws the glyphs in <em class="parameter"><code>glyphs</code></em> @@ -1279,7 +1279,7 @@ <div class="refsect2"> <a name="pango-cairo-show-glyph-item"></a><h3>pango_cairo_show_glyph_item ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_show_glyph_item (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_show_glyph_item (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code>const <span class="type">char</span> *text</code></em>, <em class="parameter"><code><a class="link" href="pango-Glyph-Storage.html#PangoGlyphItem"><span class="type">PangoGlyphItem</span></a> *glyph_item</code></em>);</pre> <p>Draws the glyphs in <em class="parameter"><code>glyph_item</code></em> @@ -1327,7 +1327,7 @@ <div class="refsect2"> <a name="pango-cairo-show-layout-line"></a><h3>pango_cairo_show_layout_line ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_show_layout_line (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_show_layout_line (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Layout-Objects.html#PangoLayoutLine"><span class="type">PangoLayoutLine</span></a> *line</code></em>);</pre> <p>Draws a <a class="link" href="pango-Layout-Objects.html#PangoLayoutLine"><span class="type">PangoLayoutLine</span></a> in the specified cairo context. The origin of the glyphs (the left edge of the line) will @@ -1360,7 +1360,7 @@ <div class="refsect2"> <a name="pango-cairo-show-layout"></a><h3>pango_cairo_show_layout ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_show_layout (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_show_layout (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> *layout</code></em>);</pre> <p>Draws a <a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> in the specified cairo context. The top-left corner of the <a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> will be drawn @@ -1393,7 +1393,7 @@ <div class="refsect2"> <a name="pango-cairo-show-error-underline"></a><h3>pango_cairo_show_error_underline ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_show_error_underline (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_show_error_underline (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><span class="type">double</span> x</code></em>, <em class="parameter"><code><span class="type">double</span> y</code></em>, <em class="parameter"><code><span class="type">double</span> width</code></em>, @@ -1446,7 +1446,7 @@ <div class="refsect2"> <a name="pango-cairo-glyph-string-path"></a><h3>pango_cairo_glyph_string_path ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_glyph_string_path (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_glyph_string_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Fonts.html#PangoFont"><span class="type">PangoFont</span></a> *font</code></em>, <em class="parameter"><code><a class="link" href="pango-Glyph-Storage.html#PangoGlyphString"><span class="type">PangoGlyphString</span></a> *glyphs</code></em>);</pre> <p>Adds the glyphs in <em class="parameter"><code>glyphs</code></em> @@ -1486,7 +1486,7 @@ <div class="refsect2"> <a name="pango-cairo-layout-line-path"></a><h3>pango_cairo_layout_line_path ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_layout_line_path (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_layout_line_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Layout-Objects.html#PangoLayoutLine"><span class="type">PangoLayoutLine</span></a> *line</code></em>);</pre> <p>Adds the text in <a class="link" href="pango-Layout-Objects.html#PangoLayoutLine"><span class="type">PangoLayoutLine</span></a> to the current path in the specified cairo context. The origin of the glyphs (the left edge @@ -1519,7 +1519,7 @@ <div class="refsect2"> <a name="pango-cairo-layout-path"></a><h3>pango_cairo_layout_path ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_layout_path (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_layout_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> *layout</code></em>);</pre> <p>Adds the text in a <a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> to the current path in the specified cairo context. The top-left corner of the <a class="link" href="pango-Layout-Objects.html#PangoLayout"><span class="type">PangoLayout</span></a> @@ -1552,7 +1552,7 @@ <div class="refsect2"> <a name="pango-cairo-error-underline-path"></a><h3>pango_cairo_error_underline_path ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> -pango_cairo_error_underline_path (<em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>, +pango_cairo_error_underline_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>, <em class="parameter"><code><span class="type">double</span> x</code></em>, <em class="parameter"><code><span class="type">double</span> y</code></em>, <em class="parameter"><code><span class="type">double</span> width</code></em>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Coverage-Maps.html new/pango-1.42.4/docs/html/pango-Coverage-Maps.html --- old/pango-1.42.3/docs/html/pango-Coverage-Maps.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Coverage-Maps.html 2018-08-20 17:08:53.000000000 +0200 @@ -140,7 +140,7 @@ </div> <div class="refsect1"> <a name="pango-Coverage-Maps.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GEnum +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">╰──</span> PangoCoverageLevel </pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Fonts.html new/pango-1.42.4/docs/html/pango-Fonts.html --- old/pango-1.42.3/docs/html/pango-Fonts.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Fonts.html 2018-08-20 17:08:53.000000000 +0200 @@ -814,15 +814,15 @@ </div> <div class="refsect1"> <a name="pango-Fonts.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">├──</span> PangoFontDescription <span class="lineart">╰──</span> PangoFontMetrics - GEnum + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">├──</span> PangoStretch <span class="lineart">├──</span> PangoStyle <span class="lineart">├──</span> PangoVariant <span class="lineart">╰──</span> PangoWeight - GFlags + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a> <span class="lineart">╰──</span> PangoFontMask GObject <span class="lineart">├──</span> PangoFont diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Glyph-Storage.html new/pango-1.42.4/docs/html/pango-Glyph-Storage.html --- old/pango-1.42.3/docs/html/pango-Glyph-Storage.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Glyph-Storage.html 2018-08-20 17:08:53.000000000 +0200 @@ -482,7 +482,7 @@ </div> <div class="refsect1"> <a name="pango-Glyph-Storage.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">├──</span> PangoGlyphItem <span class="lineart">├──</span> PangoGlyphItemIter <span class="lineart">├──</span> PangoGlyphString diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Layout-Objects.html new/pango-1.42.4/docs/html/pango-Layout-Objects.html --- old/pango-1.42.3/docs/html/pango-Layout-Objects.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Layout-Objects.html 2018-08-20 17:08:53.000000000 +0200 @@ -765,10 +765,10 @@ </div> <div class="refsect1"> <a name="pango-Layout-Objects.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">├──</span> PangoLayoutIter <span class="lineart">╰──</span> PangoLayoutLine - GEnum + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">├──</span> PangoAlignment <span class="lineart">├──</span> PangoEllipsizeMode <span class="lineart">╰──</span> PangoWrapMode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Scripts-and-Languages.html new/pango-1.42.4/docs/html/pango-Scripts-and-Languages.html --- old/pango-1.42.3/docs/html/pango-Scripts-and-Languages.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Scripts-and-Languages.html 2018-08-20 17:08:53.000000000 +0200 @@ -177,9 +177,9 @@ </div> <div class="refsect1"> <a name="pango-Scripts-and-Languages.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">╰──</span> PangoLanguage - GEnum + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">╰──</span> PangoScript </pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Tab-Stops.html new/pango-1.42.4/docs/html/pango-Tab-Stops.html --- old/pango-1.42.3/docs/html/pango-Tab-Stops.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Tab-Stops.html 2018-08-20 17:08:53.000000000 +0200 @@ -152,9 +152,9 @@ </div> <div class="refsect1"> <a name="pango-Tab-Stops.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">╰──</span> PangoTabArray - GEnum + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">╰──</span> PangoTabAlign </pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Text-Attributes.html new/pango-1.42.4/docs/html/pango-Text-Attributes.html --- old/pango-1.42.3/docs/html/pango-Text-Attributes.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Text-Attributes.html 2018-08-20 17:08:53.000000000 +0200 @@ -635,10 +635,10 @@ </div> <div class="refsect1"> <a name="pango-Text-Attributes.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">├──</span> PangoAttrList <span class="lineart">╰──</span> PangoColor - GEnum + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">├──</span> PangoAttrType <span class="lineart">╰──</span> PangoUnderline </pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Text-Processing.html new/pango-1.42.4/docs/html/pango-Text-Processing.html --- old/pango-1.42.3/docs/html/pango-Text-Processing.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Text-Processing.html 2018-08-20 17:08:53.000000000 +0200 @@ -363,7 +363,7 @@ </div> <div class="refsect1"> <a name="pango-Text-Processing.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GBoxed +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">╰──</span> PangoItem GObject <span class="lineart">╰──</span> PangoContext diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Version-Checking.html new/pango-1.42.4/docs/html/pango-Version-Checking.html --- old/pango-1.42.3/docs/html/pango-Version-Checking.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Version-Checking.html 2018-08-20 17:08:53.000000000 +0200 @@ -387,14 +387,14 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3> -<pre class="programlisting">#define PANGO_VERSION_MICRO 3 +<pre class="programlisting">#define PANGO_VERSION_MICRO 4 </pre> <p>The micro component of the version of Pango available at compile-time.</p> </div> <hr> <div class="refsect2"> <a name="PANGO-VERSION-STRING:CAPS"></a><h3>PANGO_VERSION_STRING</h3> -<pre class="programlisting">#define PANGO_VERSION_STRING "1.42.3" +<pre class="programlisting">#define PANGO_VERSION_STRING "1.42.4" </pre> <p>A string literal containing the version of Pango available at compile-time.</p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-Vertical-Text.html new/pango-1.42.4/docs/html/pango-Vertical-Text.html --- old/pango-1.42.3/docs/html/pango-Vertical-Text.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-Vertical-Text.html 2018-08-20 17:08:53.000000000 +0200 @@ -108,7 +108,7 @@ </div> <div class="refsect1"> <a name="pango-Vertical-Text.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> GEnum +<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">├──</span> PangoGravity <span class="lineart">╰──</span> PangoGravityHint </pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/html/pango-hierarchy.html new/pango-1.42.4/docs/html/pango-hierarchy.html --- old/pango-1.42.3/docs/html/pango-hierarchy.html 2018-07-30 20:01:05.000000000 +0200 +++ new/pango-1.42.4/docs/html/pango-hierarchy.html 2018-08-20 17:08:53.000000000 +0200 @@ -45,10 +45,10 @@ <span class="lineart">├──</span> <a class="link" href="pango-OpenType-Font-Handling.html#PangoOTRuleset">PangoOTRuleset</a> <span class="lineart">╰──</span> <a class="link" href="PangoRenderer.html" title="PangoRenderer">PangoRenderer</a> <span class="lineart">╰──</span> <a class="link" href="pango-Xft-Fonts-and-Rendering.html#PangoXftRenderer">PangoXftRenderer</a> - GInterface + <a href="/usr/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a> <span class="lineart">├──</span> <a class="link" href="pango-Cairo-Rendering.html#PangoCairoFontMap">PangoCairoFontMap</a> <span class="lineart">╰──</span> <a class="link" href="pango-Cairo-Rendering.html#PangoCairoFont">PangoCairoFont</a> - GEnum + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">├──</span> <a class="link" href="pango-Layout-Objects.html#PangoAlignment" title="enum PangoAlignment">PangoAlignment</a> <span class="lineart">├──</span> <a class="link" href="pango-Text-Attributes.html#PangoAttrType" title="enum PangoAttrType">PangoAttrType</a> <span class="lineart">├──</span> <a class="link" href="pango-Bidirectional-Text.html#PangoBidiType" title="enum PangoBidiType">PangoBidiType</a> @@ -66,7 +66,7 @@ <span class="lineart">├──</span> <a class="link" href="pango-Fonts.html#PangoVariant" title="enum PangoVariant">PangoVariant</a> <span class="lineart">├──</span> <a class="link" href="pango-Fonts.html#PangoWeight" title="enum PangoWeight">PangoWeight</a> <span class="lineart">╰──</span> <a class="link" href="pango-Layout-Objects.html#PangoWrapMode" title="enum PangoWrapMode">PangoWrapMode</a> - GBoxed + <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a> <span class="lineart">├──</span> <a class="link" href="pango-Text-Attributes.html#PangoAttrList">PangoAttrList</a> <span class="lineart">├──</span> <a class="link" href="pango-Text-Attributes.html#PangoColor">PangoColor</a> <span class="lineart">├──</span> <a class="link" href="pango-Fonts.html#PangoFontDescription">PangoFontDescription</a> @@ -80,7 +80,7 @@ <span class="lineart">├──</span> <a class="link" href="pango-Layout-Objects.html#PangoLayoutLine">PangoLayoutLine</a> <span class="lineart">├──</span> <a class="link" href="pango-Glyph-Storage.html#PangoMatrix">PangoMatrix</a> <span class="lineart">╰──</span> <a class="link" href="pango-Tab-Stops.html#PangoTabArray">PangoTabArray</a> - GFlags + <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a> <span class="lineart">╰──</span> <a class="link" href="pango-Fonts.html#PangoFontMask" title="enum PangoFontMask">PangoFontMask</a> </pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/docs/version.xml new/pango-1.42.4/docs/version.xml --- old/pango-1.42.3/docs/version.xml 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/docs/version.xml 2018-08-20 17:07:01.000000000 +0200 @@ -1 +1 @@ -1.42.3 +1.42.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/missing new/pango-1.42.4/missing --- old/pango-1.42.3/missing 2018-07-30 19:33:29.000000000 +0200 +++ new/pango-1.42.4/missing 2018-08-20 17:06:51.000000000 +0200 @@ -1,9 +1,9 @@ -#! /bin/sh +#!/bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pango-emoji.c new/pango-1.42.4/pango/pango-emoji.c --- old/pango-1.42.3/pango/pango-emoji.c 2017-08-06 15:46:28.000000000 +0200 +++ new/pango-1.42.4/pango/pango-emoji.c 2018-08-18 04:29:25.000000000 +0200 @@ -253,6 +253,12 @@ if (iter->is_emoji == PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type)) { iter->is_emoji = !PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type); + + /* Make sure we make progress. Weird sequences, like a VC15 followed + * by VC16, can trick us into stalling otherwise. */ + if (iter->start == iter->end) + iter->end = g_utf8_next_char (iter->end); + return TRUE; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pango-features.h new/pango-1.42.4/pango/pango-features.h --- old/pango-1.42.3/pango/pango-features.h 2018-07-30 19:33:37.000000000 +0200 +++ new/pango-1.42.4/pango/pango-features.h 2018-08-20 17:07:03.000000000 +0200 @@ -4,9 +4,9 @@ #define PANGO_VERSION_MAJOR 1 #define PANGO_VERSION_MINOR 42 -#define PANGO_VERSION_MICRO 3 +#define PANGO_VERSION_MICRO 4 -#define PANGO_VERSION_STRING "1.42.3" +#define PANGO_VERSION_STRING "1.42.4" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pango.rc new/pango-1.42.4/pango/pango.rc --- old/pango-1.42.3/pango/pango.rc 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/pango/pango.rc 2018-08-20 17:07:01.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,3,0 - PRODUCTVERSION 1,42,3,0 + FILEVERSION 1,42,4,0 + PRODUCTVERSION 1,42,4,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.42.3.0" + VALUE "FileVersion", "1.42.4.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.42.3" + VALUE "ProductVersion", "1.42.4" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pangocairo.rc new/pango-1.42.4/pango/pangocairo.rc --- old/pango-1.42.3/pango/pangocairo.rc 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/pango/pangocairo.rc 2018-08-20 17:07:01.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,3,0 - PRODUCTVERSION 1,42,3,0 + FILEVERSION 1,42,4,0 + PRODUCTVERSION 1,42,4,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.42.3.0" + VALUE "FileVersion", "1.42.4.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.42.3" + VALUE "ProductVersion", "1.42.4" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pangocoretext-fontmap.c new/pango-1.42.4/pango/pangocoretext-fontmap.c --- old/pango-1.42.3/pango/pangocoretext-fontmap.c 2018-07-28 17:15:28.000000000 +0200 +++ new/pango-1.42.4/pango/pangocoretext-fontmap.c 2018-08-06 04:47:22.000000000 +0200 @@ -1555,12 +1555,13 @@ const gchar *family; gchar *name; GPtrArray *fonts; + int i; fonts = g_ptr_array_new (); family = pango_font_description_get_family (description); family_names = g_strsplit (family ? family : "", ",", -1); - for (int i = 0; family_names[i]; ++i) + for (i = 0; family_names[i]; ++i) { name = g_utf8_casefold (family_names[i], -1); font_family = g_hash_table_lookup (key->fontmap->families, name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pangocoretext-shape.c new/pango-1.42.4/pango/pangocoretext-shape.c --- old/pango-1.42.3/pango/pangocoretext-shape.c 2016-10-22 07:00:41.000000000 +0200 +++ new/pango-1.42.4/pango/pangocoretext-shape.c 2018-08-06 04:47:22.000000000 +0200 @@ -29,6 +29,20 @@ #include "pangocoretext-private.h" #include "pango-impl-utils.h" +#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +CF_INLINE Boolean CFStringIsSurrogateHighCharacter(UniChar character) { + return ((character >= 0xD800UL) && (character <= 0xDBFFUL) ? true : false); +} + +CF_INLINE Boolean CFStringIsSurrogateLowCharacter(UniChar character) { + return ((character >= 0xDC00UL) && (character <= 0xDFFFUL) ? true : false); +} + +CF_INLINE UTF32Char CFStringGetLongCharacterForSurrogatePair(UniChar surrogateHigh, UniChar surrogateLow) { + return ((surrogateHigh - 0xD800UL) << 10) + (surrogateLow - 0xDC00UL) + 0x0010000UL; +} +#endif + static void set_glyph (PangoFont *font, PangoGlyphString *glyphs, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pangoft2.rc new/pango-1.42.4/pango/pangoft2.rc --- old/pango-1.42.3/pango/pangoft2.rc 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/pango/pangoft2.rc 2018-08-20 17:07:01.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,3,0 - PRODUCTVERSION 1,42,3,0 + FILEVERSION 1,42,4,0 + PRODUCTVERSION 1,42,4,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.42.3.0" + VALUE "FileVersion", "1.42.4.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.42.3" + VALUE "ProductVersion", "1.42.4" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pangowin32.rc new/pango-1.42.4/pango/pangowin32.rc --- old/pango-1.42.3/pango/pangowin32.rc 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/pango/pangowin32.rc 2018-08-20 17:07:01.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,3,0 - PRODUCTVERSION 1,42,3,0 + FILEVERSION 1,42,4,0 + PRODUCTVERSION 1,42,4,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.42.3.0" + VALUE "FileVersion", "1.42.4.0" VALUE "InternalName", "pangowin32-1.0-0" VALUE "LegalCopyright", "Copyright 1999 Red Hat Software. Copyright 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangowin32-1.0-0.dll" VALUE "ProductName", "PangoWin32" - VALUE "ProductVersion", "1.42.3" + VALUE "ProductVersion", "1.42.4" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/pango/pangoxft.rc new/pango-1.42.4/pango/pangoxft.rc --- old/pango-1.42.3/pango/pangoxft.rc 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/pango/pangoxft.rc 2018-08-20 17:07:01.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,3,0 - PRODUCTVERSION 1,42,3,0 + FILEVERSION 1,42,4,0 + PRODUCTVERSION 1,42,4,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.42.3.0" + VALUE "FileVersion", "1.42.4.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.42.3" + VALUE "ProductVersion", "1.42.4" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/test-driver new/pango-1.42.4/test-driver --- old/pango-1.42.3/test-driver 2018-07-30 19:33:29.000000000 +0200 +++ new/pango-1.42.4/test-driver 2018-08-20 17:06:52.000000000 +0200 @@ -1,9 +1,9 @@ -#! /bin/sh +#!/bin/sh # test-driver - basic testsuite driver script. -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,7 +140,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/win32/vs10/pango-version-paths.props new/pango-1.42.4/win32/vs10/pango-version-paths.props --- old/pango-1.42.3/win32/vs10/pango-version-paths.props 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/win32/vs10/pango-version-paths.props 2018-08-20 17:07:02.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>10</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>3</PangoMicroVersion> + <PangoMicroVersion>4</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/win32/vs11/pango-version-paths.props new/pango-1.42.4/win32/vs11/pango-version-paths.props --- old/pango-1.42.3/win32/vs11/pango-version-paths.props 2018-07-30 19:37:34.000000000 +0200 +++ new/pango-1.42.4/win32/vs11/pango-version-paths.props 2018-08-20 17:08:54.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>11</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>3</PangoMicroVersion> + <PangoMicroVersion>4</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/win32/vs12/pango-version-paths.props new/pango-1.42.4/win32/vs12/pango-version-paths.props --- old/pango-1.42.3/win32/vs12/pango-version-paths.props 2018-07-30 19:37:35.000000000 +0200 +++ new/pango-1.42.4/win32/vs12/pango-version-paths.props 2018-08-20 17:08:54.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>12</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>3</PangoMicroVersion> + <PangoMicroVersion>4</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/win32/vs14/pango-version-paths.props new/pango-1.42.4/win32/vs14/pango-version-paths.props --- old/pango-1.42.3/win32/vs14/pango-version-paths.props 2018-07-30 19:37:35.000000000 +0200 +++ new/pango-1.42.4/win32/vs14/pango-version-paths.props 2018-08-20 17:08:54.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>14</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>3</PangoMicroVersion> + <PangoMicroVersion>4</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/win32/vs15/pango-version-paths.props new/pango-1.42.4/win32/vs15/pango-version-paths.props --- old/pango-1.42.3/win32/vs15/pango-version-paths.props 2018-07-30 19:37:35.000000000 +0200 +++ new/pango-1.42.4/win32/vs15/pango-version-paths.props 2018-08-20 17:08:55.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>15</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>3</PangoMicroVersion> + <PangoMicroVersion>4</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.42.3/win32/vs9/pango-version-paths.vsprops new/pango-1.42.4/win32/vs9/pango-version-paths.vsprops --- old/pango-1.42.3/win32/vs9/pango-version-paths.vsprops 2018-07-30 19:33:36.000000000 +0200 +++ new/pango-1.42.4/win32/vs9/pango-version-paths.vsprops 2018-08-20 17:07:01.000000000 +0200 @@ -18,7 +18,7 @@ /> <UserMacro Name="PangoMicroVersion" - Value="3" + Value="4" /> <UserMacro Name="ApiVersion"
