From a0391487269558572d8490ea58caeaf4e125fe26 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 3 Oct 2021 19:54:40 -0400 Subject: [PATCH] Update to 0.7.2 - Minor cleanups to the spec --- .gitignore | 1 + 0001-Pass-version-to-meson-library.patch | 25 ++++++++++++++++ 0001-Update-text-expectation.patch | 29 ------------------- libraqm.spec | 37 ++++++++++-------------- sources | 2 +- 5 files changed, 43 insertions(+), 51 deletions(-) create mode 100644 0001-Pass-version-to-meson-library.patch delete mode 100644 0001-Update-text-expectation.patch diff --git a/.gitignore b/.gitignore index 6916a0b..4cda18a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /raqm-0.1.1.tar.gz /raqm-0.5.0.tar.gz /raqm-0.7.0.tar.gz +/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..83d23ef --- /dev/null +++ b/0001-Pass-version-to-meson-library.patch @@ -0,0 +1,25 @@ +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, +-- +2.32.0 + diff --git a/0001-Update-text-expectation.patch b/0001-Update-text-expectation.patch deleted file mode 100644 index 6f66ed9..0000000 --- a/0001-Update-text-expectation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 17170a1eeb63807b4035427f3ca2b3e475c8f42b Mon Sep 17 00:00:00 2001 -From: Khaled Hosny -Date: Wed, 25 Aug 2021 16:58:25 +0200 -Subject: [PATCH] Update text expectation - ---- - tests/cursor_position_GB8a.test | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/cursor_position_GB8a.test b/tests/cursor_position_GB8a.test -index bef963e..d161691 100644 ---- a/tests/cursor_position_GB8a.test -+++ b/tests/cursor_position_GB8a.test -@@ -32,9 +32,9 @@ glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri - glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri - glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri - --UTF-32 clusters: 00 01 02 03 --UTF-8 clusters: 00 04 08 12 -+UTF-32 clusters: 00 00 02 02 -+UTF-8 clusters: 00 00 08 08 - --The position is 2992 at index 12 -+The position is 2244 at index 8 - - The start-index is 4 at position 1000 --- -2.31.1 - diff --git a/libraqm.spec b/libraqm.spec index d7142f4..8ee2ce2 100644 --- a/libraqm.spec +++ b/libraqm.spec @@ -1,26 +1,20 @@ Name: libraqm -Version: 0.7.0 -Release: 9%{?dist} +Version: 0.7.2 +Release: 1%{?dist} License: MIT Summary: Complex Textlayout Library Summary(ar): مكتبة رقم للنّصوص المركّبة URL: https://github.com/HOST-Oman/libraqm -Source: https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.gz -# Backported from upstream -Patch0: 0001-Update-text-expectation.patch +Source: %{url}/releases/download/v%{version}/raqm-%{version}.tar.xz +# Backports from upstream +Patch0001: 0001-Pass-version-to-meson-library.patch -%if 0%{?el7} -BuildRequires: python2 -%else -BuildRequires: python3 -%endif - -BuildRequires: gcc +BuildRequires: meson +BuildRequires: gcc BuildRequires: freetype-devel BuildRequires: harfbuzz-devel BuildRequires: fribidi-devel BuildRequires: gtk-doc -BuildRequires: make %package docs Summary: Libraqm Documentation @@ -57,13 +51,10 @@ This package contains documentation files for raqm. %prep %autosetup -p1 -n raqm-%{version} -%if ! 0%{?el7} -sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream -%endif -%configure --enable-gtk-doc %build -make %{?_smp_mflags} +%meson -Ddocs=true +%meson_build %check %if 0%{?el7} @@ -71,13 +62,13 @@ export LC_ALL=en_US.UTF-8 %else export LC_ALL=C.utf8 %endif -make check +%meson_test %install -%make_install +%meson_install rm -f %{buildroot}%{_libdir}/*.{la,a} -%ldconfig_scriptlets devel +%ldconfig_scriptlets %files %license COPYING @@ -96,6 +87,10 @@ rm -f %{buildroot}%{_libdir}/*.{la,a} %{_datadir}/gtk-doc/html/raqm %changelog +* Sun Oct 03 2021 Neal Gompa - 0.7.2-1 +- Update to 0.7.2 +- Minor cleanups to the spec + * Sat Oct 02 2021 Kalev Lember - 0.7.0-9 - Backport upstream patch to fix failing self tests (#1987659) diff --git a/sources b/sources index 0964c96..4bbf313 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (raqm-0.7.0.tar.gz) = 4aed401df0b53cc95423afa5980164b54102776eca675119fc483c410334a635ca95ef6564ee9b54666c13c916eb52a0a1cd24f288230946c53825fb10451161 +SHA512 (raqm-0.7.2.tar.xz) = 26321397c1020a16829e24b7f122c3a757a179ebddf5a3143d95cc780573a92e4d722fc94ce5ab8c35f3946b8935178c2e917de5afb17d407d45552765603c47