Accepting request 863164 from GNOME:Factory

- Re-enable graphite2 support: TexLive relies on this to be
  present:
  + Pass -Dgraphite=enabled to meson.
  + Add pkgconfig(graphite2) BuildRequires. (forwarded request 862868 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/863164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/harfbuzz?expand=0&rev=78

harfbuzz.changes

@@ -1,44 +1,77 @@
+-------------------------------------------------------------------
+Wed Jan 13 12:03:09 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Re-enable graphite2 support: TexLive relies on this to be
+  present:
+  + Pass -Dgraphite=enabled to meson.
+  + Add pkgconfig(graphite2) BuildRequires.
+
+-------------------------------------------------------------------
+Fri Jan  8 20:39:59 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Switch to meson buildsystem:
+  + Add meson BuildRequires and macros.
+  + Replace gcc-c++ for generic c++_compiler BuildRequires.
+  + Add meson_test macro in check section, run tests during build.
+  + Drop pkgconfig(graphite2) BuildRequires: No longer build
+    graphite2 support, following upstream that disables this by
+    default.
+  + Stop packaging gtk-docs, pass -Ddocs=disabled to meson, this
+    way we might avoid a build-cycle and since we did not have a
+    explicit docs subpackage, just silently drop them.
+
 -------------------------------------------------------------------
 Sun Dec 27 15:55:30 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
-- harfbuzz 2.7.4:
+- Update to version 2.7.4:
-  - Fix missing --enable-introspection configure option
+  + Fix missing --enable-introspection configure option
-- includes changes from 2.7.3:
+- Changes from version 2.7.3:
-  - Update USE shaper to 2020-08-13 specification, and other improvements
+  + Update USE shaper to 2020-08-13 specification, and other
-  - Don’t disable liga feature in myanmar shaper, to match Uniscribe
+    improvements
-  - Improvements to language and script tags handling.
+  + Don’t disable liga feature in myanmar shaper, to match
-  - Update language system tag registry to OpenType 1.8.4
+    Uniscribe
-  - Support for serializing and deserializing Unicode buffers
+  + Improvements to language and script tags handling.
-  - Increase buffer work limits to handle fonts with many complex lookups
+  + Update language system tag registry to OpenType 1.8.4
-  - Handle more shaping operations in trace output
+  + Support for serializing and deserializing Unicode buffers
-  - Memory access fixes
+  + Increase buffer work limits to handle fonts with many complex
-  - More OOM fixes
+    lookups
-  - Improved documentation
+  + Handle more shaping operations in trace output
+  + Memory access fixes
+  + More OOM fixes
+  + Improved documentation.
 
 -------------------------------------------------------------------
 Thu Sep 17 11:54:35 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
-- update to 2.7.2:
+- Update to version 2.7.2:
-  - Fix a regression in the previous release that caused a crash with Kaithi.
+  + Fix a regression in the previous release that caused a crash
-  - More OOM fixes.
+    with Kaithi.
-  - ot-funcs now handles variable empty glyphs better when hvar/vvar isn't present.
+  + More OOM fixes.
-  - Reverted a GDEF processing regression.
+  + ot-funcs now handles variable empty glyphs better when
-  - A couple of fixes to handle OOM better.
+    hvar/vvar isn't present.
-  - Use an implementation for round that always rounds up, some minor fluctuations
+  + Reverted a GDEF processing regression.
-    are expected on var font specially when hb-ot callback is used.
+  + A couple of fixes to handle OOM better.
-  - Fix an AAT's `kerx` issue on broken rendering of Devanagari Sangam MN.
+  + Use an implementation for round that always rounds up, some
-  - Remove AAT's `lcar` table support from _get_ligature_carets API, not even much
+    minor fluctuations are expected on var font specially when
-    use on macOS installed fonts (only two files).  GDEF support is the recommended
+    hb-ot callback is used.
-    one and expected to work properly after issues fixed two releases ago.
+  + Fix an AAT's `kerx` issue on broken rendering of Devanagari
+    Sangam MN.
+  + Remove AAT's `lcar` table support from _get_ligature_carets
+    API, not even much use on macOS installed fonts (only two
+    files). GDEF support is the recommended one and expected to
+    work properly after issues fixed two releases ago.
   - Minor memory fixes to handle OOM better specially in hb-ft.
-  - Minor .so files versioning scheme change and remove stable/unstable scheme
+  - Minor .so files versioning scheme change and remove
-    differences, was never used in practice (always default to stable scheme).
+    stable/unstable scheme differences, was never used in practice
-  - We are now suggesting careful packaging of the library using meson,
+    (always default to stable scheme).
-    https://github.com/harfbuzz/harfbuzz/wiki/Notes-on-migration-to-meson
+  - We are now suggesting careful packaging of the library using
+    meson, https://github.com/harfbuzz/harfbuzz/wiki/Notes-on-migration-to-meson
     for more information.
-  - Distribution package URL is changed, either use GitHub generated tarballs,
+  - Distribution package URL is changed, either use GitHub
+    generated tarballs,
     `https://github.com/harfbuzz/harfbuzz/archive/$pkgver.tar.gz`
-    or, even more preferably use commit hash of the release and git checkouts like,
+    or, even more preferably use commit hash of the release and git
+    checkouts like,
     `git+https://github.com/harfbuzz/harfbuzz#commit=$commit`
 
 -------------------------------------------------------------------

harfbuzz.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package harfbuzz
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,9 @@ License:        MIT
 URL:            https://www.freedesktop.org/wiki/Software/HarfBuzz
 Source0:        https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-BuildRequires:  gcc-c++
+
+BuildRequires:  c++_compiler
+BuildRequires:  meson
 BuildRequires:  pkgconfig >= 0.28
 BuildRequires:  pkgconfig(cairo) >= 1.8.0
 BuildRequires:  pkgconfig(cairo-ft)
@@ -95,23 +97,20 @@ HarfBuzz is an OpenType text shaping engine.
 This package contains the development files.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
-%configure \
+%meson \
-	--disable-static \
+	-Ddocs=disabled \
-	--with-glib \
+	-Dgraphite=enabled \
-	--with-freetype \
-	--with-cairo \
-	--with-icu \
-	--with-graphite2 \
-	--with-gobject=yes \
 	%{nil}
-%make_build
+%meson_build
+
+%check
+%meson_test
 
 %install
-%make_install
+%meson_install
-find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n libharfbuzz0 -p /sbin/ldconfig
 %postun -n libharfbuzz0 -p /sbin/ldconfig
@@ -147,8 +146,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files devel
 %doc AUTHORS README THANKS
-%docdir %{_datadir}/gtk-doc
-%{_datadir}/gtk-doc/html/harfbuzz/
 %{_includedir}/harfbuzz/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/harfbuzz.pc