diff --git a/pango-1.40.11.tar.xz b/pango-1.40.11.tar.xz deleted file mode 100644 index f3a3322..0000000 --- a/pango-1.40.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e -size 854372 diff --git a/pango-1.40.12.tar.xz b/pango-1.40.12.tar.xz new file mode 100644 index 0000000..e270f20 --- /dev/null +++ b/pango-1.40.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc +size 856228 diff --git a/pango-fix-default-break-function.patch b/pango-fix-default-break-function.patch deleted file mode 100644 index 9e5a7ba..0000000 --- a/pango-fix-default-break-function.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 6ff8f019170241188b4b76531c60f420bf81ffe2 Mon Sep 17 00:00:00 2001 -From: Peng Wu -Date: Wed, 16 Aug 2017 15:02:36 +0800 -Subject: [PATCH] Fix pango_default_break function for sentence start/end - -Skip the space characters in sentence start/end. - -https://bugzilla.gnome.org/show_bug.cgi?id=785978 ---- - pango/break.c | 39 +++++++++++++++++++++++++++++---------- - 1 file changed, 29 insertions(+), 10 deletions(-) - -Index: pango-1.40.11/pango/break.c -=================================================================== ---- pango-1.40.11.orig/pango/break.c -+++ pango-1.40.11/pango/break.c -@@ -559,6 +559,7 @@ pango_default_break (const gchar *text - gunichar base_character = 0; - - gint last_sentence_start = -1; -+ gint last_non_space = -1; - - gboolean almost_done = FALSE; - gboolean done = FALSE; -@@ -1660,19 +1661,37 @@ pango_default_break (const gchar *text - } - - /* ---- Sentence breaks ---- */ -+ { - -- /* default to not a sentence start/end */ -- attrs[i].is_sentence_start = FALSE; -- attrs[i].is_sentence_end = FALSE; -- -- if (last_sentence_start == -1 && !is_sentence_boundary) { -- last_sentence_start = i - 1; -- attrs[i - 1].is_sentence_start = TRUE; -- } -+ /* default to not a sentence start/end */ -+ attrs[i].is_sentence_start = FALSE; -+ attrs[i].is_sentence_end = FALSE; -+ -+ /* maybe start sentence */ -+ if (last_sentence_start == -1 && !is_sentence_boundary) -+ last_sentence_start = i - 1; -+ -+ /* remember last non space character position */ -+ if (i > 0 && !attrs[i - 1].is_white) -+ last_non_space = i; -+ -+ /* meets sentence end, mark both sentence start and end */ -+ if (last_sentence_start != -1 && is_sentence_boundary) { -+ if (last_non_space != -1) { -+ attrs[last_sentence_start].is_sentence_start = TRUE; -+ attrs[last_non_space].is_sentence_end = TRUE; -+ } -+ -+ last_sentence_start = -1; -+ last_non_space = -1; -+ } -+ -+ /* meets space character, move sentence start */ -+ if (last_sentence_start != -1 && -+ last_sentence_start == i - 1 && -+ attrs[i - 1].is_white) -+ last_sentence_start++; - -- if (last_sentence_start != -1 && is_sentence_boundary) { -- last_sentence_start = -1; -- attrs[i].is_sentence_end = TRUE; - } - - prev_wc = wc; diff --git a/pango.changes b/pango.changes index 3c2ad0a..1770909 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 4 17:40:52 UTC 2017 - zaitor@opensuse.org + +- Update to version 1.40.12: + + Fix pango_default_break for sentence start/end (bgo#785978). + + Fix multilib issue in pango-enum-types.h (bgo#786887). +- Drop pango-fix-default-break-function.patch: Fixed upstream. + ------------------------------------------------------------------- Thu Aug 31 12:33:32 UTC 2017 - pmonrealgonzalez@suse.com diff --git a/pango.spec b/pango.spec index 52da4f2..e6c392b 100644 --- a/pango.spec +++ b/pango.spec @@ -19,7 +19,7 @@ # When updating the binary version, do not forget to also update baselibs.conf %define pango_binary_version 1.8.0 Name: pango -Version: 1.40.11 +Version: 1.40.12 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ @@ -28,8 +28,6 @@ Url: http://www.pango.org/ Source: https://download.gnome.org/sources/pango/1.40/%{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf -# PATCH-FIX-UPSTREAM pango-fix-default-break-function.patch bgo#785978 pmonrealgonzalez@suse.com -- Fix pango_default_break function for sentence start/end -Patch0: pango-fix-default-break-function.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: help2man @@ -121,7 +119,6 @@ to develop applications that require these. %prep %setup -q -%patch0 -p1 %build %meson \