r54878 - in /desktop/unstable/pango1.0/debian: changelog patches/0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Nov 15 17:39:27 2017
New Revision: 54878

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54878
Log:
Add 0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch.
Fixes a regression introduced in 1.40.13 resulting in word wrapping / line
breaks being broken. (Closes: #880674)

Added:
    desktop/unstable/pango1.0/debian/patches/0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/patches/series

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=54878&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Wed Nov 15 17:39:27 2017
@@ -1,8 +1,14 @@
 pango1.0 (1.40.13-2) UNRELEASED; urgency=medium
 
+  [ Simon McVittie ]
   * gir1.2-pango-1.0 Provides gir1.2-pangocairo-1.0,
     gir1.2-pangoft2-1.0, gir1.2-pangoxft-1.0 to reflect the additional
     typelibs that it contains
+
+  [ Michael Biebl ]
+  * Add 0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch.
+    Fixes a regression introduced in 1.40.13 resulting in word wrapping / line
+    breaks being broken. (Closes: #880674)
 
  -- Simon McVittie <smcv at debian.org>  Mon, 13 Nov 2017 00:20:19 +0000
 

Added: desktop/unstable/pango1.0/debian/patches/0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch?rev=54878&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch	(added)
+++ desktop/unstable/pango1.0/debian/patches/0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch	[utf-8] Wed Nov 15 17:39:27 2017
@@ -0,0 +1,43 @@
+From e8316c1c6f46b844b265478622d3a581305b70b6 Mon Sep 17 00:00:00 2001
+From: Peng Wu <alexepico at gmail.com>
+Date: Tue, 31 Oct 2017 13:07:02 +0800
+Subject: [PATCH] Fix is_char_break issue in pango_default_break function
+
+For most cases, the is_char_break variable should be TRUE.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789625
+---
+ pango/break.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/pango/break.c b/pango/break.c
+index c46f3382..2e66972e 100644
+--- a/pango/break.c
++++ b/pango/break.c
+@@ -1159,11 +1159,10 @@ pango_default_break (const gchar   *text,
+ 	    }
+ 
+ 	  attrs[i].is_line_break = TRUE; /* Rule LB31 */
+-	  /* Unicode doesn't specify char wrap; we wrap around all chars
+-	   * except where a line break is prohibited, which means we
+-	   * effectively break everywhere except inside runs of spaces.
+-	   */
+-	  attrs[i].is_char_break = TRUE;
++	  /* Unicode doesn't specify char wrap;
++	     we wrap around all chars currently. */
++	  if (attrs[i].is_cursor_position)
++	    attrs[i].is_char_break = TRUE;
+ 
+ 	  /* Make any necessary replacements first */
+ 	  if (row_break_type == G_UNICODE_BREAK_UNKNOWN)
+@@ -1458,7 +1457,6 @@ pango_default_break (const gchar   *text,
+ 	    {
+ 	    case BREAK_PROHIBITED:
+ 	      /* can't break here */
+-	      attrs[i].is_char_break = FALSE;
+ 	      attrs[i].is_line_break = FALSE;
+ 	      break;
+ 
+-- 
+2.15.0
+

Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=54878&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/series	[utf-8] Wed Nov 15 17:39:27 2017
@@ -0,0 +1 @@
+0001-Fix-is_char_break-issue-in-pango_default_break-funct.patch