Update to 1.40.14

This commit is contained in:
leigh123linux 2017-11-18 14:43:20 +00:00
parent 105214f0a8
commit d8dbd41a92
4 changed files with 8 additions and 47 deletions

1
.gitignore vendored
View File

@ -53,3 +53,4 @@ pango-1.28.1.tar.bz2
/pango-1.40.11.tar.xz
/pango-1.40.12.tar.xz
/pango-1.40.13.tar.xz
/pango-1.40.14.tar.xz

View File

@ -1,42 +0,0 @@
From daa77de8a94d83e2d700ce268553fccffe7cdd0e Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@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.13.6

View File

@ -7,15 +7,13 @@
%global libXft_version 2.0.0
Name: pango
Version: 1.40.13
Release: 2%{?dist}
Version: 1.40.14
Release: 1%{?dist}
Summary: System for layout and rendering of internationalized text
License: LGPLv2+
URL: http://www.pango.org
Source0: http://download.gnome.org/sources/%{name}/1.40/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=789625
Patch0: Fix-ischarbreak-issue-in-pangodefaultbreak-functio.patch
BuildRequires: pkgconfig(cairo) >= %{cairo_version}
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
@ -126,6 +124,10 @@ fi
%changelog
* Sat Nov 18 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.40.14-1
- Update to 1.40.14
- Remove unused patch
* Thu Nov 02 2017 Kalev Lember <klember@redhat.com> - 1.40.13-2
- Backport a patch to fix wrapping long filenames in Nautilus

View File

@ -1 +1 @@
SHA512 (pango-1.40.13.tar.xz) = 0dfc782c0e602eceb2152981e282933a4af3cc0736d3086c103987949f55f5bdda551a37cb77223d082896981312f84ae3ac17c23276596ee28591b1509db48a
SHA512 (pango-1.40.14.tar.xz) = 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea