!10 Upgrade to 1.46.2
From: @weijin-deng Reviewed-by: @dwl301 Signed-off-by: @dwl301
This commit is contained in:
commit
650da2d99f
@ -1,30 +0,0 @@
|
|||||||
From e2d66766171c216052b4d1a112752f6fb5370631 Mon Sep 17 00:00:00 2001
|
|
||||||
From: songnannan <songnannan2@huawei.com>
|
|
||||||
Date: Thu, 16 Apr 2020 21:14:36 +0800
|
|
||||||
Subject: [PATCH] disable layout test
|
|
||||||
|
|
||||||
https://gitlab.gnome.org/GNOME/pango/issues/299
|
|
||||||
|
|
||||||
It comes down to font availability differences on the systems the test
|
|
||||||
are run on, which hard to fix.
|
|
||||||
|
|
||||||
---
|
|
||||||
tests/meson.build | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/meson.build b/tests/meson.build
|
|
||||||
index c617331..a870ccf 100644
|
|
||||||
--- a/tests/meson.build
|
|
||||||
+++ b/tests/meson.build
|
|
||||||
@@ -40,8 +40,6 @@ if cairo_dep.found()
|
|
||||||
[ 'testiter', [ 'testiter.c' ], [ libpangocairo_dep ] ],
|
|
||||||
[ 'test-ellipsize', [ 'test-ellipsize.c' ], [ libpangocairo_dep ] ],
|
|
||||||
[ 'markup-parse', [ 'markup-parse.c' , 'test-common.c' ], [ libpangocairo_dep ] ],
|
|
||||||
- [ 'test-layout', [ 'test-layout.c', 'test-common.c' ], [ libpangocairo_dep ] ],
|
|
||||||
- [ 'test-itemize', [ 'test-itemize.c', 'test-common.c' ], [ libpangocairo_dep ] ],
|
|
||||||
[ 'test-shape', [ 'test-shape.c', 'test-common.c' ], [ libpangocairo_dep ] ],
|
|
||||||
[ 'test-font', [ 'test-font.c' ], [ libpangocairo_dep ] ],
|
|
||||||
[ 'testattributes', [ 'testattributes.c', 'test-common.c' ], [ libpangocairo_dep ] ],
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
pango-1.46.2.tar.xz
Normal file
BIN
pango-1.46.2.tar.xz
Normal file
Binary file not shown.
14
pango.spec
14
pango.spec
@ -1,13 +1,11 @@
|
|||||||
Name: pango
|
Name: pango
|
||||||
Version: 1.45.3
|
Version: 1.46.2
|
||||||
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://download.gnome.org//sources/pango/1.45/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org//sources/pango/1.46/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Patch9000: disable-layout-test.patch
|
|
||||||
|
|
||||||
BuildRequires: pkgconfig(cairo) >= 1.12.10 pkgconfig(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
|
||||||
@ -49,9 +47,6 @@ the %{name}.
|
|||||||
|
|
||||||
test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so
|
test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so
|
||||||
|
|
||||||
%check
|
|
||||||
%meson_test
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc README.md
|
%doc README.md
|
||||||
@ -76,6 +71,11 @@ test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so
|
|||||||
%{_mandir}/man1/pango-view.1.*
|
%{_mandir}/man1/pango-view.1.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 19 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.46.2-1
|
||||||
|
- Upgrade to 1.46.2
|
||||||
|
- Update Version, Source0
|
||||||
|
- Delete Patch9000,delete stage 'check'(meson_test)
|
||||||
|
|
||||||
* Mon Jul 20 2020 wangye <wangye70@huawei.com> -1.45.3-1
|
* Mon Jul 20 2020 wangye <wangye70@huawei.com> -1.45.3-1
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user