Commit 1da34d2b authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

harfbuzz: bump to version 1.0.2 



Static fix patch upstream so dropped.

[Peter: drop _AUTORECONF as libtool 2.4.2 is used / no patches]
Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ed5c939d

package/harfbuzz/0001-fix-static-linking-with-icu-uc.patch

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
From 5752d3f17072aa97a056dc081e402f43e1a3ba32 Mon Sep 17 00:00:00 2001

From: Romain Naour <romain.naour@openwide.fr>

Date: Wed, 22 Jul 2015 23:26:23 +0200

Subject: [PATCH] fix static linking with icu-uc



When linking test-unicode statically it needs $(ICU_LIBS)

which contains all required flags.

Especially -lstdc++.



Fixes:

http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/



Signed-off-by: Romain Naour <romain.naour@openwide.fr>

---

 test/api/Makefile.am | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/test/api/Makefile.am b/test/api/Makefile.am

index 4ff14fa..314a09f 100644

--- a/test/api/Makefile.am

+++ b/test/api/Makefile.am

@@ -34,7 +34,7 @@ test_unicode_CPPFLAGS += $(GLIB_CFLAGS)

 endif

 if HAVE_ICU

 test_unicode_CPPFLAGS += $(ICU_CFLAGS)

-test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la

+test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la $(ICU_LIBS)

 endif

 

 

-- 

2.4.3

package/harfbuzz/harfbuzz.hash

+2 −2
Original line number Diff line number Diff line 
# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.0.1.tar.bz2.sha256

sha256	32a1a7ad584a2f2cfba5c1d234d046c0521e86e7a21d403e15e89aa509ef0ea8	harfbuzz-1.0.1.tar.bz2
 
# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.0.2.tar.bz2.sha256

sha256	beb3caf8654010fcdca61c810a3a7532237fc567ee4271deb674b5efbbe3b466	harfbuzz-1.0.2.tar.bz2

package/harfbuzz/harfbuzz.mk

+1 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



HARFBUZZ_VERSION = 1.0.1

HARFBUZZ_VERSION = 1.0.2

HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release

HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2

HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
@@ -25,9 +25,6 @@ HOST_HARFBUZZ_CONF_OPTS = \ 
	--with-freetype=yes \

	--with-glib=yes



# beta libtool version and patching Makefile.am

HARFBUZZ_AUTORECONF = YES



ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)

# forgets to link test programs with -pthread breaking static link

HARFBUZZ_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -pthread"