update version
This commit is contained in:
parent
380c9817f8
commit
6cf66e2b97
Binary file not shown.
BIN
pango-1.45.3.tar.xz
Normal file
BIN
pango-1.45.3.tar.xz
Normal file
Binary file not shown.
25
pango.spec
25
pango.spec
@ -1,19 +1,18 @@
|
|||||||
Name: pango
|
Name: pango
|
||||||
Version: 1.44.7
|
Version: 1.45.3
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: A library for layout and rendering of text
|
Summary: A library for layout and rendering of text
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://pango.gnome.org/
|
URL: https://pango.gnome.org/
|
||||||
Source0: https://ftp.gnome.org/pub/GNOME/sources/pango/1.44/pango-%{version}.tar.xz
|
Source0: https://download.gnome.org//sources/pango/1.45/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Patch6000: replace-fallthrough-comments.patch
|
|
||||||
Patch9000: disable-layout-test.patch
|
Patch9000: disable-layout-test.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig(cairo) >= 1.12.10 fontconfig >= 2.12.92 pkgconfig(freetype2) >= 2.1.5
|
BuildRequires: pkgconfig(cairo) >= 1.12.10 pkgconfig(fontconfig) >= 2.12.92 pkgconfig(freetype2) >= 2.1.5
|
||||||
BuildRequires: pkgconfig(fribidi) >= 1.0 pkgconfig(glib-2.0) >= 2.59.2 pkgconfig(harfbuzz) >= 2.0.0
|
BuildRequires: pkgconfig(fribidi) >= 1.0 pkgconfig(glib-2.0) >= 2.59.2 pkgconfig(harfbuzz) >= 2.0.0
|
||||||
BuildRequires: pkgconfig(xft) >= 2.0.0 pkgconfig(libthai) >= 0.1.9 pkgconfig(gobject-introspection-1.0)
|
BuildRequires: pkgconfig(xft) >= 2.0.0 pkgconfig(libthai) >= 0.1.9 pkgconfig(gobject-introspection-1.0)
|
||||||
BuildRequires: cairo-gobject-devel gtk-doc meson help2man gcc gcc-c++
|
BuildRequires: cairo-gobject-devel gtk-doc meson help2man gcc gcc-c++ harfbuzz-help
|
||||||
|
|
||||||
Requires: cairo >= 1.12.10 fontconfig >= 2.12.92 freetype >= 2.1.5 fribidi >= 1.0
|
Requires: cairo >= 1.12.10 fontconfig >= 2.12.92 freetype >= 2.1.5 fribidi >= 1.0
|
||||||
Requires: glib2 >= 2.59.2 harfbuzz >= 2.0.0 libXft >= 2.0.0 libthai >= 0.1.9
|
Requires: glib2 >= 2.59.2 harfbuzz >= 2.0.0 libXft >= 2.0.0 libthai >= 0.1.9
|
||||||
@ -57,26 +56,32 @@ test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc README.md
|
%doc README.md
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
%{_libdir}/libpango*-*.so.*
|
||||||
%{_bindir}/%{name}-list
|
%{_bindir}/%{name}-list
|
||||||
%{_bindir}/%{name}-view
|
%{_bindir}/%{name}-view
|
||||||
%{_libdir}/libpango*-1.0.so.*
|
|
||||||
%{_libdir}/girepository-1.0/Pango*-1.0.typelib
|
%{_libdir}/girepository-1.0/Pango*-1.0.typelib
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_includedir}/pango-1.0/pango/*.h
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/pango*.pc
|
%{_includedir}/*
|
||||||
|
%{_libdir}/pkgconfig/*
|
||||||
%{_datadir}/gir-1.0/*.gir
|
%{_datadir}/gir-1.0/*.gir
|
||||||
%{_datadir}/installed-tests/pango/*.test
|
|
||||||
%{_libexecdir}/installed-tests/pango/
|
%{_libexecdir}/installed-tests/pango/
|
||||||
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc NEWS
|
%doc NEWS
|
||||||
%{_mandir}/man1/pango-view.1.gz
|
%{_mandir}/man1/pango-view.1.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 20 2020 wangye <wangye70@huawei.com> -1.45.3-1
|
||||||
|
- Type:bugfix
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- Mainline branch update to 1.44.7
|
||||||
|
|
||||||
* Mon Jun 15 2020 hanhui <hanhui15@huawei.com> -1.44.7-1
|
* Mon Jun 15 2020 hanhui <hanhui15@huawei.com> -1.44.7-1
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
@ -1,54 +0,0 @@
|
|||||||
diff -ruN pango-1.44.7.orig/pango/break.c pango-1.44.7/pango/break.c
|
|
||||||
--- pango-1.44.7.orig/pango/break.c 2020-04-07 13:28:18.558848703 +0200
|
|
||||||
+++ pango-1.44.7/pango/break.c 2020-04-07 14:13:03.555033725 +0200
|
|
||||||
@@ -405,7 +405,7 @@
|
|
||||||
GB_type = GB_Prepend;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- /* fall through */
|
|
||||||
+ __attribute__((fallthrough));
|
|
||||||
case G_UNICODE_CONTROL:
|
|
||||||
case G_UNICODE_LINE_SEPARATOR:
|
|
||||||
case G_UNICODE_PARAGRAPH_SEPARATOR:
|
|
||||||
@@ -421,7 +421,7 @@
|
|
||||||
GB_type = GB_ControlCRLF;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- /* fall through */
|
|
||||||
+ __attribute__((fallthrough));
|
|
||||||
|
|
||||||
case G_UNICODE_OTHER_LETTER:
|
|
||||||
if (makes_hangul_syllable)
|
|
||||||
@@ -594,7 +594,7 @@
|
|
||||||
case G_UNICODE_CONTROL:
|
|
||||||
if (wc != 0x000D && wc != 0x000A && wc != 0x000B && wc != 0x000C && wc != 0x0085)
|
|
||||||
break;
|
|
||||||
- /* fall through */
|
|
||||||
+ __attribute__((fallthrough));
|
|
||||||
case G_UNICODE_LINE_SEPARATOR:
|
|
||||||
case G_UNICODE_PARAGRAPH_SEPARATOR:
|
|
||||||
WB_type = WB_NewlineCRLF; /* CR, LF, Newline */
|
|
||||||
diff -ruN pango-1.44.7.orig/pango/pango-renderer.c pango-1.44.7/pango/pango-renderer.c
|
|
||||||
--- pango-1.44.7.orig/pango/pango-renderer.c 2020-04-07 13:28:18.568848677 +0200
|
|
||||||
+++ pango-1.44.7/pango/pango-renderer.c 2020-04-07 14:12:53.076064830 +0200
|
|
||||||
@@ -222,7 +222,7 @@
|
|
||||||
rect->y + 2 * rect->height,
|
|
||||||
rect->width,
|
|
||||||
rect->height);
|
|
||||||
- /* Fall through */
|
|
||||||
+ __attribute__((fallthrough));
|
|
||||||
case PANGO_UNDERLINE_SINGLE:
|
|
||||||
case PANGO_UNDERLINE_LOW:
|
|
||||||
pango_renderer_draw_rectangle (renderer,
|
|
||||||
diff -ruN pango-1.44.7.orig/tests/testboundaries_ucd.c pango-1.44.7/tests/testboundaries_ucd.c
|
|
||||||
--- pango-1.44.7.orig/tests/testboundaries_ucd.c 2020-04-07 13:28:18.588848625 +0200
|
|
||||||
+++ pango-1.44.7/tests/testboundaries_ucd.c 2020-04-07 14:16:44.621377237 +0200
|
|
||||||
@@ -104,7 +104,7 @@
|
|
||||||
{
|
|
||||||
case 0x00f7: /* DIVISION SIGN: boundary here */
|
|
||||||
temp_attr.bits |= bits.bits;
|
|
||||||
- /* fall through */
|
|
||||||
+ __attribute__((fallthrough));
|
|
||||||
|
|
||||||
case 0x00d7: /* MULTIPLICATION SIGN: no boundary here */
|
|
||||||
break;
|
|
||||||
Loading…
x
Reference in New Issue
Block a user