diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-13 18:43:52 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-13 18:44:23 +0100 |
| commit | 4c3b78a7638ad9dc9a03d369768031d6131e2573 (patch) | |
| tree | e12fe9f3beab448883153a9c402bbcbc1e30b591 /package/harfbuzz | |
| parent | fc698257dcec51f6a0582b0227fa740d75461368 (diff) | |
harfbuzz: update to latest stable version
Diffstat (limited to 'package/harfbuzz')
| -rw-r--r-- | package/harfbuzz/Makefile | 10 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-Makefile_am | 11 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in | 18 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-src_harfbuzz_pc_in | 4 |
4 files changed, 4 insertions, 39 deletions
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index ff3afa35b..6f1e3a8dd 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 1.1.2 +PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 -PKG_HASH:= 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f +PKG_HASH:= 8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c PKG_DESCR:= opentype text shaping engine PKG_SECTION:= libs/fonts PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ @@ -24,12 +24,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf - -pre-install: - $(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz - $(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz - harfbuzz-install: $(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib $(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \ diff --git a/package/harfbuzz/patches/patch-Makefile_am b/package/harfbuzz/patches/patch-Makefile_am deleted file mode 100644 index 64498b59c..000000000 --- a/package/harfbuzz/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- harfbuzz-0.9.28.orig/Makefile.am 2014-03-04 22:00:34.076514970 +0100 -+++ harfbuzz-0.9.28/Makefile.am 2014-06-22 19:46:18.230010420 +0200 -@@ -4,7 +4,7 @@ NULL = - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = src util test docs -+SUBDIRS = src util - - EXTRA_DIST = \ - autogen.sh \ diff --git a/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in deleted file mode 100644 index 8cb50339d..000000000 --- a/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in +++ /dev/null @@ -1,18 +0,0 @@ ---- harfbuzz-0.9.28.orig/src/harfbuzz-icu.pc.in 2013-10-28 00:45:25.000000000 +0100 -+++ harfbuzz-0.9.28/src/harfbuzz-icu.pc.in 2014-05-23 18:08:32.000000000 +0200 -@@ -1,7 +1,4 @@ - prefix=%prefix% --exec_prefix=%exec_prefix% --libdir=%libdir% --includedir=%includedir% - - Name: harfbuzz - Description: HarfBuzz text shaping library ICU integration -@@ -9,5 +6,5 @@ Version: %VERSION% - - Requires: harfbuzz - Requires.private: icu-uc --Libs: -L${libdir} -lharfbuzz-icu --Cflags: -I${includedir}/harfbuzz -+Libs: -L${prefix}/lib -lharfbuzz-icu -+Cflags: -I${prefix}/include/harfbuzz diff --git a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in index 2c5697bfe..291829515 100644 --- a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in +++ b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in @@ -1,5 +1,5 @@ ---- harfbuzz-1.0.6.orig/src/harfbuzz.pc.in 2015-08-11 12:47:09.000000000 +0200 -+++ harfbuzz-1.0.6/src/harfbuzz.pc.in 2015-10-25 10:54:18.000000000 +0100 +--- harfbuzz-1.2.3.orig/src/harfbuzz.pc.in 2016-01-06 13:00:36.113138042 +0100 ++++ harfbuzz-1.2.3/src/harfbuzz.pc.in 2016-03-12 21:55:46.457327612 +0100 @@ -1,13 +1,10 @@ prefix=%prefix% -exec_prefix=%exec_prefix% |