diff --git a/disable-layout-test.patch b/disable-layout-test.patch deleted file mode 100644 index a9243c9df0408f3eddc4709f1404d56f51a15be9..0000000000000000000000000000000000000000 --- a/disable-layout-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e2d66766171c216052b4d1a112752f6fb5370631 Mon Sep 17 00:00:00 2001 -From: songnannan -Date: Thu, 16 Apr 2020 21:14:36 +0800 -Subject: [PATCH] disable layout test - -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 - diff --git a/pango-1.49.3.tar.xz b/pango-1.49.3.tar.xz deleted file mode 100644 index 5d058d87c0131e9ab4d0de2e6eea3ed9cabb55c8..0000000000000000000000000000000000000000 Binary files a/pango-1.49.3.tar.xz and /dev/null differ diff --git a/pango-1.50.7.tar.xz b/pango-1.50.7.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..420b62d1bc0797461b9cb586875ffc3b78a1cca0 Binary files /dev/null and b/pango-1.50.7.tar.xz differ diff --git a/pango.spec b/pango.spec index 4cd25cbf26389e7acf3b0b39bc9b58ea328695a9..e41cf05296a73ecc63e8ca1cbc0b5609652b5903 100644 --- a/pango.spec +++ b/pango.spec @@ -1,39 +1,42 @@ Name: pango -Version: 1.49.3 -Release: 3 -Summary: A library for layout and rendering of text - +Version: 1.50.7 +Release: 1 +Summary: System for layout and rendering of internationalized text License: LGPLv2+ URL: https://pango.gnome.org/ -Source0: https://download.gnome.org//sources/pango/1.49/%{name}-%{version}.tar.xz - -Patch9000: disable-layout-test.patch +Source0: https://download.gnome.org/sources/%{name}/1.50/%{name}-%{version}.tar.xz -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(cairo) >= 1.12.10 pkgconfig(fontconfig) >= 2.13.0 pkgconfig(freetype2) >= 2.1.5 +BuildRequires: pkgconfig(fribidi) >= 1.0.6 pkgconfig(glib-2.0) >= 2.62 pkgconfig(harfbuzz) >= 2.6.0 BuildRequires: pkgconfig(xft) >= 2.0.0 pkgconfig(libthai) >= 0.1.9 pkgconfig(gobject-introspection-1.0) BuildRequires: cairo-gobject-devel meson help2man gcc gcc-c++ harfbuzz-help +BuildRequires: pango -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: cairo >= 1.12.10 fontconfig >= 2.13.0 freetype >= 2.1.5 fribidi >= 1.0.6 +Requires: glib2 >= 2.62 harfbuzz >= 2.6.0 libXft >= 2.0.0 libthai >= 0.1.9 %description -Pango is a library for layout and rendering of text, with an emphasis -on internationalization. Pango can be used anywhere that text layout -is needed; however, most of the work on Pango so far has been done using -the GTK+ widget toolkit as a test platform. Pango forms the core of text -and font handling for GTK+-2.x. +Pango is a library for laying out and rendering of text, with an emphasis +on internationalization. Pango can be used anywhere that text layout is needed, +though most of the work on Pango so far has been done in the context of the +GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+. + +Pango is designed to be modular; the core Pango layout engine can be used +with different font backends. + +The integration of Pango with Cairo provides a complete solution with high +quality text handling and graphics rendering. %package devel -Summary: Development environment for %{name} +Summary: Development files for pango Requires: %{name} = %{version}-%{release} freetype-devel >= 2.1.5 -Requires: glib2-devel >= 2.59.2 fontconfig-devel >= 2.12.92 cairo-devel >= 1.12.10 +Requires: glib2-devel >= 2.62 fontconfig-devel >= 2.13.0 cairo-devel >= 1.12.10 Provides: %{name}-tests = %{version}-%{release} Obsoletes: %{name}-tests < %{version}-%{release} %description devel -The %{name}-devel package contains libraries header files and tests for -the %{name}. +The pango-devel package includes the header files and developer documentation +for the pango package. %package_help @@ -41,13 +44,20 @@ the %{name}. %autosetup -n %{name}-%{version} -p1 %build -%meson -Denable_docs=true -Dinstall-tests=true +%meson -Dgtk_docs=true -Dinstall-tests=true %meson_build %install %meson_install -test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so +PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so +if ! test -e $PANGOXFT_SO; then + echo "$PANGOXFT_SO not found; did not build with Xft support?" + ls $RPM_BUILD_ROOT%{_libdir} + exit 1 +fi + +%check %files %defattr(-,root,root) @@ -74,6 +84,9 @@ test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so %{_mandir}/man1/pango-view.1.* %changelog +* Mon Oct 31 2022 lin zhang - 1.50.7-1 +- Upgrade to 1.50.7 + * Fri Mar 25 2022 zhanzhimin - 1.49.3-3 - delete old dynamic library @@ -124,4 +137,3 @@ test -e %{buildroot}%{_libdir}/libpangoxft-1.0.so * Sun Sep 15 2019 openEuler Buildteam - 1.43.0-1 - Package Init -