Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2021-01-26 14:44:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango" Tue Jan 26 14:44:27 2021 rev:126 rq:866097 version:1.48.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2020-11-23 10:37:56.565851401 +0100 +++ /work/SRC/openSUSE:Factory/.pango.new.28504/pango.changes 2021-01-26 14:44:28.923230360 +0100 @@ -1,0 +2,8 @@ +Fri Jan 22 13:02:56 UTC 2021 - Bj??rn Lie <[email protected]> + +- Update to version 1.48.1: + + Fix itemization of multi-paragraph layouts. + + Fix a few memory leaks. + + Fix glyph origins in vertical layout. + +------------------------------------------------------------------- Old: ---- pango-1.48.0.obscpio New: ---- pango-1.48.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.KIZqdH/_old 2021-01-26 14:44:29.595231400 +0100 +++ /var/tmp/diff_new_pack.KIZqdH/_new 2021-01-26 14:44:29.599231406 +0100 @@ -1,7 +1,7 @@ # # spec file for package pango # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: pango -Version: 1.48.0 +Version: 1.48.1 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1-or-later @@ -30,13 +30,13 @@ BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: help2man -BuildRequires: meson >= 0.54.0 +BuildRequires: meson >= 0.55.3 BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) >= 1.12.10 BuildRequires: pkgconfig(fontconfig) >= 2.11.91 BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fribidi) >= 0.19.7 -BuildRequires: pkgconfig(glib-2.0) >= 2.60 +BuildRequires: pkgconfig(glib-2.0) >= 2.62 BuildRequires: pkgconfig(gobject-2.0) >= 2.59.2 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(harfbuzz) >= 2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KIZqdH/_old 2021-01-26 14:44:29.635231462 +0100 +++ /var/tmp/diff_new_pack.KIZqdH/_new 2021-01-26 14:44:29.635231462 +0100 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://gitlab.gnome.org/GNOME/pango.git</param> <param name="scm">git</param> - <param name="revision">1.48.0</param> + <param name="revision">refs/tags/1.48.1</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionrewrite-pattern">(.*)\+0</param> <param name="versionrewrite-replacement">\1</param> ++++++ pango-1.48.0.obscpio -> pango-1.48.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/.gitlab-ci/fedora.Dockerfile new/pango-1.48.1/.gitlab-ci/fedora.Dockerfile --- old/pango-1.48.0/.gitlab-ci/fedora.Dockerfile 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/.gitlab-ci/fedora.Dockerfile 2021-01-22 00:05:22.000000000 +0100 @@ -41,7 +41,7 @@ thai-scalable-waree-fonts \ && dnf clean all -RUN pip3 install meson==0.54.3 +RUN pip3 install meson==0.56 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/.gitlab-ci/run-tests.sh new/pango-1.48.1/.gitlab-ci/run-tests.sh --- old/pango-1.48.0/.gitlab-ci/run-tests.sh 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/.gitlab-ci/run-tests.sh 2021-01-22 00:05:22.000000000 +0100 @@ -8,6 +8,8 @@ # Ignore memory leaks lower in dependencies export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp +# Check leaks of slices +export G_SLICE=always-malloc meson test -C ${builddir} \ --print-errorlogs \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/.gitlab-ci.yml new/pango-1.48.1/.gitlab-ci.yml --- old/pango-1.48.0/.gitlab-ci.yml 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/.gitlab-ci.yml 2021-01-22 00:05:22.000000000 +0100 @@ -8,9 +8,16 @@ variables: COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror" MESON_TEST_TIMEOUT_MULTIPLIER: 2 - FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v3 + FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v4 + +.only-default: + only: + - branches + except: + - tags linux-fedora: + extends: .only-default image: $FEDORA_IMAGE stage: build needs: [] @@ -35,6 +42,7 @@ - "${CI_PROJECT_DIR}/_build/fontlist.txt" asan-build: + extends: .only-default image: $FEDORA_IMAGE tags: [ asan ] stage: analysis @@ -58,6 +66,7 @@ - "${CI_PROJECT_DIR}/_build/fontlist.txt" msys2-mingw64: + extends: .only-default stage: build needs: [] tags: @@ -74,9 +83,35 @@ name: "${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always paths: - - _build/meson-logs - - _build/hello.png - - _build/fontlist.txt + - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/_build/hello.png" + - "${CI_PROJECT_DIR}/_build/fontlist.txt" + +macos: + extends: .only-default + only: + - branches@GNOME/pango + stage: build + tags: + - macos + needs: [] + before_script: + - pip3 install --user meson==0.56 + - pip3 install --user ninja + - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH + script: + - meson -Dintrospection=disabled + -Dcpp_std=c++11 + -Dpixman:tests=disabled + _build + - ninja -C _build + - .gitlab-ci/run-tests.sh _build + artifacts: + when: always + paths: + - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/_build/hello.png" + - "${CI_PROJECT_DIR}/_build/fontlist.txt" reference: image: $FEDORA_IMAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/NEWS new/pango-1.48.1/NEWS --- old/pango-1.48.0/NEWS 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/NEWS 2021-01-22 00:05:22.000000000 +0100 @@ -1,3 +1,13 @@ +Overview of changes in 1.48.1 +============================= +- Require GLib 2.62 +- Require meson 0.55.3 +- ci: Add a MacOS build +- macos: Implement pango_font_get_face +- Fix itemization of multi-paragraph layouts +- Fix a few memory leaks +- Fix glyph origins in vertical layout + Overview of changes in 1.48.0 ============================= - docs: Clarify use of PangoAnalysis in shaping diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/lsan.supp new/pango-1.48.1/lsan.supp --- old/pango-1.48.0/lsan.supp 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/lsan.supp 2021-01-22 00:05:22.000000000 +0100 @@ -1,5 +1,4 @@ leak:g_quark_init -leak:libc.so leak:libfontconfig.so leak:libcairo.so leak:libpixman-1.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/meson.build new/pango-1.48.1/meson.build --- old/pango-1.48.0/meson.build 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/meson.build 2021-01-22 00:05:22.000000000 +0100 @@ -1,5 +1,5 @@ project('pango', 'c', 'cpp', - version: '1.48.0', + version: '1.48.1', license: 'LGPLv2.1+', default_options: [ 'buildtype=debugoptimized', @@ -8,7 +8,7 @@ # https://github.com/mesonbuild/meson/issues/2289 'c_std=gnu99', ], - meson_version : '>= 0.54.0') + meson_version : '>= 0.55.3') add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_POSIX_THREAD_SAFE_FUNCTIONS', '-D_GNU_SOURCE', ], language: 'c') @@ -190,7 +190,7 @@ # Dependencies pango_deps = [] -glib_req_version = '>= 2.60' +glib_req_version = '>= 2.62' fribidi_req_version = '>= 0.19.7' libthai_req_version = '>= 0.1.9' harfbuzz_req_version = '>= 2.0.0' @@ -239,7 +239,9 @@ harfbuzz_lib='' fontconfig_lib='' -harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req_version, required: false) +harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req_version, required: false, + fallback: ['harfbuzz', 'libharfbuzz_dep'], + default_options: ['coretext=enabled']) if harfbuzz_dep.found() harfbuzz_pc = 'harfbuzz' else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/meson.build new/pango-1.48.1/pango/meson.build --- old/pango-1.48.0/pango/meson.build 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/meson.build 2021-01-22 00:05:22.000000000 +0100 @@ -128,7 +128,11 @@ gir_args = [ '--quiet', ] - + harfbuzz_gobject_dep = dependency('harfbuzz-gobject', version: harfbuzz_req_version, required: false, + fallback: ['harfbuzz', 'libharfbuzz_gobject_dep']) + if harfbuzz_gobject_dep.found() + pango_deps += harfbuzz_gobject_dep + endif pango_gir = gnome.generate_gir( libpango, sources: pango_sources + pango_headers + [ pango_enum_h ], @@ -137,6 +141,7 @@ identifier_prefix: 'Pango', symbol_prefix: 'pango', export_packages: 'pango', + dependencies: pango_deps, includes: [ 'HarfBuzz-0.0', 'GObject-2.0', 'cairo-1.0', ], header: 'pango/pango.h', install: true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pango-context.c new/pango-1.48.1/pango/pango-context.c --- old/pango-1.48.0/pango/pango-context.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pango-context.c 2021-01-22 00:05:22.000000000 +0100 @@ -1572,7 +1572,7 @@ g_return_val_if_fail (length >= 0, NULL); g_return_val_if_fail (length == 0 || text != NULL, NULL); - if (length == 0 || g_utf8_strlen (text, length) == 0) + if (length == 0 || g_utf8_strlen (text + start_index, length) == 0) return NULL; itemize_state_init (&state, context, text, base_dir, start_index, length, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pango-layout.c new/pango-1.48.1/pango/pango-layout.c --- old/pango-1.48.0/pango/pango-layout.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pango-layout.c 2021-01-22 00:05:22.000000000 +0100 @@ -407,7 +407,7 @@ * paragraph. That is, the total number of lines shown may well be more than * this value if the layout contains multiple paragraphs of text. * The default value of -1 means that first line of each paragraph is ellipsized. - * This behvaior may be changed in the future to act per layout instead of per + * This behavior may be changed in the future to act per layout instead of per * paragraph. File a bug against pango at <ulink * url="http://bugzilla.gnome.org/";>http://bugzilla.gnome.org/</ulink> if your * code relies on this behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pangocairo-fontmap.c new/pango-1.48.1/pango/pangocairo-fontmap.c --- old/pango-1.48.0/pango/pangocairo-fontmap.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pangocairo-fontmap.c 2021-01-22 00:05:22.000000000 +0100 @@ -101,7 +101,7 @@ " fontconfig" #endif ; - g_error ("Unknown $PANGOCAIRO_BACKEND value.\n Available backends are:%s", backends); + g_critical ("Unknown $PANGOCAIRO_BACKEND value.\n Available backends are:%s", backends); } return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pangocoretext-fontmap.c new/pango-1.48.1/pango/pangocoretext-fontmap.c --- old/pango-1.48.0/pango/pangocoretext-fontmap.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pangocoretext-fontmap.c 2021-01-22 00:05:22.000000000 +0100 @@ -1859,3 +1859,54 @@ } } +PangoCoreTextFace * +pango_core_text_font_map_find_face (PangoCoreTextFontMap *map, + const PangoCoreTextFontKey *key) +{ + CTFontDescriptorRef desc; + gboolean synthetic_italic; + char *family; + char *family_name; + char *style_name; + PangoWeight weight; + CTFontSymbolicTraits traits; + PangoCoreTextFamily *font_family; + PangoCoreTextFace *result = NULL; + + desc = pango_core_text_font_key_get_ctfontdescriptor (key); + synthetic_italic = pango_core_text_font_key_get_synthetic_italic (key); + + family_name = ct_font_descriptor_get_family_name (desc, FALSE); + style_name = ct_font_descriptor_get_style_name (desc); + weight = ct_font_descriptor_get_weight (desc); + traits = ct_font_descriptor_get_traits (desc); + + family = g_utf8_casefold (family_name, -1); + + font_family = g_hash_table_lookup (map->families, family); + + if (font_family) + { + pango_font_family_list_faces ((PangoFontFamily *)font_family, NULL, NULL); + + for (int i = 0; i < font_family->n_faces; i++) + { + PangoCoreTextFace *face = (PangoCoreTextFace *)font_family->faces[i]; + + if (face->weight == weight && + face->traits == traits && + face->synthetic_italic == synthetic_italic && + strcmp (face->style_name, style_name) == 0) + { + result = face; + break; + } + } + } + + g_free (family); + g_free (family_name); + g_free (style_name); + + return result; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pangocoretext-private.h new/pango-1.48.1/pango/pangocoretext-private.h --- old/pango-1.48.0/pango/pangocoretext-private.h 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pangocoretext-private.h 2021-01-22 00:05:22.000000000 +0100 @@ -122,8 +122,6 @@ void _pango_core_text_font_set_font_map (PangoCoreTextFont *afont, PangoCoreTextFontMap *fontmap); -void _pango_core_text_font_set_face (PangoCoreTextFont *afont, - PangoCoreTextFace *aface); PangoCoreTextFace * _pango_core_text_font_get_face (PangoCoreTextFont *font); gpointer _pango_core_text_font_get_context_key (PangoCoreTextFont *afont); void _pango_core_text_font_set_context_key (PangoCoreTextFont *afont, @@ -152,6 +150,9 @@ _PANGO_EXTERN CTFontDescriptorRef pango_core_text_font_key_get_ctfontdescriptor (const PangoCoreTextFontKey *key); +PangoCoreTextFace * pango_core_text_font_map_find_face (PangoCoreTextFontMap *map, + const PangoCoreTextFontKey *key); + G_END_DECLS #endif /* __PANGOCORETEXT_PRIVATE_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pangocoretext.c new/pango-1.48.1/pango/pangocoretext.c --- old/pango-1.48.0/pango/pangocoretext.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pangocoretext.c 2021-01-22 00:05:22.000000000 +0100 @@ -36,7 +36,6 @@ struct _PangoCoreTextFontPrivate { - PangoCoreTextFace *face; gpointer context_key; CTFontRef font_ref; @@ -224,21 +223,12 @@ g_weak_ref_set((GWeakRef *) &priv->fontmap, fontmap); } -void -_pango_core_text_font_set_face (PangoCoreTextFont *ctfont, - PangoCoreTextFace *ctface) -{ - PangoCoreTextFontPrivate *priv = ctfont->priv; - - priv->face = ctface; -} - PangoCoreTextFace * _pango_core_text_font_get_face (PangoCoreTextFont *font) { PangoCoreTextFontPrivate *priv = font->priv; - return priv->face; + return pango_core_text_font_map_find_face (PANGO_CORE_TEXT_FONT_MAP (priv->fontmap), priv->key); } gpointer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/pango/pangofc-shape.c new/pango-1.48.1/pango/pangofc-shape.c --- old/pango-1.48.0/pango/pangofc-shape.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/pango/pangofc-shape.c 2021-01-22 00:05:22.000000000 +0100 @@ -409,9 +409,12 @@ for (i = 0; i < num_glyphs; i++) { /* 90 degrees rotation counter-clockwise. */ - infos[i].geometry.width = hb_position->y_advance; - infos[i].geometry.x_offset = hb_position->y_offset; - infos[i].geometry.y_offset = - hb_position->x_offset; + hb_position_t x_origin = 0, y_origin = 0; + hb_font_get_glyph_v_origin + (hb_font, infos[i].glyph, &x_origin, &y_origin); + infos[i].geometry.width = - hb_position->y_advance; + infos[i].geometry.x_offset = - hb_position->y_offset - y_origin; + infos[i].geometry.y_offset = - hb_position->x_offset - x_origin; hb_position++; } else /* horizontal */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/subprojects/cairo.wrap new/pango-1.48.1/subprojects/cairo.wrap --- old/pango-1.48.0/subprojects/cairo.wrap 1970-01-01 01:00:00.000000000 +0100 +++ new/pango-1.48.1/subprojects/cairo.wrap 2021-01-22 00:05:22.000000000 +0100 @@ -0,0 +1,6 @@ +[wrap-git] +directory=cairo +url=https://gitlab.freedesktop.org/cairo/cairo.git +push-url=ssh://[email protected]:cairo/cairo.git +revision=master +depth=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/subprojects/gobject-introspection.wrap new/pango-1.48.1/subprojects/gobject-introspection.wrap --- old/pango-1.48.0/subprojects/gobject-introspection.wrap 1970-01-01 01:00:00.000000000 +0100 +++ new/pango-1.48.1/subprojects/gobject-introspection.wrap 2021-01-22 00:05:22.000000000 +0100 @@ -0,0 +1,10 @@ +[wrap-git] +directory=gobject-introspection +url=https://gitlab.gnome.org/GNOME/gobject-introspection.git +push-url=ssh://[email protected]:GNOME/gobject-introspection.git +revision=master +depth=1 + +[provides] +dependency_names = gobject-introspection-1.0 +program_names = g-ir-scanner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/test-break.c new/pango-1.48.1/tests/test-break.c --- old/pango-1.48.0/tests/test-break.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/test-break.c 2021-01-22 00:05:22.000000000 +0100 @@ -72,12 +72,9 @@ if (pango_layout_get_unknown_glyphs_count (layout) > 0) { -#if 0 - // See https://github.com/mesonbuild/meson/issues/7515 char *msg = g_strdup_printf ("Missing glyphs - skipping %s. Maybe fonts are missing?", filename); g_test_skip (msg); g_free (msg); -#endif g_free (contents); g_object_unref (layout); pango_attr_list_unref (attributes); @@ -263,12 +260,9 @@ setlocale (LC_ALL, "en_US.utf8"); if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL) { -#if 0 - // See https://github.com/mesonbuild/meson/issues/7515 char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping break %s", filename); g_test_skip (msg); g_free (msg); -#endif g_free (old_locale); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/test-font.c new/pango-1.48.1/tests/test-font.c --- old/pango-1.48.0/tests/test-font.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/test-font.c 2021-01-22 00:05:22.000000000 +0100 @@ -164,9 +164,12 @@ PangoGlyphString *glyphs; PangoRectangle ink, log; PangoContext *context; + PangoFontDescription *desc; context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); - pango_context_set_font_description (context, pango_font_description_from_string ("Cantarell 11")); + desc = pango_font_description_from_string("Cantarell 11"); + pango_context_set_font_description (context, desc); + pango_font_description_free (desc); items = pango_itemize (context, str, 0, strlen (str), NULL, NULL); glyphs = pango_glyph_string_new (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/test-itemize.c new/pango-1.48.1/tests/test-itemize.c --- old/pango-1.48.0/tests/test-itemize.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/test-itemize.c 2021-01-22 00:05:22.000000000 +0100 @@ -241,12 +241,9 @@ setlocale (LC_ALL, "en_US.utf8"); if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL) { -#if 0 - // See https://github.com/mesonbuild/meson/issues/7515 char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping itemization %s", filename); g_test_skip (msg); g_free (msg); -#endif return; } @@ -282,6 +279,7 @@ g_free (diff); g_string_free (dump, TRUE); g_free (expected_file); + g_object_unref (context); } int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/test-layout.c new/pango-1.48.1/tests/test-layout.c --- old/pango-1.48.0/tests/test-layout.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/test-layout.c 2021-01-22 00:05:22.000000000 +0100 @@ -311,12 +311,9 @@ setlocale (LC_ALL, "en_US.utf8"); if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL) { -#if 0 - // See https://github.com/mesonbuild/meson/issues/7515 char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping layout %s", filename); g_test_skip (msg); g_free (msg); -#endif return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/test-shape.c new/pango-1.48.1/tests/test-shape.c --- old/pango-1.48.0/tests/test-shape.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/test-shape.c 2021-01-22 00:05:22.000000000 +0100 @@ -361,7 +361,10 @@ g_free (path); if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - return 0; + { + g_error_free (error); + return 0; + } g_assert_no_error (error); while ((name = g_dir_read_name (dir)) != NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/testboundaries_ucd.c new/pango-1.48.1/tests/testboundaries_ucd.c --- old/pango-1.48.0/tests/testboundaries_ucd.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/testboundaries_ucd.c 2021-01-22 00:05:22.000000000 +0100 @@ -232,9 +232,8 @@ channel = g_io_channel_new_file (filename, "r", &error); if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) { -#if 0 g_test_skip ("Test file not found"); -#endif + g_error_free (error); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/tests/testmisc.c new/pango-1.48.1/tests/testmisc.c --- old/pango-1.48.0/tests/testmisc.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/tests/testmisc.c 2021-01-22 00:05:22.000000000 +0100 @@ -54,6 +54,19 @@ g_object_unref (context); } +static void +test_itemize_utf8 (void) +{ + PangoContext *context; + GList *result = NULL; + + context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); + result = pango_itemize_with_base_dir (context, PANGO_DIRECTION_LTR, "\xc3\xa1\na", 3, 1, NULL, NULL); + g_assert (result != NULL); + + g_object_unref (context); +} + /* Test that pango_layout_set_text (layout, "short", 200) * does not lead to a crash. (pidgin does this) */ @@ -94,6 +107,7 @@ g_test_add_func ("/layout/shape-tab-crash", test_shape_tab_crash); g_test_add_func ("/layout/itemize-empty-crash", test_itemize_empty_crash); + g_test_add_func ("/layout/itemize-utf8", test_itemize_utf8); g_test_add_func ("/layout/short-string-crash", test_short_string_crash); g_test_add_func ("/language/emoji-crash", test_language_emoji_crash); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.48.0/utils/pango-list.c new/pango-1.48.1/utils/pango-list.c --- old/pango-1.48.0/utils/pango-list.c 2020-11-08 15:29:15.000000000 +0100 +++ new/pango-1.48.1/utils/pango-list.c 2021-01-22 00:05:22.000000000 +0100 @@ -200,6 +200,7 @@ g_free (faces); } g_free (families); + g_object_unref (ctx); g_object_unref (fontmap); return 0; ++++++ pango.obsinfo ++++++ --- /var/tmp/diff_new_pack.KIZqdH/_old 2021-01-26 14:44:29.867231821 +0100 +++ /var/tmp/diff_new_pack.KIZqdH/_new 2021-01-26 14:44:29.867231821 +0100 @@ -1,5 +1,5 @@ name: pango -version: 1.48.0 -mtime: 1604845755 -commit: a39fea44c7c9f982fcca6d639929545dd3e09eb7 +version: 1.48.1 +mtime: 1611270322 +commit: 65577fee8e8e7e01cabab72552f64f668270e640
