Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
63
.gitignore
vendored
63
.gitignore
vendored
@ -1,62 +1 @@
|
||||
pango-1.28.1.tar.bz2
|
||||
/pango-1.28.2.tar.bz2
|
||||
/pango-1.28.3.tar.bz2
|
||||
/pango-1.28.4.tar.bz2
|
||||
/pango-1.29.3.tar.xz
|
||||
/pango-1.29.4.tar.xz
|
||||
/pango-1.29.5.tar.xz
|
||||
/pango-1.30.0.tar.xz
|
||||
/pango-1.30.1.tar.xz
|
||||
/pango-1.31.0.tar.xz
|
||||
/pango-1.32.1.tar.xz
|
||||
/pango-1.32.2.tar.xz
|
||||
/pango-1.32.3.tar.xz
|
||||
/pango-1.32.5.tar.xz
|
||||
/pango-1.32.6.tar.xz
|
||||
/pango-1.33.7.tar.xz
|
||||
/pango-1.33.8.tar.xz
|
||||
/pango-1.33.9.tar.xz
|
||||
/pango-1.34.0.tar.xz
|
||||
/pango-1.34.1.tar.xz
|
||||
/pango-1.35.0.tar.xz
|
||||
/pango-1.35.2.tar.xz
|
||||
/pango-1.35.3.tar.xz
|
||||
/pango-1.36.0.tar.xz
|
||||
/pango-1.36.1.tar.xz
|
||||
/pango-1.36.2.tar.xz
|
||||
/pango-1.36.3.tar.xz
|
||||
/pango-1.36.4.tar.xz
|
||||
/pango-1.36.5.tar.xz
|
||||
/pango-1.36.6.tar.xz
|
||||
/pango-1.36.7.tar.xz
|
||||
/pango-1.36.8.tar.xz
|
||||
/pango-1.37.0.tar.xz
|
||||
/pango-1.37.1.tar.xz
|
||||
/pango-1.37.2.tar.xz
|
||||
/pango-1.37.3.tar.xz
|
||||
/pango-1.37.4.tar.xz
|
||||
/pango-1.37.5.tar.xz
|
||||
/pango-1.38.0.tar.xz
|
||||
/pango-1.38.1.tar.xz
|
||||
/pango-1.39.0.tar.xz
|
||||
/pango-1.40.0.tar.xz
|
||||
/pango-1.40.1.tar.xz
|
||||
/pango-1.40.2.tar.xz
|
||||
/pango-1.40.3.tar.xz
|
||||
/pango-1.40.4.tar.xz
|
||||
/pango-1.40.5.tar.xz
|
||||
/pango-1.40.6.tar.xz
|
||||
/pango-1.40.7.tar.xz
|
||||
/pango-1.40.8.tar.xz
|
||||
/pango-1.40.9.tar.xz
|
||||
/pango-1.40.10.tar.xz
|
||||
/pango-1.40.11.tar.xz
|
||||
/pango-1.40.12.tar.xz
|
||||
/pango-1.40.13.tar.xz
|
||||
/pango-1.40.14.tar.xz
|
||||
/pango-1.41.1.tar.xz
|
||||
/pango-1.42.0.tar.xz
|
||||
/pango-1.42.1.tar.xz
|
||||
/pango-1.42.2.tar.xz
|
||||
/pango-1.42.3.tar.xz
|
||||
/pango-1.42.4.tar.xz
|
||||
SOURCES/pango-1.48.7.tar.xz
|
||||
|
||||
1
.pango.metadata
Normal file
1
.pango.metadata
Normal file
@ -0,0 +1 @@
|
||||
b6ea5a5fd68070eea94b598efbc77d0ae11b6783 SOURCES/pango-1.48.7.tar.xz
|
||||
99
SOURCES/pango-update-emoji.patch
Normal file
99
SOURCES/pango-update-emoji.patch
Normal file
@ -0,0 +1,99 @@
|
||||
Index: pango-1.48.7/pango/pango-emoji-table.h
|
||||
===================================================================
|
||||
--- pango-1.48.7.orig/pango/pango-emoji-table.h
|
||||
+++ pango-1.48.7/pango/pango-emoji-table.h
|
||||
@@ -6,14 +6,14 @@
|
||||
*
|
||||
* on file with this header:
|
||||
*
|
||||
- * # emoji-data.txt
|
||||
- * # Date: 2020-01-28, 20:52:38 GMT
|
||||
- * # © 2020 Unicode®, Inc.
|
||||
+ * # emoji-data-14.0.0.txt
|
||||
+ * # Date: 2021-08-26, 17:22:22 GMT
|
||||
+ * # © 2021 Unicode®, Inc.
|
||||
* # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
|
||||
* # For terms of use, see http://www.unicode.org/terms_of_use.html
|
||||
* #
|
||||
* # Emoji Data for UTS #51
|
||||
- * # Version: 13.0
|
||||
+ * # Used with Emoji Version 14.0 and subsequent minor revisions (if any)
|
||||
* #
|
||||
* # For documentation and usage, see http://www.unicode.org/reports/tr51
|
||||
*/
|
||||
@@ -163,24 +163,25 @@ static const struct Interval _pango_Emoj
|
||||
{0x1F680, 0x1F6C5},
|
||||
{0x1F6CB, 0x1F6D2},
|
||||
{0x1F6D5, 0x1F6D7},
|
||||
- {0x1F6E0, 0x1F6E5},
|
||||
+ {0x1F6DD, 0x1F6E5},
|
||||
{0x1F6E9, 0x1F6E9},
|
||||
{0x1F6EB, 0x1F6EC},
|
||||
{0x1F6F0, 0x1F6F0},
|
||||
{0x1F6F3, 0x1F6FC},
|
||||
{0x1F7E0, 0x1F7EB},
|
||||
+ {0x1F7F0, 0x1F7F0},
|
||||
{0x1F90C, 0x1F93A},
|
||||
{0x1F93C, 0x1F945},
|
||||
- {0x1F947, 0x1F978},
|
||||
- {0x1F97A, 0x1F9CB},
|
||||
- {0x1F9CD, 0x1F9FF},
|
||||
+ {0x1F947, 0x1F9FF},
|
||||
{0x1FA70, 0x1FA74},
|
||||
- {0x1FA78, 0x1FA7A},
|
||||
+ {0x1FA78, 0x1FA7C},
|
||||
{0x1FA80, 0x1FA86},
|
||||
- {0x1FA90, 0x1FAA8},
|
||||
- {0x1FAB0, 0x1FAB6},
|
||||
- {0x1FAC0, 0x1FAC2},
|
||||
- {0x1FAD0, 0x1FAD6},
|
||||
+ {0x1FA90, 0x1FAAC},
|
||||
+ {0x1FAB0, 0x1FABA},
|
||||
+ {0x1FAC0, 0x1FAC5},
|
||||
+ {0x1FAD0, 0x1FAD9},
|
||||
+ {0x1FAE0, 0x1FAE7},
|
||||
+ {0x1FAF0, 0x1FAF6},
|
||||
};
|
||||
|
||||
static const struct Interval _pango_Emoji_Presentation_table[] =
|
||||
@@ -251,21 +252,23 @@ static const struct Interval _pango_Emoj
|
||||
{0x1F6CC, 0x1F6CC},
|
||||
{0x1F6D0, 0x1F6D2},
|
||||
{0x1F6D5, 0x1F6D7},
|
||||
+ {0x1F6DD, 0x1F6DF},
|
||||
{0x1F6EB, 0x1F6EC},
|
||||
{0x1F6F4, 0x1F6FC},
|
||||
{0x1F7E0, 0x1F7EB},
|
||||
+ {0x1F7F0, 0x1F7F0},
|
||||
{0x1F90C, 0x1F93A},
|
||||
{0x1F93C, 0x1F945},
|
||||
- {0x1F947, 0x1F978},
|
||||
- {0x1F97A, 0x1F9CB},
|
||||
- {0x1F9CD, 0x1F9FF},
|
||||
+ {0x1F947, 0x1F9FF},
|
||||
{0x1FA70, 0x1FA74},
|
||||
- {0x1FA78, 0x1FA7A},
|
||||
+ {0x1FA78, 0x1FA7C},
|
||||
{0x1FA80, 0x1FA86},
|
||||
- {0x1FA90, 0x1FAA8},
|
||||
- {0x1FAB0, 0x1FAB6},
|
||||
- {0x1FAC0, 0x1FAC2},
|
||||
- {0x1FAD0, 0x1FAD6},
|
||||
+ {0x1FA90, 0x1FAAC},
|
||||
+ {0x1FAB0, 0x1FABA},
|
||||
+ {0x1FAC0, 0x1FAC5},
|
||||
+ {0x1FAD0, 0x1FAD9},
|
||||
+ {0x1FAE0, 0x1FAE7},
|
||||
+ {0x1FAF0, 0x1FAF6},
|
||||
};
|
||||
|
||||
static const struct Interval _pango_Emoji_Modifier_table[] =
|
||||
@@ -313,6 +316,8 @@ static const struct Interval _pango_Emoj
|
||||
{0x1F9BB, 0x1F9BB},
|
||||
{0x1F9CD, 0x1F9CF},
|
||||
{0x1F9D1, 0x1F9DD},
|
||||
+ {0x1FAC3, 0x1FAC5},
|
||||
+ {0x1FAF0, 0x1FAF6},
|
||||
};
|
||||
|
||||
static const struct Interval _pango_Extended_Pictographic_table[] =
|
||||
@ -1,24 +1,21 @@
|
||||
%global glib2_version 2.56.1
|
||||
%global freetype_version 2.1.5
|
||||
%global fontconfig_version 2.11.91
|
||||
%global cairo_version 1.12.10
|
||||
%global glib2_version 2.62
|
||||
%global fribidi_version 0.19.7
|
||||
%global libthai_version 0.1.9
|
||||
%global harfbuzz_version 1.4.2
|
||||
%global harfbuzz_version 2.0.0
|
||||
%global fontconfig_version 2.12.92
|
||||
%global libXft_version 2.0.0
|
||||
%global fribidi_version 1.0
|
||||
%global cairo_version 1.12.10
|
||||
%global freetype_version 2.1.5
|
||||
|
||||
Name: pango
|
||||
Version: 1.42.4
|
||||
Release: 8%{?dist}
|
||||
Version: 1.48.7
|
||||
Release: 3%{?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.42/%{name}-%{version}.tar.xz
|
||||
Patch0: pango-fixes-get-variations-crash.patch
|
||||
Patch1: pango-fixes-bidi-crash.patch
|
||||
Patch2: pango-update-emoji-table.patch
|
||||
Patch3: pango-update-break-table.patch
|
||||
Source0: https://download.gnome.org/sources/%{name}/1.48/%{name}-%{version}.tar.xz
|
||||
Patch0: pango-update-emoji.patch
|
||||
|
||||
BuildRequires: pkgconfig(cairo) >= %{cairo_version}
|
||||
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
|
||||
@ -30,10 +27,9 @@ BuildRequires: pkgconfig(xft) >= %{libXft_version}
|
||||
BuildRequires: pkgconfig(fribidi) >= %{fribidi_version}
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: cairo-gobject-devel
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: help2man
|
||||
BuildRequires: meson
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc gcc-c++
|
||||
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
Requires: freetype%{?_isa} >= %{freetype_version}
|
||||
@ -78,15 +74,13 @@ the functionality of the installed %{name} package.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n pango-%{version}
|
||||
%patch0 -p1 -b .crash
|
||||
%patch1 -p1 -b .bidi
|
||||
%patch2 -p1 -b .emoji
|
||||
%patch3 -p1 -b .break
|
||||
%autosetup -n pango-%{version} -p1
|
||||
|
||||
|
||||
%build
|
||||
%meson -Denable_docs=true
|
||||
%meson \
|
||||
-Dinstall-tests=true
|
||||
|
||||
%meson_build
|
||||
|
||||
|
||||
@ -100,78 +94,157 @@ if ! test -e $PANGOXFT_SO; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README AUTHORS NEWS
|
||||
%doc NEWS README.md
|
||||
%{_libdir}/libpango*-*.so.*
|
||||
%{_bindir}/pango-list
|
||||
%{_bindir}/pango-segmentation
|
||||
%{_bindir}/pango-view
|
||||
%{_mandir}/man1/pango-view.1*
|
||||
%{_libdir}/girepository-1.0/Pango-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/PangoCairo-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/PangoFc-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/PangoFT2-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/PangoOT-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/PangoXft-1.0.typelib
|
||||
|
||||
|
||||
%files devel
|
||||
%{_libdir}/libpango*.so
|
||||
%{_includedir}/*
|
||||
%{_libdir}/pkgconfig/*
|
||||
%doc %{_datadir}/gtk-doc/html/pango
|
||||
%{_datadir}/gir-1.0/Pango-1.0.gir
|
||||
%{_datadir}/gir-1.0/PangoCairo-1.0.gir
|
||||
%{_datadir}/gir-1.0/PangoFc-1.0.gir
|
||||
%{_datadir}/gir-1.0/PangoFT2-1.0.gir
|
||||
%{_datadir}/gir-1.0/PangoOT-1.0.gir
|
||||
%{_datadir}/gir-1.0/PangoXft-1.0.gir
|
||||
|
||||
|
||||
%files tests
|
||||
%{_libexecdir}/installed-tests/%{name}
|
||||
%{_datadir}/installed-tests
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 7 2021 Peng Wu <pwu@redhat.com> - 1.42.4-8
|
||||
- Update grapheme break
|
||||
- Resolves: #1963018
|
||||
* Wed Nov 2 2022 Peng Wu <pwu@redhat.com> - 1.48.7-3
|
||||
- Update pango-emoji-table.h for emoji 14 support
|
||||
- Add pango-update-emoji.patch
|
||||
- Resolves: #2119674
|
||||
|
||||
* Fri May 21 2021 Peng Wu <pwu@redhat.com> - 1.42.4-7
|
||||
- Update emoji table
|
||||
- Resolves: #1963018
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.48.7-2
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Tue Aug 20 2019 Peng Wu <pwu@redhat.com> - 1.42.4-6
|
||||
- Rebuild
|
||||
- Resolves: #1738462
|
||||
* Tue Jul 13 2021 David King <amigadave@amigadave.com> - 1.48.7-1
|
||||
- Update to 1.48.7 (#1981720)
|
||||
|
||||
* Fri Aug 16 2019 Peng Wu <pwu@redhat.com> - 1.42.4-5
|
||||
- Fixes bidi crash
|
||||
- Security fix for CVE-2019-1010238
|
||||
- Resolves: #1738462
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.48.4-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Apr 12 2019 Peng Wu <pwu@redhat.com> - 1.42.4-4
|
||||
* Sat Mar 27 2021 Kalev Lember <klember@redhat.com> - 1.48.4-1
|
||||
- Update to 1.48.4
|
||||
|
||||
* Fri Mar 12 2021 Kalev Lember <klember@redhat.com> - 1.48.3-1
|
||||
- Update to 1.48.3
|
||||
- Disable gtk-doc support as we don't have gi-docgen in Fedora yet
|
||||
|
||||
* Thu Feb 11 2021 Kalev Lember <klember@redhat.com> - 1.48.2-1
|
||||
- Update to 1.48.2
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.48.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Kalev Lember <klember@redhat.com> - 1.48.1-1
|
||||
- Update to 1.48.1
|
||||
|
||||
* Mon Nov 9 2020 Kalev Lember <klember@redhat.com> - 1.48.0-1
|
||||
- Update to 1.48.0
|
||||
|
||||
* Thu Oct 1 2020 Kalev Lember <klember@redhat.com> - 1.47.0-1
|
||||
- Update to 1.47.0
|
||||
|
||||
* Fri Sep 18 2020 Kalev Lember <klember@redhat.com> - 1.46.2-1
|
||||
- Update to 1.46.2
|
||||
|
||||
* Thu Aug 20 2020 Kalev Lember <klember@redhat.com> - 1.46.1-1
|
||||
- Update to 1.46.1
|
||||
|
||||
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 1.46.0-1
|
||||
- Update to 1.46.0
|
||||
|
||||
* Thu Jul 30 2020 Kalev Lember <klember@redhat.com> - 1.45.4-1
|
||||
- Update to 1.45.4
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.45.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jun 22 2020 Adam Williamson <awilliam@redhat.com> - 1.45.3-1
|
||||
- Update to 1.45.3
|
||||
|
||||
* Thu Jun 18 2020 Adam Williamson <awilliam@redhat.com> - 1.45.2-2
|
||||
- Backport MR #206 to fix #485 (crash triggered in various ways)
|
||||
|
||||
* Thu Jun 11 2020 Kalev Lember <klember@redhat.com> - 1.45.2-1
|
||||
- Update to 1.45.2
|
||||
|
||||
* Thu Jun 11 2020 Richard Hughes <rhughes@redhat.com> - 1.45.1-2
|
||||
- Backport a patch to avoid breaking introspection ABI.
|
||||
|
||||
* Tue Jun 09 2020 Kalev Lember <klember@redhat.com> - 1.45.1-1
|
||||
- Update to 1.45.1
|
||||
|
||||
* Tue Apr 07 2020 Timm Baeder <tbaeder@redhat.com> - 1.44.7-3
|
||||
- Add fallthrough-comments.patch to fix build with recent clang versions
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.44.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Oct 25 2019 Kalev Lember <klember@redhat.com> - 1.44.7-1
|
||||
- Update to 1.44.7
|
||||
|
||||
* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 1.44.6-1
|
||||
- Update to 1.44.6
|
||||
|
||||
* Thu Aug 15 2019 Kalev Lember <klember@redhat.com> - 1.44.5-1
|
||||
- Update to 1.44.5
|
||||
|
||||
* Wed Aug 14 2019 Kalev Lember <klember@redhat.com> - 1.44.4-1
|
||||
- Update to 1.44.4
|
||||
|
||||
* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 1.44.3-1
|
||||
- Update to 1.44.3
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Feb 11 2019 Peng Wu <pwu@redhat.com> - 1.43.0-3
|
||||
- Fixes pkg-config issue
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.43.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jan 23 2019 Kalev Lember <klember@redhat.com> - 1.43.0-1
|
||||
- Update to 1.43.0
|
||||
|
||||
* Fri Jan 18 2019 Peng Wu <pwu@redhat.com> - 1.42.4-2
|
||||
- Fixes crash in pango_fc_font_key_get_variations when key is null
|
||||
- Resolves: #1685811
|
||||
|
||||
* Mon Dec 17 2018 Ray Strode <rstrode@redhat.com> - 1.42.4-3
|
||||
- rebuild
|
||||
|
||||
* Fri Dec 14 2018 Ray Strode <rstrode@redhat.com> - 1.42.4-2
|
||||
- rebuild
|
||||
|
||||
* Fri Aug 31 2018 Peng Wu <pwu@redhat.com> - 1.42.4-1
|
||||
* Mon Aug 20 2018 David King <amigadave@amigadave.com> - 1.42.4-1
|
||||
- Update to 1.42.4
|
||||
|
||||
* Mon Aug 20 2018 David King <amigadave@amigadave.com> - 1.42.3-2
|
||||
- Include a fix for invalid Unicode sequence handling
|
||||
|
||||
* Mon Jul 30 2018 Kalev Lember <klember@redhat.com> - 1.42.3-1
|
||||
- Update to 1.42.3
|
||||
|
||||
* Wed Jul 25 2018 Kalev Lember <klember@redhat.com> - 1.42.2-1
|
||||
- Update to 1.42.2
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.42.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri May 04 2018 Kalev Lember <klember@redhat.com> - 1.42.1-2
|
||||
- Rebuild against fribidi 1.0 (#1574861)
|
||||
|
||||
@ -181,6 +254,9 @@ fi
|
||||
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 1.42.0-1
|
||||
- Update to 1.42.0
|
||||
|
||||
* Wed Mar 07 2018 Akira TAGOH <tagoh@redhat.com> - 1.41.1-2
|
||||
- Add BR: gcc-c++
|
||||
|
||||
* Thu Mar 01 2018 Akira TAGOH <tagoh@redhat.com> - 1.41.1-1
|
||||
- New upstream release. (#1550390)
|
||||
- Add BR: pkgconfig(fribidi)
|
||||
@ -1,7 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
@ -1,29 +0,0 @@
|
||||
commit 490f8979a260c16b1df055eab386345da18a2d54
|
||||
Author: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Wed Jul 10 20:26:23 2019 -0400
|
||||
|
||||
bidi: Be safer against bad input
|
||||
|
||||
Don't run off the end of an array that we
|
||||
allocated to certain length.
|
||||
|
||||
Closes: https://gitlab.gnome.org/GNOME/pango/issues/342
|
||||
|
||||
diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
|
||||
index 3e46b66c..5c02dbbb 100644
|
||||
--- a/pango/pango-bidi-type.c
|
||||
+++ b/pango/pango-bidi-type.c
|
||||
@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar *text,
|
||||
for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
|
||||
{
|
||||
gunichar ch = g_utf8_get_char (p);
|
||||
- FriBidiCharType char_type;
|
||||
- char_type = fribidi_get_bidi_type (ch);
|
||||
+ FriBidiCharType char_type = fribidi_get_bidi_type (ch);
|
||||
+
|
||||
+ if (i == n_chars)
|
||||
+ break;
|
||||
+
|
||||
bidi_types[i] = char_type;
|
||||
ored_types |= char_type;
|
||||
if (FRIBIDI_IS_STRONG (char_type))
|
||||
@ -1,31 +0,0 @@
|
||||
commit ad92e199f221499c19f22dce7a16e7d770ad3ae7
|
||||
Author: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>
|
||||
Date: Fri Aug 10 16:06:20 2018 +0200
|
||||
|
||||
Fix crash in pango_fc_font_key_get_variations() when key is null
|
||||
|
||||
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
|
||||
index a59ca67c..53269d73 100644
|
||||
--- a/pango/pangofc-shape.c
|
||||
+++ b/pango/pangofc-shape.c
|
||||
@@ -380,8 +380,10 @@ _pango_fc_shape (PangoFont *font,
|
||||
fc_font->is_hinted ? ft_face->size->metrics.x_ppem : 0,
|
||||
fc_font->is_hinted ? ft_face->size->metrics.y_ppem : 0);
|
||||
|
||||
- variations = pango_fc_font_key_get_variations (key);
|
||||
- if (variations)
|
||||
+ if (key)
|
||||
+ {
|
||||
+ variations = pango_fc_font_key_get_variations (key);
|
||||
+ if (variations)
|
||||
{
|
||||
guint n_variations;
|
||||
hb_variation_t *hb_variations;
|
||||
@@ -391,6 +393,7 @@ _pango_fc_shape (PangoFont *font,
|
||||
|
||||
g_free (hb_variations);
|
||||
}
|
||||
+ }
|
||||
|
||||
hb_buffer = acquire_buffer (&free_buffer);
|
||||
|
||||
@ -1,175 +0,0 @@
|
||||
Index: pango-1.42.4/pango/break.c
|
||||
===================================================================
|
||||
--- pango-1.42.4.orig/pango/break.c
|
||||
+++ pango-1.42.4/pango/break.c
|
||||
@@ -409,15 +409,6 @@ pango_default_break (const gchar *text
|
||||
GB_type = GB_ControlCRLF;
|
||||
break;
|
||||
|
||||
- case G_UNICODE_UNASSIGNED:
|
||||
- /* Unassigned default ignorables */
|
||||
- if ((wc >= 0xFFF0 && wc <= 0xFFF8) ||
|
||||
- (wc >= 0xE0000 && wc <= 0xE0FFF))
|
||||
- {
|
||||
- GB_type = GB_ControlCRLF;
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
case G_UNICODE_OTHER_LETTER:
|
||||
if (makes_hangul_syllable)
|
||||
GB_type = GB_InHangulSyllable;
|
||||
@@ -446,67 +437,103 @@ pango_default_break (const gchar *text
|
||||
GB_type = GB_Extend; /* Grapheme_Extend */
|
||||
break;
|
||||
|
||||
+ case G_UNICODE_UNASSIGNED:
|
||||
+ /* Unassigned default ignorables */
|
||||
+ if ((wc >= 0xFFF0 && wc <= 0xFFF8) ||
|
||||
+ (wc >= 0xE0000 && wc <= 0xE0FFF))
|
||||
+ {
|
||||
+ GB_type = GB_ControlCRLF;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ /* In Unicode 9.0, some emoji characters are unassigned.
|
||||
+ * To support Unicode emoji 13.0, check the emoji characters here.
|
||||
+ */
|
||||
case G_UNICODE_OTHER_SYMBOL:
|
||||
if (G_UNLIKELY(wc == 0x261D ||
|
||||
- wc == 0x26F9 ||
|
||||
- (wc >= 0x270A && wc <= 0x270D) ||
|
||||
- wc == 0x1F385 ||
|
||||
- (wc >= 0x1F3C2 && wc <= 0x1F3C4) ||
|
||||
- wc == 0x1F3C7 ||
|
||||
- (wc >= 0x1F3CA && wc <= 0x1F3CC) ||
|
||||
- (wc >= 0x1F442 && wc <= 0x1F443) ||
|
||||
- (wc >= 0x1F446 && wc <= 0x1F450) ||
|
||||
- wc == 0x1F46E ||
|
||||
- (wc >= 0x1F470 && wc <= 0x1F478) ||
|
||||
- wc == 0x1F47C ||
|
||||
- (wc >= 0x1F481 && wc <= 0x1F483) ||
|
||||
- (wc >= 0x1F485 && wc <= 0x1F487) ||
|
||||
- wc == 0x1F4AA ||
|
||||
- (wc >= 0x1F574 && wc <= 0x1F575) ||
|
||||
- wc == 0x1F57A ||
|
||||
- wc == 0x1F590 ||
|
||||
- (wc >= 0x1F595 && wc <= 0x1F596) ||
|
||||
- (wc >= 0x1F645 && wc <= 0x1F647) ||
|
||||
- (wc >= 0x1F64B && wc <= 0x1F64F) ||
|
||||
- wc == 0x1F6A3 ||
|
||||
- (wc >= 0x1F6B4 && wc <= 0x1F6B6) ||
|
||||
- wc == 0x1F6C0 ||
|
||||
- wc == 0x1F6CC ||
|
||||
- (wc >= 0x1F918 && wc <= 0x1F91C) ||
|
||||
- (wc >= 0x1F91E && wc <= 0x1F91F) ||
|
||||
- wc == 0x1F926 ||
|
||||
- (wc >= 0x1F930 && wc <= 0x1F939) ||
|
||||
- (wc >= 0x1F93D && wc <= 0x1F93E) ||
|
||||
- (wc >= 0x1F9D1 && wc <= 0x1F9DD)))
|
||||
+ wc == 0x26F9 ||
|
||||
+ (wc >= 0x270A && wc <= 0x270D) ||
|
||||
+ wc == 0x1F385 ||
|
||||
+ (wc >= 0x1F3C2 && wc <= 0x1F3C4) ||
|
||||
+ wc == 0x1F3C7 ||
|
||||
+ (wc >= 0x1F3CA && wc <= 0x1F3CC) ||
|
||||
+ (wc >= 0x1F442 && wc <= 0x1F443) ||
|
||||
+ (wc >= 0x1F446 && wc <= 0x1F450) ||
|
||||
+ (wc >= 0x1F46A && wc <= 0x1F478) ||
|
||||
+ wc == 0x1F47C ||
|
||||
+ (wc >= 0x1F481 && wc <= 0x1F483) ||
|
||||
+ (wc >= 0x1F485 && wc <= 0x1F487) ||
|
||||
+ wc == 0x1F48F ||
|
||||
+ wc == 0x1F491 ||
|
||||
+ wc == 0x1F4AA ||
|
||||
+ (wc >= 0x1F574 && wc <= 0x1F575) ||
|
||||
+ wc == 0x1F57A ||
|
||||
+ wc == 0x1F590 ||
|
||||
+ (wc >= 0x1F595 && wc <= 0x1F596) ||
|
||||
+ (wc >= 0x1F645 && wc <= 0x1F647) ||
|
||||
+ (wc >= 0x1F64B && wc <= 0x1F64F) ||
|
||||
+ wc == 0x1F6A3 ||
|
||||
+ (wc >= 0x1F6B4 && wc <= 0x1F6B6) ||
|
||||
+ wc == 0x1F6C0 ||
|
||||
+ wc == 0x1F6CC ||
|
||||
+ wc == 0x1F90C ||
|
||||
+ wc == 0x1F90F ||
|
||||
+ (wc >= 0x1F918 && wc <= 0x1F91C) ||
|
||||
+ (wc >= 0x1F91E && wc <= 0x1F91F) ||
|
||||
+ wc == 0x1F926 ||
|
||||
+ (wc >= 0x1F930 && wc <= 0x1F939) ||
|
||||
+ (wc >= 0x1F93C && wc <= 0x1F93E) ||
|
||||
+ wc == 0x1F977 ||
|
||||
+ (wc >= 0x1F9B5 && wc <= 0x1F9B6) ||
|
||||
+ (wc >= 0x1F9B8 && wc <= 0x1F9B9) ||
|
||||
+ wc == 0x1F9BB ||
|
||||
+ (wc >= 0x1F9CD && wc <= 0x1F9CF) ||
|
||||
+ (wc >= 0x1F9D2 && wc <= 0x1F9DD)))
|
||||
{
|
||||
GB_type = GB_E_Base;
|
||||
break;
|
||||
}
|
||||
- if (G_UNLIKELY(wc == 0x2640 ||
|
||||
- wc == 0x2642 ||
|
||||
- (wc >= 0x2695 && wc <= 0x2696) ||
|
||||
- wc == 0x2708 ||
|
||||
- wc == 0x2764 ||
|
||||
- wc == 0x1F308 ||
|
||||
- wc == 0x1F33E ||
|
||||
- wc == 0x1F373 ||
|
||||
- wc == 0x1F393 ||
|
||||
- wc == 0x1F3A4 ||
|
||||
- wc == 0x1F3A8 ||
|
||||
- wc == 0x1F3EB ||
|
||||
- wc == 0x1F3ED ||
|
||||
- wc == 0x1F48B ||
|
||||
- (wc >= 0x1F4BB && wc <= 0x1F4BC) ||
|
||||
- wc == 0x1F527 ||
|
||||
- wc == 0x1F52C ||
|
||||
- wc == 0x1F5E8 ||
|
||||
- wc == 0x1F680 ||
|
||||
- wc == 0x1F692))
|
||||
+ if (G_UNLIKELY(wc == 0x2620 ||
|
||||
+ wc == 0x2640 ||
|
||||
+ wc == 0x2642 ||
|
||||
+ (wc >= 0x2695 && wc <= 0x2696) ||
|
||||
+ wc == 0x26A7 ||
|
||||
+ wc == 0x2708 ||
|
||||
+ wc == 0x2744 ||
|
||||
+ wc == 0x2764 ||
|
||||
+ wc == 0x2B1B ||
|
||||
+ wc == 0x1F308 ||
|
||||
+ wc == 0x1F32B ||
|
||||
+ wc == 0x1F33E ||
|
||||
+ wc == 0x1F373 ||
|
||||
+ wc == 0x1F37C ||
|
||||
+ wc == 0x1F384 ||
|
||||
+ wc == 0x1F393 ||
|
||||
+ wc == 0x1F3A4 ||
|
||||
+ wc == 0x1F3A8 ||
|
||||
+ wc == 0x1F3EB ||
|
||||
+ wc == 0x1F3ED ||
|
||||
+ wc == 0x1F48B ||
|
||||
+ wc == 0x1F4A8 ||
|
||||
+ wc == 0x1F4AB ||
|
||||
+ (wc >= 0x1F4BB && wc <= 0x1F4BC) ||
|
||||
+ wc == 0x1F525 ||
|
||||
+ wc == 0x1F527 ||
|
||||
+ wc == 0x1F52C ||
|
||||
+ wc == 0x1F5E8 ||
|
||||
+ wc == 0x1F680 ||
|
||||
+ wc == 0x1F692 ||
|
||||
+ (wc >= 0x1F9AF && wc <= 0x1F9B3) ||
|
||||
+ wc == 0x1F9BA ||
|
||||
+ (wc >= 0x1F9BC && wc <= 0x1F9BD) ||
|
||||
+ wc == 0x1FA79))
|
||||
{
|
||||
GB_type = GB_Glue_After_Zwj;
|
||||
break;
|
||||
}
|
||||
- if (G_UNLIKELY(wc >= 0x1F466 && wc <= 0x1F469))
|
||||
+ if (G_UNLIKELY((wc >= 0x1F466 && wc <= 0x1F469) ||
|
||||
+ wc == 0x1F91D ||
|
||||
+ wc == 0x1F9D1))
|
||||
{
|
||||
GB_type = GB_E_Base_GAZ;
|
||||
break;
|
||||
File diff suppressed because it is too large
Load Diff
1
sources
1
sources
@ -1 +0,0 @@
|
||||
SHA512 (pango-1.42.4.tar.xz) = 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
|
||||
@ -1,3 +0,0 @@
|
||||
role_pkgs_req:
|
||||
- rsync
|
||||
- xorg-x11-server-Xvfb
|
||||
@ -1,4 +0,0 @@
|
||||
---
|
||||
|
||||
dependencies:
|
||||
- role: str-common-init
|
||||
@ -1,87 +0,0 @@
|
||||
---
|
||||
- name: Check if GNOME installed-tests testing harness is installed
|
||||
register: gnome_desktop_testing_runner
|
||||
find:
|
||||
paths: "{{ ansible_env.PATH.split(':') }}"
|
||||
pattern: gnome-desktop-testing-runner
|
||||
|
||||
- name: Build and install GNOME installed-tests testing harness
|
||||
when: gnome_desktop_testing_runner.matched == 0
|
||||
block:
|
||||
- name: Installing build dependencies for GNOME installed-tests testing harness
|
||||
package:
|
||||
name:
|
||||
- git
|
||||
- make
|
||||
- gcc
|
||||
- diffutils
|
||||
- autoconf
|
||||
- automake
|
||||
- libtool
|
||||
- glib2-devel
|
||||
- systemd-devel
|
||||
|
||||
- name: Fetching GNOME installed-tests testing harness source from remote repository
|
||||
git:
|
||||
repo: 'https://gitlab.com/redhat/centos-stream/tests/gnome-desktop-testing.git'
|
||||
dest: gnome-desktop-testing
|
||||
force: yes
|
||||
|
||||
- name: Checkout v2021.1 tag in GNOME installed-tests testing harness
|
||||
command: git checkout -b v2021.1 refs/tags/v2021.1
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Configure GNOME installed-tests testing harness build
|
||||
command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Build GNOME installed-tests testing harness
|
||||
command: make
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Install GNOME installed-tests testing harness
|
||||
command: make install
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Start GNOME installed-tests testing harness
|
||||
block:
|
||||
- name: Execute tests
|
||||
shell: |
|
||||
set -e
|
||||
log_file="{{ remote_artifacts }}/{{ installed_test_name }}.log"
|
||||
exec 2>>$log_file 1>>$log_file
|
||||
status="FAIL"
|
||||
dbus-run-session xvfb-run -a -s '-screen 0 1024x768x24' env TMPDIR='{{ remote_artifacts }}' G_MESSAGES_DEBUG='all' gnome-desktop-testing-runner '{{ installed_test_name }}'
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST" >> {{ remote_artifacts }}/test.log
|
||||
|
||||
- name: Check the results
|
||||
shell: |
|
||||
log="{{ remote_artifacts }}/test.log"
|
||||
if [ ! -f "$log" ]; then
|
||||
echo ERROR
|
||||
echo "Test results not found." 1>&2
|
||||
elif grep ^FAIL "$log" 1>&2; then
|
||||
echo FAIL
|
||||
elif grep -q ^PASS "$log"; then
|
||||
echo PASS
|
||||
else
|
||||
echo ERROR
|
||||
echo "No test results found." 1>&2
|
||||
fi
|
||||
register: test_results
|
||||
|
||||
- name: Set role result
|
||||
set_fact:
|
||||
role_result: "{{ test_results.stdout }}"
|
||||
role_message: "{{ test_results.stderr|d('test execution error.') }}"
|
||||
|
||||
- include_role:
|
||||
name: str-common-final
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: gnome-desktop-testing-role
|
||||
installed_test_name: pango
|
||||
tags:
|
||||
- classic
|
||||
- gating
|
||||
required_packages:
|
||||
- abattis-cantarell-fonts
|
||||
|
||||
Loading…
Reference in New Issue
Block a user