Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Mosaab Alzoubi
1dbaf1466a Exclude hb-view 2020-01-11 22:03:07 +03:00
Mosaab Alzoubi
3577a4acc5 Building on EPE6 #2 2020-01-11 21:25:09 +03:00
Mosaab Alzoubi
ef771774f7 Build without graphite #2 2020-01-11 06:05:20 +03:00
Mosaab Alzoubi
1daf8cb30e Build without graphite 2020-01-11 03:24:41 +03:00
2 changed files with 51 additions and 7 deletions

View file

@ -0,0 +1,38 @@
Extracted From:
https://github.com/harfbuzz/harfbuzz/commit/1c98ff87c76536553e53c131e75aba33033ee3a0.patch
From: Mike Hommey <mh@glandium.org>
Date: Fri, 30 Sep 2016 18:15:37 +0900
Subject: [PATCH] Support building with older glib versions
---
diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index e20352475..2b91b5b65 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -382,6 +382,7 @@ hb_glib_get_unicode_funcs (void)
return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs);
}
+#if GLIB_CHECK_VERSION(2,31,10)
/**
* hb_glib_blob_create:
*
@@ -398,3 +399,4 @@ hb_glib_blob_create (GBytes *gbytes)
g_bytes_ref (gbytes),
(hb_destroy_func_t) g_bytes_unref);
}
+#endif
diff --git a/src/hb-glib.h b/src/hb-glib.h
index 12c3e3b3a..5f04183ba 100644
--- a/src/hb-glib.h
+++ b/src/hb-glib.h
@@ -46,9 +46,10 @@ hb_glib_script_from_script (hb_script_t script);
HB_EXTERN hb_unicode_funcs_t *
hb_glib_get_unicode_funcs (void);
+#if GLIB_CHECK_VERSION(2,31,10)
HB_EXTERN hb_blob_t *
hb_glib_blob_create (GBytes *gbytes);
-
+#endif
HB_END_DECLS

View file

@ -1,17 +1,18 @@
Name: harfbuzz
Version: 1.2.7
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Text shaping library
License: MIT
URL: http://freedesktop.org/wiki/Software/HarfBuzz
Source0: http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
Patch0: Support-building-with-older-glib-versions.patch
BuildRequires: cairo-devel
BuildRequires: freetype-devel
BuildRequires: glib2-devel
BuildRequires: libicu-devel
BuildRequires: graphite2-devel
#BuildRequires: graphite2-devel
BuildRequires: gtk-doc
%description
@ -36,10 +37,10 @@ This package contains Harfbuzz ICU support library.
%prep
%setup -q
%patch0 -p1
%build
%configure --disable-static --with-graphite2
%configure --disable-static
# Remove lib64 rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -61,13 +62,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%files
%license COPYING
%doc NEWS AUTHORS README
%doc NEWS AUTHORS README COPYING
%{_libdir}/libharfbuzz.so.*
%files devel
%doc %{_datadir}/gtk-doc
%{_bindir}/hb-view
# FIXME hb-view not built
#%{_bindir}/hb-view
%{_bindir}/hb-ot-shape-closure
%{_bindir}/hb-shape
%{_includedir}/harfbuzz/
@ -80,6 +81,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/libharfbuzz-icu.so.*
%changelog
* Sat Jan 11 2020 Mosaab Alzoubi <moceap[AT]hotmail[DOT]com> - 1.2.7-2
- Build without Graphite (not found in EPEL6)
- Build without %%license (not found in EPEL6)
- Build with Support-building-with-older-glib-versions.patch (For EPEL6)
* Mon May 02 2016 Parag Nemade <pnemade AT redhat DOT com> - 1.2.7-1
- Update to 1.2.7