Update to 1.45.1

This commit is contained in:
Kalev Lember 2020-06-09 08:58:49 +02:00
parent 9e05fdd00b
commit 37b20e606f
4 changed files with 9 additions and 61 deletions

1
.gitignore vendored
View File

@ -66,3 +66,4 @@ pango-1.28.1.tar.bz2
/pango-1.44.5.tar.xz
/pango-1.44.6.tar.xz
/pango-1.44.7.tar.xz
/pango-1.45.1.tar.xz

View File

@ -1,4 +1,4 @@
%global glib2_version 2.59.2
%global glib2_version 2.60
%global fribidi_version 0.19.7
%global libthai_version 0.1.9
%global harfbuzz_version 2.0.0
@ -8,14 +8,13 @@
%global freetype_version 2.1.5
Name: pango
Version: 1.44.7
Release: 3%{?dist}
Version: 1.45.1
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.44/%{name}-%{version}.tar.xz
Patch0: replace-fallthrough-comments.patch
Source0: https://download.gnome.org/sources/%{name}/1.45/%{name}-%{version}.tar.xz
BuildRequires: pkgconfig(cairo) >= %{cairo_version}
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
@ -76,7 +75,6 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n pango-%{version}
%patch0 -p1 -b .fallthrouch-comments
%build
@ -130,6 +128,9 @@ fi
%changelog
* 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

View File

@ -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;

View File

@ -1 +1 @@
SHA512 (pango-1.44.7.tar.xz) = 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
SHA512 (pango-1.45.1.tar.xz) = 33d255257bf88a0dd71457454cb91b97f9873fff5e0ed49ca710a6b37e7b74b93ad065c28d7ad6c62fe75dabd11d34a6fc889482674dcf9cf6ffb90c60b2808a