From d6d6a80d7dab5cbc23b7b6c347e0f9a3c488470f1f1424032b0a017f2ae89c23 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Mar 2018 22:34:56 +0000 Subject: [PATCH] Accepting request 587005 from home:iznogood:branches:GNOME:Factory - Update to version 1.7.6: + Fix to hb_set_t binary operations. Ouch. + New experimental harfbuzz-subset library. All of hb-subset.h is experimental right now and API WILL change. + New API: - hb_blob_copy_writable_or_fail(). - HB_OT_TAG_BASE. - hb_set_previous(). - hb_set_previous_range(). - Split out new sub-package libharfbuzz-subset0. - Add libharfbuzz-gobject0 and libharfbuzz-subset0 to baselibs. - Use make_build macro. OBS-URL: https://build.opensuse.org/request/show/587005 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=154 --- baselibs.conf | 2 ++ harfbuzz-1.7.5.tar.bz2 | 3 --- harfbuzz-1.7.6.tar.bz2 | 3 +++ harfbuzz.changes | 16 +++++++++++++++ harfbuzz.spec | 46 ++++++++++++++++++++++++++++++------------ 5 files changed, 54 insertions(+), 16 deletions(-) delete mode 100644 harfbuzz-1.7.5.tar.bz2 create mode 100644 harfbuzz-1.7.6.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index a5c4173..f58929b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ libharfbuzz0 libharfbuzz-icu0 +libharfbuzz-gobject0 +libharfbuzz-subset0 diff --git a/harfbuzz-1.7.5.tar.bz2 b/harfbuzz-1.7.5.tar.bz2 deleted file mode 100644 index 6c8a93a..0000000 --- a/harfbuzz-1.7.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563 -size 2350389 diff --git a/harfbuzz-1.7.6.tar.bz2 b/harfbuzz-1.7.6.tar.bz2 new file mode 100644 index 0000000..9bae452 --- /dev/null +++ b/harfbuzz-1.7.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da7bed39134826cd51e57c29f1dfbe342ccedb4f4773b1c951ff05ff383e2e9b +size 2586909 diff --git a/harfbuzz.changes b/harfbuzz.changes index e88076f..9669e38 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 13 10:34:46 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 1.7.6: + + Fix to hb_set_t binary operations. Ouch. + + New experimental harfbuzz-subset library. All of hb-subset.h is + experimental right now and API WILL change. + + New API: + - hb_blob_copy_writable_or_fail(). + - HB_OT_TAG_BASE. + - hb_set_previous(). + - hb_set_previous_range(). +- Split out new sub-package libharfbuzz-subset0. +- Add libharfbuzz-gobject0 and libharfbuzz-subset0 to baselibs. +- Use make_build macro. + ------------------------------------------------------------------- Tue Mar 13 08:36:14 UTC 2018 - jengelh@inai.de diff --git a/harfbuzz.spec b/harfbuzz.spec index 1ee282c..938a4dd 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -17,14 +17,15 @@ Name: harfbuzz -Version: 1.7.5 +Version: 1.7.6 Release: 0 Summary: An OpenType text shaping engine License: MIT Group: Productivity/Text/Utilities -Url: https://www.freedesktop.org/wiki/Software/HarfBuzz -Source: https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2 +URL: https://www.freedesktop.org/wiki/Software/HarfBuzz +Source0: https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2 Source99: baselibs.conf + BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) >= 1.8.0 @@ -64,6 +65,14 @@ Group: System/Libraries HarfBuzz is an OpenType text shaping engine. This package contains the GObject library. +%package -n libharfbuzz-subset0 +Summary: An OpenType text shaping engine +Group: System/Libraries + +%description -n libharfbuzz-subset0 +HarfBuzz is an OpenType text shaping engine. +This package contains the subset library + %package -n typelib-1_0-HarfBuzz-0_0 Summary: Introspection bindings for the HarfBuzz/GObject library Group: System/Libraries @@ -82,11 +91,12 @@ HarfBuzz is an OpenType text shaping engine. %package devel Summary: Development files for the HarfBuzz OpenType text shaping engine Group: Development/Libraries/C and C++ +Requires: libharfbuzz0 = %{version} Requires: libharfbuzz-gobject0 = %{version} Requires: libharfbuzz-icu0 = %{version} -Requires: libharfbuzz0 = %{version} -Requires: typelib-1_0-HarfBuzz-0_0 = %{version} +Requires: libharfbuzz-subset0 = %{version} Requires: pkgconfig(freetype2) >= 12.0.6 +Requires: typelib-1_0-HarfBuzz-0_0 = %{version} %description devel HarfBuzz is an OpenType text shaping engine. @@ -97,14 +107,14 @@ This package contains the development files. %build %configure \ - --disable-static \ - --with-glib \ - --with-freetype \ - --with-cairo \ - --with-icu \ - --with-graphite2 \ - --with-gobject=yes \ - %{nil} + --disable-static \ + --with-glib \ + --with-freetype \ + --with-cairo \ + --with-icu \ + --with-graphite2 \ + --with-gobject=yes \ + %{nil} make %{?_smp_mflags} %install @@ -113,8 +123,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %post -n libharfbuzz0 -p /sbin/ldconfig %postun -n libharfbuzz0 -p /sbin/ldconfig + %post -n libharfbuzz-icu0 -p /sbin/ldconfig %postun -n libharfbuzz-icu0 -p /sbin/ldconfig + %post -n libharfbuzz-gobject0 -p /sbin/ldconfig %postun -n libharfbuzz-gobject0 -p /sbin/ldconfig @@ -129,6 +141,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n libharfbuzz-gobject0 %{_libdir}/libharfbuzz-gobject.so.0* +%files -n libharfbuzz-subset0 +%{_libdir}/libharfbuzz-subset.so.0* + %files -n typelib-1_0-HarfBuzz-0_0 %{_libdir}/girepository-1.0/HarfBuzz-0.0.typelib @@ -136,6 +151,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/hb-ot-shape-closure %{_bindir}/hb-shape %{_bindir}/hb-view +%{_bindir}/hb-subset %files devel %doc AUTHORS README THANKS @@ -146,6 +162,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/pkgconfig/harfbuzz.pc %{_libdir}/pkgconfig/harfbuzz-icu.pc %{_libdir}/pkgconfig/harfbuzz-gobject.pc +%{_libdir}/pkgconfig/harfbuzz-subset.pc %{_datadir}/gir-1.0/HarfBuzz-0.0.gir +%dir %{_libdir}/cmake +%dir %{_libdir}/cmake/harfbuzz +%{_libdir}/cmake/harfbuzz/harfbuzz-config.cmake %changelog