diff --git a/harfbuzz-5.3.1.tar.xz b/harfbuzz-6.0.0.tar.xz similarity index 64% rename from harfbuzz-5.3.1.tar.xz rename to harfbuzz-6.0.0.tar.xz index bf197453623b99f5f1d4baa6cd92bd7b941dfd58..75aff2ad11237ecfd950f0499bb773a63d4244c2 100644 Binary files a/harfbuzz-5.3.1.tar.xz and b/harfbuzz-6.0.0.tar.xz differ diff --git a/harfbuzz.spec b/harfbuzz.spec index 8149e52184de1380ce38b8f6a6cd1f9532f17565..eab2abfed053d9f222eef8fd94002330b77499f2 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,6 +1,6 @@ %define anolis_release 1 Name: harfbuzz -Version: 5.3.1 +Version: 6.0.0 Release: %{anolis_release}%{?dist} Summary: Text shaping library @@ -18,7 +18,7 @@ BuildRequires: pkgconfig(icu-uc) BuildRequires: gobject-introspection-devel >= 1.34.0 BuildRequires: gtk-doc BuildRequires: gcc-c++ -BuildRequires: make +BuildRequires: meson > 0.55.0 %description HarfBuzz is an implementation of the OpenType Layout engine. @@ -52,15 +52,20 @@ This package contains Harfbuzz ICU support library. %build -%configure --disable-static --with-graphite2 --with-gobject --enable-introspection -%{make_build} - +# Upstream already uses -fno-exception, but due to the order of the +# switches, it does not affect as of 6.0.0 +export CXXFLAGS="${CXXFLAGS/-fexceptions /}" +%meson -Dgraphite2=enabled +%meson_build %install -%{make_install} +%meson_install %generate_compatibility_deps +%check +%meson_test + %files %dir %{abidir} %license COPYING @@ -104,6 +109,10 @@ This package contains Harfbuzz ICU support library. %{abidir}/libharfbuzz-icu.dump %changelog +* Sun Dec 18 2022 Funda Wang - 6.0.0-1 +- New version 6.0.0 +- Use meson to build as suggested by upstream + * Mon Dec 5 2022 Funda Wang - 5.3.1-1 - New version 5.3.1