From 71e9a828735dcd4676be81dfdac55f2bac0ae01b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 27 May 2019 12:25:56 +0200
Subject: [PATCH] Update to 2.5.0

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

diff --git a/.gitignore b/.gitignore
index 6c44fdd..f9e0138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /harfbuzz-2.1.3.tar.bz2
 /harfbuzz-2.3.1.tar.bz2
 /harfbuzz-2.4.0.tar.bz2
+/harfbuzz-2.5.0.tar.xz
diff --git a/harfbuzz-enable-delayload-freetype.patch b/harfbuzz-enable-delayload-freetype.patch
index 9419cd2..12aaa9a 100644
--- a/harfbuzz-enable-delayload-freetype.patch
+++ b/harfbuzz-enable-delayload-freetype.patch
@@ -1,7 +1,7 @@
-diff -rupN harfbuzz-2.3.1/configure.ac harfbuzz-2.3.1-new/configure.ac
---- harfbuzz-2.3.1/configure.ac	2019-01-30 22:42:09.000000000 +0100
-+++ harfbuzz-2.3.1-new/configure.ac	2019-01-31 15:12:55.676991795 +0100
-@@ -493,6 +493,30 @@ fi
+diff -rupN harfbuzz-2.5.0/configure.ac harfbuzz-2.5.0-new/configure.ac
+--- harfbuzz-2.5.0/configure.ac	2019-05-24 21:39:42.000000000 +0200
++++ harfbuzz-2.5.0-new/configure.ac	2019-05-27 12:18:40.943007599 +0200
+@@ -478,6 +478,30 @@ fi
  
  dnl ===========================================================================
  
@@ -32,15 +32,15 @@ diff -rupN harfbuzz-2.3.1/configure.ac harfbuzz-2.3.1-new/configure.ac
  AC_CONFIG_FILES([
  Makefile
  src/Makefile
-@@ -543,4 +567,5 @@ Other features:
+@@ -532,4 +556,5 @@ Other features:
  	Documentation:		${enable_gtk_doc}
  	GObject bindings:	${have_gobject}
  	Introspection:		${have_introspection}
 +	Enable delay loading:   ${enable_delay_load}
  ])
-diff -rupN harfbuzz-2.3.1/src/Makefile.am harfbuzz-2.3.1-new/src/Makefile.am
---- harfbuzz-2.3.1/src/Makefile.am	2018-12-21 23:29:03.000000000 +0100
-+++ harfbuzz-2.3.1-new/src/Makefile.am	2019-01-31 15:12:55.676991795 +0100
+diff -rupN harfbuzz-2.5.0/src/Makefile.am harfbuzz-2.5.0-new/src/Makefile.am
+--- harfbuzz-2.5.0/src/Makefile.am	2019-05-24 02:34:19.000000000 +0200
++++ harfbuzz-2.5.0-new/src/Makefile.am	2019-05-27 12:18:40.943007599 +0200
 @@ -46,14 +46,29 @@ HBHEADERS += $(HB_GLIB_headers)
  endif
  
@@ -72,7 +72,7 @@ diff -rupN harfbuzz-2.3.1/src/Makefile.am harfbuzz-2.3.1-new/src/Makefile.am
  HBSOURCES += $(HB_FT_sources)
  HBHEADERS += $(HB_FT_headers)
  endif
-@@ -143,9 +158,9 @@ base_link_flags = $(AM_LDFLAGS) -lm -ver
+@@ -132,9 +147,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 2f6cf03..b86565d 100644
--- a/harfbuzz-python.patch
+++ b/harfbuzz-python.patch
@@ -1,6 +1,6 @@
-diff -rupN harfbuzz-2.3.1/src/gen-def.py harfbuzz-2.3.1-new/src/gen-def.py
---- harfbuzz-2.3.1/src/gen-def.py	2018-12-14 20:54:21.000000000 +0100
-+++ harfbuzz-2.3.1-new/src/gen-def.py	2019-01-31 15:12:55.767991303 +0100
+diff -rupN harfbuzz-2.5.0/src/gen-def.py harfbuzz-2.5.0-new/src/gen-def.py
+--- harfbuzz-2.5.0/src/gen-def.py	2019-05-06 21:14:20.000000000 +0200
++++ harfbuzz-2.5.0-new/src/gen-def.py	2019-05-27 12:18:41.022006036 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
diff --git a/mingw-harfbuzz.spec b/mingw-harfbuzz.spec
index 6ff1b1d..763899e 100644
--- a/mingw-harfbuzz.spec
+++ b/mingw-harfbuzz.spec
@@ -1,13 +1,13 @@
 %{?mingw_package_header}
 
 Name:           mingw-harfbuzz
-Version:        2.4.0
+Version:        2.5.0
 Release:        1%{?dist}
 Summary:        MinGW Windows Harfbuzz library
 
 License:        MIT
 URL:            http://www.harfbuzz.org
-Source0:        http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
+Source0:        http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.xz
 
 # Allow the freetype dependency to be optional at runtime
 Patch0:         harfbuzz-enable-delayload-freetype.patch
@@ -142,6 +142,9 @@ find %{buildroot} -name "*.la" -delete
 
 
 %changelog
+* Mon May 27 2019 Sandro Mani <manisandro@gmail.com> - 2.5.0-1
+- Update to 2.5.0
+
 * Mon Apr 15 2019 Sandro Mani <manisandro@gmail.com> - 2.4.0-1
 - Update to 2.4.0
 
diff --git a/sources b/sources
index c780f57..514a6eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (harfbuzz-2.4.0.tar.bz2) = daeaf029bd5d0d0674f930a8d0dcdc4e0b1253b2369c732c7b4fd130ab9438d0d9526967224a583ee58974c3b492874acaccdac13c71b58c950f0b3f031e505c
+SHA512 (harfbuzz-2.5.0.tar.xz) = 4b02c20b07f367cbc21d69c86c5d1c0fc403b76c40ed7e379796afa289487dfa4f9a5f769a2da794658c983dc947dfe3ed394ac647f67e86863ee4b774815428