From 07867654dac242565d58d5a557da8134aa0a1ee2 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 20 Jan 2025 19:00:03 +0530 Subject: [PATCH] Resolves: RHEL-74414 - Switch to using meson for build (#2277316) --- harfbuzz.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/harfbuzz.spec b/harfbuzz.spec index be4c5c0..2e8be0b 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,6 +1,6 @@ Name: harfbuzz Version: 8.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Text shaping library License: MIT-Modern-Variant @@ -18,6 +18,11 @@ BuildRequires: graphite2-devel BuildRequires: gtk-doc BuildRequires: gcc-c++ BuildRequires: make +BuildRequires: meson + +# https://github.com/harfbuzz/harfbuzz/issues/3163 +%global _distro_extra_cflags -fno-exceptions +%global _distro_extra_cxxflags -fno-exceptions -fno-rtti %description HarfBuzz is an implementation of the OpenType Layout engine. @@ -52,13 +57,16 @@ This package contains Harfbuzz Cairo support library. %build -%configure --disable-static --with-graphite2 --with-gobject --enable-introspection -%{make_build} +%meson -Dgraphite2=enabled -Dchafa=disabled +%meson_build %install -%{make_install} -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%meson_install + + +%check +%meson_test %ldconfig_scriptlets @@ -105,6 +113,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/libharfbuzz-cairo.so.* %changelog +* Mon Jan 20 2025 Parag Nemade - 8.4.0-6 +- Resolves: RHEL-74414 - Switch to using meson for build (#2277316) + * Tue Oct 29 2024 Troy Dawson - 8.4.0-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018