From 1daf8cb30edc958edf042a90d7cc366f864d6d56 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 11 Jan 2020 03:24:41 +0300 Subject: [PATCH 1/4] Build without graphite --- harfbuzz.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/harfbuzz.spec b/harfbuzz.spec index dfa01b1..8a2dc33 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,6 +1,6 @@ Name: harfbuzz Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Text shaping library License: MIT @@ -11,7 +11,7 @@ BuildRequires: cairo-devel BuildRequires: freetype-devel BuildRequires: glib2-devel BuildRequires: libicu-devel -BuildRequires: graphite2-devel +#BuildRequires: graphite2-devel BuildRequires: gtk-doc %description @@ -39,7 +39,8 @@ This package contains Harfbuzz ICU support library. %build -%configure --disable-static --with-graphite2 +#%configure --disable-static --with-graphite2 +%configure --disable-static # Remove lib64 rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -80,6 +81,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/libharfbuzz-icu.so.* %changelog +* Sat Jan 11 2020 Mosaab Alzoubi - 1.2.7-2 +- Build without Graphite (not found in EPEL6) + * Mon May 02 2016 Parag Nemade - 1.2.7-1 - Update to 1.2.7 From ef771774f7554d33f198cef548c558fb6f202701 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 11 Jan 2020 06:05:20 +0300 Subject: [PATCH 2/4] Build without graphite #2 --- harfbuzz.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/harfbuzz.spec b/harfbuzz.spec index 8a2dc33..0603854 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -39,7 +39,6 @@ This package contains Harfbuzz ICU support library. %build -#%configure --disable-static --with-graphite2 %configure --disable-static # Remove lib64 rpath From 3577a4acc5856d37000b866b7f9e0e4219b9b052 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 11 Jan 2020 21:25:09 +0300 Subject: [PATCH 3/4] Building on EPE6 #2 --- ...rt-building-with-older-glib-versions.patch | 38 +++++++++++++++++++ harfbuzz.spec | 8 ++-- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 Support-building-with-older-glib-versions.patch diff --git a/Support-building-with-older-glib-versions.patch b/Support-building-with-older-glib-versions.patch new file mode 100644 index 0000000..e112783 --- /dev/null +++ b/Support-building-with-older-glib-versions.patch @@ -0,0 +1,38 @@ +Extracted From: +https://github.com/harfbuzz/harfbuzz/commit/1c98ff87c76536553e53c131e75aba33033ee3a0.patch +From: Mike Hommey +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_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 diff --git a/harfbuzz.spec b/harfbuzz.spec index 0603854..a79dc1a 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -6,6 +6,7 @@ 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 @@ -36,7 +37,7 @@ This package contains Harfbuzz ICU support library. %prep %setup -q - +%patch0 -p1 %build %configure --disable-static @@ -61,8 +62,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %files -%license COPYING -%doc NEWS AUTHORS README +%doc NEWS AUTHORS README COPYING %{_libdir}/libharfbuzz.so.* %files devel @@ -82,6 +82,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog * Sat Jan 11 2020 Mosaab Alzoubi - 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 - 1.2.7-1 - Update to 1.2.7 From 1dbaf1466aa0a328379989246fc14553b7633967 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 11 Jan 2020 22:03:07 +0300 Subject: [PATCH 4/4] Exclude hb-view --- harfbuzz.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/harfbuzz.spec b/harfbuzz.spec index a79dc1a..a34b642 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -67,7 +67,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %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/