diff --git a/.gitignore b/.gitignore index c9847c4..066020c 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ pango-1.28.1.tar.bz2 /pango-1.49.1.tar.xz /pango-1.49.2.tar.xz /pango-1.49.3.tar.xz +/pango-1.50.0.tar.xz diff --git a/pango-fixes-small-caps.patch b/pango-fixes-small-caps.patch deleted file mode 100644 index 3b4e718..0000000 --- a/pango-fixes-small-caps.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 60f8171f062b4653a41cce02a582caa25331c68f Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sat, 13 Nov 2021 08:15:12 -0500 -Subject: [PATCH 1/2] Fix a bug in Small Caps handling - -We were not passing the correct split_offset to -pango_item_split(). - -Testcase included. - -Fixes: #627 ---- - pango/itemize.c | 4 ++-- - tests/testmisc.c | 24 ++++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 2 deletions(-) - -Index: pango-1.49.3/pango/itemize.c -=================================================================== ---- pango-1.49.3.orig/pango/itemize.c -+++ pango-1.49.3/pango/itemize.c -@@ -1380,7 +1380,7 @@ split_item_for_variant (const char *te - /* p0 .. p is a lowercase segment */ - if (p < end) - { -- new_item = pango_item_split (item, p - p0, g_utf8_strlen (p, p - p0)); -+ new_item = pango_item_split (item, p - p0, g_utf8_strlen (p0, p - p0)); - list_item->data = new_item; - list_item = g_list_insert_before (list_item, list_item->next, item); - list_item = list_item->next; -@@ -1429,7 +1429,7 @@ split_item_for_variant (const char *te - /* p0 .. p is a uppercase segment */ - if (p < end) - { -- new_item = pango_item_split (item, p - p0, g_utf8_strlen (p, p - p0)); -+ new_item = pango_item_split (item, p - p0, g_utf8_strlen (p0, p - p0)); - list_item->data = new_item; - list_item = g_list_insert_before (list_item, list_item->next, item); - list_item = list_item->next; -Index: pango-1.49.3/tests/testmisc.c -=================================================================== ---- pango-1.49.3.orig/tests/testmisc.c -+++ pango-1.49.3/tests/testmisc.c -@@ -754,6 +754,35 @@ test_transform_rectangle (void) - g_assert_cmpint (rect2.height, ==, rect.width); - } - -+/* Test the crash with Small Caps in itemization from #627 */ -+static void -+test_small_caps_crash (void) -+{ -+ PangoContext *context; -+ PangoLayout *layout; -+ PangoFontDescription *desc; -+ int w, h; -+ -+ if (strcmp (G_OBJECT_TYPE_NAME (pango_cairo_font_map_get_default ()), "PangoCairoCoreTextFontMap") == 0) -+ { -+ g_test_skip ("This test needs a fontmap that supports Small-Caps"); -+ return; -+ } -+ -+ context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); -+ layout = pango_layout_new (context); -+ desc = pango_font_description_from_string ("Cantarell Small-Caps 11"); -+ pango_layout_set_font_description (layout, desc); -+ -+ pango_layout_set_text (layout, "Pere Ràfols Soler\nEqualiser, LV2\nAudio: 1, 1\nMidi: 0, 0\nControls: 53, 2\nCV: 0, 0", -1); -+ -+ pango_layout_get_size (layout, &w, &h); -+ -+ pango_font_description_free (desc); -+ g_object_unref (layout); -+ g_object_unref (context); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -787,6 +816,7 @@ main (int argc, char *argv[]) - g_test_add_func ("/layout/empty-line-height", test_empty_line_height); - g_test_add_func ("/layout/gravity-metrics", test_gravity_metrics); - g_test_add_func ("/matrix/transform-rectangle", test_transform_rectangle); -+ g_test_add_func ("/itemize/small-caps-crash", test_small_caps_crash); - - return g_test_run (); - } diff --git a/pango.spec b/pango.spec index 9ffb811..f3260bd 100644 --- a/pango.spec +++ b/pango.spec @@ -1,21 +1,20 @@ %global glib2_version 2.62 %global fribidi_version 1.0.6 %global libthai_version 0.1.9 -%global harfbuzz_version 2.0.0 -%global fontconfig_version 2.12.92 +%global harfbuzz_version 2.6.0 +%global fontconfig_version 2.13.0 %global libXft_version 2.0.0 %global cairo_version 1.12.10 %global freetype_version 2.1.5 Name: pango -Version: 1.49.3 -Release: 2%{?dist} +Version: 1.50.0 +Release: 1%{?dist} Summary: System for layout and rendering of internationalized text License: LGPLv2+ URL: http://www.pango.org -Source0: https://download.gnome.org/sources/%{name}/1.49/%{name}-%{version}.tar.xz -Patch0: pango-fixes-small-caps.patch +Source0: https://download.gnome.org/sources/%{name}/1.50/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(cairo) >= %{cairo_version} BuildRequires: pkgconfig(freetype2) >= %{freetype_version} @@ -127,6 +126,9 @@ fi %changelog +* Tue Dec 07 2021 Kalev Lember - 1.50.0-1 +- Update to 1.50.0 + * Thu Nov 18 2021 Peng Wu - 1.49.3-2 - Fix a bug in Small Caps handling diff --git a/sources b/sources index 7724b68..5a5525b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pango-1.49.3.tar.xz) = 7f78142015140c90177bdc7d1a269be2d8af2ad06553d0fd9699cfb137aafd333873b660d44294e309f4302c41473179616a05534cc286144c378fc1a0d435d1 +SHA512 (pango-1.50.0.tar.xz) = 6420101f24f7f3fcaac19903a9906bff088d1cb50888e95acb0265f66332e203a9d4d521ac2055666612da9651db007a4cea9074a92cd1f8d47d0610b7a72a0d