summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2017-10-16 23:21:21 (GMT)
committerMark Brand <mabrand@mabrand.nl>2017-10-16 23:21:21 (GMT)
commitf8b2a1e5efbc6291c9e244906c5f1894261f312a (patch)
tree179c46e4c11d45b9450bcb9efd0192752c8d3a06
parent74aa28f254ffe61f9e08d426e85fb30c09b00f42 (diff)
downloadmxe-f8b2a1e5efbc6291c9e244906c5f1894261f312a.zip
mxe-f8b2a1e5efbc6291c9e244906c5f1894261f312a.tar.gz
mxe-f8b2a1e5efbc6291c9e244906c5f1894261f312a.tar.bz2
update harfbuzz
-rw-r--r--src/harfbuzz-1-fixes.patch13
-rw-r--r--src/harfbuzz.mk4
2 files changed, 7 insertions, 10 deletions
diff --git a/src/harfbuzz-1-fixes.patch b/src/harfbuzz-1-fixes.patch
index 86acf47..0365726 100644
--- a/src/harfbuzz-1-fixes.patch
+++ b/src/harfbuzz-1-fixes.patch
@@ -1,13 +1,13 @@
This file is part of MXE. See LICENSE.md for licensing information.
-From c26e8bf6eeba0d7ed230dbc659e7abd8ed8277a1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Kristian Bech Jensen <nkbj1970@hotmail.com>
Date: Sat, 22 Aug 2015 11:25:36 +0200
Subject: [PATCH] fix *.pc file for harfbuzz-icu
diff --git a/src/harfbuzz-icu.pc.in b/src/harfbuzz-icu.pc.in
-index 949869a..59d8cbc 100644
+index 1111111..2222222 100644
--- a/src/harfbuzz-icu.pc.in
+++ b/src/harfbuzz-icu.pc.in
@@ -8,6 +8,7 @@ Description: HarfBuzz text shaping library ICU integration
@@ -20,7 +20,7 @@ index 949869a..59d8cbc 100644
+Libs.private: -lusp10 -lgdi32
Cflags: -I${includedir}/harfbuzz
diff --git a/src/harfbuzz.pc.in b/src/harfbuzz.pc.in
-index b3e124a..e74633a 100644
+index 1111111..2222222 100644
--- a/src/harfbuzz.pc.in
+++ b/src/harfbuzz.pc.in
@@ -7,7 +7,8 @@ Name: harfbuzz
@@ -29,10 +29,7 @@ index b3e124a..e74633a 100644
+Requires.private: cairo-ft glib-2.0
Libs: -L${libdir} -lharfbuzz
--Libs.private: %libs_private%
-+Libs.private: %libs_private% -lusp10 -lgdi32
+-Libs.private: -lm %libs_private%
++Libs.private: -lm %libs_private% -lusp10 -lgdi32
Requires.private: %requires_private%
Cflags: -I${includedir}/harfbuzz
---
-2.1.4
-
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index 2996d33..b41235f 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -4,8 +4,8 @@ PKG := harfbuzz
$(PKG)_WEBSITE := https://wiki.freedesktop.org/www/Software/HarfBuzz/
$(PKG)_DESCR := HarfBuzz
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.5.1
-$(PKG)_CHECKSUM := 56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51
+$(PKG)_VERSION := 1.6.0
+$(PKG)_CHECKSUM := 5037ac0efc85a02a334965e66c1053d9dc9ed6833eae9739bd85bc33c83167c9
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)