From 959ae9daa275eb427fcea32dc9dd1a3f05be1582 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 19 Aug 2019 11:14:34 +0200
Subject: [PATCH] Update to 2.6.0

---
 .gitignore                               |  1 +
 harfbuzz-enable-delayload-freetype.patch | 20 ++++++++++----------
 harfbuzz-python.patch                    |  6 +++---
 mingw-harfbuzz.spec                      |  7 +++++--
 sources                                  |  2 +-
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f4a960..a717277 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
 /harfbuzz-2.5.1.tar.xz
 /harfbuzz-2.5.2.tar.xz
 /harfbuzz-2.5.3.tar.xz
+/harfbuzz-2.6.0.tar.xz
diff --git a/harfbuzz-enable-delayload-freetype.patch b/harfbuzz-enable-delayload-freetype.patch
index 95bcd83..2ceae21 100644
--- a/harfbuzz-enable-delayload-freetype.patch
+++ b/harfbuzz-enable-delayload-freetype.patch
@@ -1,7 +1,7 @@
-diff -rupN harfbuzz-2.5.3/configure.ac harfbuzz-2.5.3-new/configure.ac
---- harfbuzz-2.5.3/configure.ac	2019-06-26 19:39:24.000000000 +0200
-+++ harfbuzz-2.5.3-new/configure.ac	2019-06-28 12:19:03.342499681 +0200
-@@ -462,6 +462,30 @@ fi
+diff -rupN --no-dereference harfbuzz-2.6.0/configure.ac harfbuzz-2.6.0-new/configure.ac
+--- harfbuzz-2.6.0/configure.ac	2019-08-14 06:14:18.000000000 +0200
++++ harfbuzz-2.6.0-new/configure.ac	2019-08-19 11:01:45.952281199 +0200
+@@ -484,6 +484,30 @@ fi
  
  dnl ===========================================================================
  
@@ -32,16 +32,16 @@ diff -rupN harfbuzz-2.5.3/configure.ac harfbuzz-2.5.3-new/configure.ac
  AC_CONFIG_FILES([
  Makefile
  src/Makefile
-@@ -516,4 +540,5 @@ Other features:
+@@ -539,4 +563,5 @@ Other features:
  	Documentation:		${enable_gtk_doc}
  	GObject bindings:	${have_gobject}
  	Introspection:		${have_introspection}
 +	Enable delay loading:   ${enable_delay_load}
  ])
-diff -rupN harfbuzz-2.5.3/src/Makefile.am harfbuzz-2.5.3-new/src/Makefile.am
---- harfbuzz-2.5.3/src/Makefile.am	2019-06-18 07:39:25.000000000 +0200
-+++ harfbuzz-2.5.3-new/src/Makefile.am	2019-06-28 12:19:03.342499681 +0200
-@@ -42,14 +42,29 @@ HBHEADERS += $(HB_GLIB_headers)
+diff -rupN --no-dereference harfbuzz-2.6.0/src/Makefile.am harfbuzz-2.6.0-new/src/Makefile.am
+--- harfbuzz-2.6.0/src/Makefile.am	2019-07-26 02:49:55.000000000 +0200
++++ harfbuzz-2.6.0-new/src/Makefile.am	2019-08-19 11:01:45.953281197 +0200
+@@ -48,14 +48,29 @@ HBHEADERS += $(HB_GLIB_headers)
  endif
  
  if HAVE_FREETYPE
@@ -72,7 +72,7 @@ diff -rupN harfbuzz-2.5.3/src/Makefile.am harfbuzz-2.5.3-new/src/Makefile.am
  HBSOURCES += $(HB_FT_sources)
  HBHEADERS += $(HB_FT_headers)
  endif
-@@ -128,9 +143,9 @@ base_link_flags = $(AM_LDFLAGS) -lm -ver
+@@ -141,9 +156,9 @@ base_link_flags = $(AM_LDFLAGS) -lm -ver
  libharfbuzz_la_LINK = $(chosen_linker) $(libharfbuzz_la_LDFLAGS)
  libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
  libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) $(CODE_COVERAGE_CFLAGS)
diff --git a/harfbuzz-python.patch b/harfbuzz-python.patch
index 903ac1a..89b1874 100644
--- a/harfbuzz-python.patch
+++ b/harfbuzz-python.patch
@@ -1,6 +1,6 @@
-diff -rupN harfbuzz-2.5.3/src/gen-def.py harfbuzz-2.5.3-new/src/gen-def.py
---- harfbuzz-2.5.3/src/gen-def.py	2019-05-06 21:14:20.000000000 +0200
-+++ harfbuzz-2.5.3-new/src/gen-def.py	2019-06-28 12:19:03.422500017 +0200
+diff -rupN --no-dereference harfbuzz-2.6.0/src/gen-def.py harfbuzz-2.6.0-new/src/gen-def.py
+--- harfbuzz-2.6.0/src/gen-def.py	2019-05-06 21:14:20.000000000 +0200
++++ harfbuzz-2.6.0-new/src/gen-def.py	2019-08-19 11:01:46.035281080 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
diff --git a/mingw-harfbuzz.spec b/mingw-harfbuzz.spec
index 6606dd3..192ddcd 100644
--- a/mingw-harfbuzz.spec
+++ b/mingw-harfbuzz.spec
@@ -1,8 +1,8 @@
 %{?mingw_package_header}
 
 Name:           mingw-harfbuzz
-Version:        2.5.3
-Release:        3%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        MinGW Windows Harfbuzz library
 
 License:        MIT
@@ -142,6 +142,9 @@ find %{buildroot} -name "*.la" -delete
 
 
 %changelog
+* Mon Aug 19 2019 Sandro Mani <manisandro@gmail.com> - 2.6.0-1
+- Update to 2.6.0
+
 * Tue Aug 13 2019 Sandro Mani <manisandro@gmail.com> - 2.5.3-3
 - Rebuild (icu)
 
diff --git a/sources b/sources
index 7698feb..16faef6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (harfbuzz-2.5.3.tar.xz) = a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
+SHA512 (harfbuzz-2.6.0.tar.xz) = ab055183ae248710f7baee7ef45ac1a6cbd3522eb1e26b78248ac7bc9e421f5495b8fbbd19a339a26bd119f33624eb8742c15c2053407fbb74cce8dcf6c4b3a2