diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2015-08-30 00:06:37 +0530 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-08-31 11:02:44 +0300 |
| commit | 53f93f787a157e9ed356fc9fa6ffd4c2242aa489 (patch) | |
| tree | 88e44633de2582cb43a4fd17c1b03fedecc0272a | |
| parent | c0fb3dceca61fcf3f14656632e935bef8ca696ee (diff) | |
harfbuzz: Fix the DLL revision specified in the .def file
Patch taken from upstream, with the same changes to Makefile.in also added in to
avoid an autoreconf.
https://bugzilla.gnome.org/show_bug.cgi?id=754043
| -rw-r--r-- | recipes/harfbuzz.recipe | 1 | ||||
| -rw-r--r-- | recipes/harfbuzz/fix-dll-revision.patch | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes/harfbuzz.recipe b/recipes/harfbuzz.recipe index 346e6dde..c054a401 100644 --- a/recipes/harfbuzz.recipe +++ b/recipes/harfbuzz.recipe @@ -9,6 +9,7 @@ class Recipe(recipe.Recipe): licenses = [License.LGPLv2Plus] deps = ['fontconfig', 'cairo', 'glib'] configure_options = "--enable-static --with-icu=no" + patches = [name + '/fix-dll-revision.patch'] files_bins = ['hb-ot-shape-closure', 'hb-view', 'hb-shape'] files_libs = ['libharfbuzz'] diff --git a/recipes/harfbuzz/fix-dll-revision.patch b/recipes/harfbuzz/fix-dll-revision.patch new file mode 100644 index 00000000..1cf3b2a5 --- /dev/null +++ b/recipes/harfbuzz/fix-dll-revision.patch @@ -0,0 +1,37 @@ +From bd22a5cfae24b3b9253bccaeb139e698e74cd0c3 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <behdad@behdad.org> +Date: Fri, 7 Aug 2015 11:13:27 +0200 +Subject: [PATCH] Bug 91559 - HarfBuzz 1.0.1: Inconsistent DLL files + specified/created... + +Fixes https://bugs.freedesktop.org/show_bug.cgi?id=91559 + +(Edited by Nirbheek to also edit the Makefile.in and avoid autoreconf) +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 753b930..9d88c24 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -270,7 +270,7 @@ harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) + $(EGREP) '^hb_.* \(' | \ + sed -e 's/ (.*//' | \ + LANG=C sort; \ +- echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \ ++ echo LIBRARY libharfbuzz-0.dll; \ + ) >"$@" + @ ! grep -q hb_ERROR "$@" \ + || ($(RM) "$@"; false) +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -2270,7 +2270,7 @@ + $(EGREP) '^hb_.* \(' | \ + sed -e 's/ (.*//' | \ + LANG=C sort; \ +- echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \ ++ echo LIBRARY libharfbuzz-0.dll; \ + ) >"$@" + @ ! grep -q hb_ERROR "$@" \ + || ($(RM) "$@"; false) |