From 90ab6aed8daaee7a19f1ea161242a8f943b9827c Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 9 Apr 2016 22:35:23 +0200 Subject: [PATCH] Update to 1.2.6 --- .gitignore | 1 + harfbuzz-enable-delayload-freetype.patch | 12 ++++++------ mingw-harfbuzz.spec | 7 +++++-- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index edda5b7..778e950 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /harfbuzz-1.0.2.tar.bz2 /harfbuzz-1.0.3.tar.bz2 /harfbuzz-1.1.2.tar.bz2 +/harfbuzz-1.2.6.tar.bz2 diff --git a/harfbuzz-enable-delayload-freetype.patch b/harfbuzz-enable-delayload-freetype.patch index 12f5ab8..c898292 100644 --- a/harfbuzz-enable-delayload-freetype.patch +++ b/harfbuzz-enable-delayload-freetype.patch @@ -37,9 +37,9 @@ Introspection: ${have_introspection} + Enable delay loading: ${enable_delay_load} ]) ---- harfbuzz-1.1.2/src/Makefile.am.orig 2015-11-27 01:24:17.545771865 +0100 -+++ harfbuzz-1.1.2/src/Makefile.am 2015-12-31 16:08:07.869821859 +0100 -@@ -149,14 +149,29 @@ +--- harfbuzz-1.2.6/src/Makefile.am.orig 2016-03-15 23:14:32.000000000 +0100 ++++ harfbuzz-1.2.6/src/Makefile.am 2016-04-09 22:32:19.462635695 +0200 +@@ -51,14 +51,29 @@ endif if HAVE_FREETYPE @@ -67,10 +67,10 @@ # in a year or two, or otherwise work around it... #HBDEPS += $(FREETYPE_DEPS) +HBCFLAGS += $(FREETYPE_CFLAGS) - HBSOURCES += hb-ft.cc - HBHEADERS += hb-ft.h + HBSOURCES += $(HB_FT_sources) + HBHEADERS += $(HB_FT_headers) endif -@@ -226,9 +226,9 @@ +@@ -120,9 +135,9 @@ libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) diff --git a/mingw-harfbuzz.spec b/mingw-harfbuzz.spec index 37f68f1..2eaab53 100644 --- a/mingw-harfbuzz.spec +++ b/mingw-harfbuzz.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-harfbuzz -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: MinGW Windows Harfbuzz library License: MIT @@ -128,6 +128,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sat Apr 9 2016 Erik van Pienbroek - 1.2.6-1 +- Update to 1.2.6 + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 538e17b..95124a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6210d3cfd4064d95621fc16913268ed harfbuzz-1.1.2.tar.bz2 +9f4b6831c86135faef011e991f59f77f harfbuzz-1.2.6.tar.bz2