diff --git a/Update-text-expectation.patch b/Update-text-expectation.patch deleted file mode 100644 index 062423f..0000000 --- a/Update-text-expectation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d25533d33e149d3570ffe61fb1d7128e7ea79cc Mon Sep 17 00:00:00 2001 -From: wu-leilei -Date: Fri, 7 Jan 2022 15:56:06 +0800 -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.23.0 - diff --git a/libraqm-3f50e35.patch b/libraqm-3f50e35.patch new file mode 100644 index 0000000..3042d84 --- /dev/null +++ b/libraqm-3f50e35.patch @@ -0,0 +1,21 @@ +commit 3f50e35d239059823162cbfba3c7adfe8e5f1907 +Author: Pierre Joye +Date: Sat Feb 12 15:27:06 2022 +0700 + + strdup is a posix extension, to be used correctly that has to be defined (only used here, no need to pass as -D + +diff --git a/tests/raqm-test.c b/tests/raqm-test.c +index 1d42c7c..1137fff 100644 +--- a/tests/raqm-test.c ++++ b/tests/raqm-test.c +@@ -21,7 +21,9 @@ + * SOFTWARE. + * + */ +- ++#ifdef __GNUC__ ++#define _DEFAULT_SOURCE ++#endif + #include + #include + #include diff --git a/libraqm.spec b/libraqm.spec index e375417..40d6230 100644 --- a/libraqm.spec +++ b/libraqm.spec @@ -1,66 +1,84 @@ Name: libraqm -Version: 0.7.0 -Release: 3 +Version: 0.8.0 +Release: 1 License: MIT Summary: Complex Textlayout Library URL: https://github.com/HOST-Oman/libraqm Source: https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.gz -Patch0001: Update-text-expectation.patch +Patch0001: libraqm-3f50e35.patch -BuildRequires: python3 freetype-devel harfbuzz-devel fribidi-devel gtk-doc gcc +BuildRequires: meson freetype-devel harfbuzz-devel fribidi-devel gtk-doc gcc -%description -Library that encapsulates the logic for complex -text layout and provides a convenient API. +%package docs +Summary: Libraqm Documentation +Summary(ar): Library Document Number +BuildArch: noarch %package devel Summary: Complex Textlayout Library Requires: libraqm%{?_isa} = %{version}-%{release} + +%description +Library that encapsulates the logic for complex +text layout and provides a convenient API. + +%description -l ar +A library for building composite text, introduction +Comfortable software entrance. + %description devel Library that encapsulates the logic for complex text layout and provides a convenient API. -%package help -Summary: Libraqm Documentation -BuildArch: noarch +%description -l ar devel +A library for building composite text, introduction +Comfortable software entrance. -%description help +%description docs This package contains documentation files for raqm. +%description -l ar docs +Library document number. + %prep %autosetup -n raqm-%{version} -p1 -sed s:python:%{__python3}:g -i tests/Makefile.in -%configure --enable-gtk-doc %build -%make_build +%meson -Ddocs=true +%meson_build %check export LC_ALL=C.utf8 -make check +%meson_test %install -%make_install +%meson_install rm -f %{buildroot}%{_libdir}/*.{la,a} -%ldconfig_scriptlets devel +%ldconfig_scriptlets %files %license COPYING %{_libdir}/libraqm.so.* %files devel +%license COPYING %{_includedir}/raqm.h %{_includedir}/raqm-version.h %{_libdir}/libraqm.so %{_libdir}/pkgconfig/raqm.pc -%files help -%doc AUTHORS NEWS README +%files docs +%license COPYING +%doc AUTHORS NEWS README.md %{_datadir}/gtk-doc/html/raqm + %changelog +* Mon Jul 31 2023 houlifei - 0.8.0-1 +- Update to 0.8.0 + * Tue Jan 11 2022 wulei - 0.7.0-3 - Fix cursor_position_GB8a.test failure diff --git a/raqm-0.7.0.tar.gz b/raqm-0.7.0.tar.gz deleted file mode 100644 index df78dac..0000000 Binary files a/raqm-0.7.0.tar.gz and /dev/null differ diff --git a/raqm-0.8.0.tar.gz b/raqm-0.8.0.tar.gz new file mode 100644 index 0000000..2d34fe8 Binary files /dev/null and b/raqm-0.8.0.tar.gz differ