From 4f431761cf1483bc28add8bb3019fb36e3ff9d0cb2a3a617738c36c72d57c97c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 12 Oct 2021 13:00:06 +0000 Subject: [PATCH] Accepting request 922343 from home:cgiboudeaux:branches:devel:libraries:c_c++ - Update to 0.7.2 * Fix test failure with newer HarfBuzz versions. * Apply FT_Face transformation matrix when built against FreeType 2.11 or later. * Add meson build system. Autotools build system will be dropped in next release. * Improve MSVC support (#134). * Build and documentation fixes. - Drop upstream patch: * libraqm-fix-cursor_position-GB8a.patch - Add upstream change: * 0001-Pass_version_to_meson_library.patch OBS-URL: https://build.opensuse.org/request/show/922343 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libraqm?expand=0&rev=13 --- 0001-Pass_version_to_meson_library.patch | 22 +++++++++++++++ libraqm-fix-cursor_position-GB8a.patch | 21 -------------- libraqm.changes | 16 +++++++++++ libraqm.spec | 35 +++++++++++++----------- raqm-0.7.1.tar.gz | 3 -- raqm-0.7.2.tar.xz | 3 ++ 6 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 0001-Pass_version_to_meson_library.patch delete mode 100644 libraqm-fix-cursor_position-GB8a.patch delete mode 100644 raqm-0.7.1.tar.gz create mode 100644 raqm-0.7.2.tar.xz diff --git a/0001-Pass_version_to_meson_library.patch b/0001-Pass_version_to_meson_library.patch new file mode 100644 index 0000000..088b23b --- /dev/null +++ b/0001-Pass_version_to_meson_library.patch @@ -0,0 +1,22 @@ +From 819a3e9cdda55aaeb062830cc91afeb6584f410a Mon Sep 17 00:00:00 2001 +From: Khaled Hosny +Date: Tue, 28 Sep 2021 16:10:16 +0200 +Subject: [PATCH] Pass version to meson library + +Fixes https://github.com/HOST-Oman/libraqm/issues/136 +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index 40554b2..16ec18c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ libraqm = library( + 'raqm', + 'raqm.c', + 'raqm.h', ++ version : meson.project_version(), + dependencies : deps, + c_args : ['-DHAVE_CONFIG_H'], + install : true, diff --git a/libraqm-fix-cursor_position-GB8a.patch b/libraqm-fix-cursor_position-GB8a.patch deleted file mode 100644 index 621ead1..0000000 --- a/libraqm-fix-cursor_position-GB8a.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9badec46ab730344063e729070d1829ca5bc04d6 Mon Sep 17 00:00:00 2001 -From: Khaled Hosny -Date: Thu, 26 Aug 2021 16:57:18 +0200 -Subject: [PATCH] This test requires new HarfBuzz - ---- - tests/cursor_position_GB8a.test | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: raqm-0.7.1/tests/cursor_position_GB8a.test -=================================================================== ---- raqm-0.7.1.orig/tests/cursor_position_GB8a.test -+++ raqm-0.7.1/tests/cursor_position_GB8a.test -@@ -1,6 +1,6 @@ - fonts/sha1sum/bcb3b98eb67ece19b8b709f77143d91bcb3d95eb.ttf - 🇦🇧🇨🇩 ----cluster 1 --position 1000 -+--cluster 1 --position 1000 --require HB_020900 - Text is: 🇦🇧🇨🇩 - Direction is: DEFAULT - diff --git a/libraqm.changes b/libraqm.changes index b79f594..a217ef4 100644 --- a/libraqm.changes +++ b/libraqm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Sep 30 08:10:08 UTC 2021 - Christophe Giboudeaux + +- Update to 0.7.2 + * Fix test failure with newer HarfBuzz versions. + * Apply FT_Face transformation matrix when built against FreeType + 2.11 or later. + * Add meson build system. Autotools build system will be dropped + in next release. + * Improve MSVC support (#134). + * Build and documentation fixes. +- Drop upstream patch: + * libraqm-fix-cursor_position-GB8a.patch +- Add upstream change: + * 0001-Pass_version_to_meson_library.patch + ------------------------------------------------------------------- Tue Sep 7 12:08:27 UTC 2021 - Jan Engelhardt diff --git a/libraqm.spec b/libraqm.spec index a957d38..608e514 100644 --- a/libraqm.spec +++ b/libraqm.spec @@ -18,18 +18,20 @@ %define sover 0 Name: libraqm -Version: 0.7.1 +Version: 0.7.2 Release: 0 Summary: Complex Textlayout Library License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/HOST-Oman/libraqm -Source: https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.gz -Patch1: libraqm-fix-cursor_position-GB8a.patch +Source: https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Pass_version_to_meson_library.patch BuildRequires: freetype2-devel BuildRequires: fribidi-devel BuildRequires: gcc BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: pkgconfig(harfbuzz) >= 1.7.2 %description @@ -39,6 +41,8 @@ text layout and provides a convenient API. %package -n %{name}%{sover} Summary: Complex Textlayout Library Group: System/Libraries +# The license and the generic %%doc files were moved to the library subpackage +Conflicts: libraqm-doc < 0.7.2 %description -n %{name}%{sover} Library that encapsulates the logic for complex @@ -63,26 +67,27 @@ text layout and provides a convenient API. %prep %autosetup -n raqm-%{version} -p1 -%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1500 -sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream -%endif %build -%configure --enable-gtk-doc -%make_build - -%check -export LC_ALL=C.utf8 -%make_build check +%meson -Ddocs=true +%meson_build %install -%make_install -rm -fv %{buildroot}/%{_libdir}/*.a %{buildroot}/%{_libdir}/*.la +%meson_install + +%check +# python 3.6 is too old for running tests +%if 0%{suse_version} > 1500 +export LC_ALL=C.utf8 +%meson_test +%endif %post -n %{name}%{sover} -p /sbin/ldconfig %postun -n %{name}%{sover} -p /sbin/ldconfig %files -n %{name}%{sover} +%license COPYING +%doc AUTHORS NEWS README %{_libdir}/libraqm.so.* %files devel @@ -92,8 +97,6 @@ rm -fv %{buildroot}/%{_libdir}/*.a %{buildroot}/%{_libdir}/*.la %{_libdir}/pkgconfig/raqm.pc %files doc -%license COPYING -%doc AUTHORS NEWS README %{_datadir}/gtk-doc/html/raqm %changelog diff --git a/raqm-0.7.1.tar.gz b/raqm-0.7.1.tar.gz deleted file mode 100644 index fabb5b1..0000000 --- a/raqm-0.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86488cf0b8ac736943fa748bd812000db63cc5ab6ad69c942e68e5187f4b9828 -size 677743 diff --git a/raqm-0.7.2.tar.xz b/raqm-0.7.2.tar.xz new file mode 100644 index 0000000..f4f5c67 --- /dev/null +++ b/raqm-0.7.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92e765f180033ef3750832eb6fee4e07de3f99bd3d1eae7cf7e4e390ed2ae8eb +size 223692