diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 18:28:03 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 18:28:24 +0200 |
| commit | 72b4ecd972cbade303cf7cf69986183a10feb118 (patch) | |
| tree | 5bd4eec4af600aa631b0f523b9067855c8e60a4b /package/harfbuzz | |
| parent | 4340ac5371121ab2adb2dc53414c2348506cac73 (diff) | |
fix host compile of librsvg, required for midori
Diffstat (limited to 'package/harfbuzz')
| -rw-r--r-- | package/harfbuzz/Makefile | 12 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in | 18 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-src_harfbuzz_pc_in | 16 |
3 files changed, 43 insertions, 3 deletions
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 07a84a5b4..fbe1a6c3f 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,24 +4,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 3 -PKG_MD5SUM:= e901ffe556d706b7d43b272f83be7f09 +PKG_VERSION:= 0.9.28 +PKG_RELEASE:= 1 +PKG_MD5SUM:= accbeb679f39d839038b95a87e40870e PKG_DESCR:= OpenType text shaping engine PKG_SECTION:= libs PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ PKG_DEPENDS:= libstdcxx cairo icu4c PKG_BUILDDEP:= libstdcxx cairo icu4c +HOST_BUILDDEP:= cairo-host icu4c-host PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +include $(TOPDIR)/mk/host.mk include $(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})) +HOST_STYLE:= auto + pre-install: $(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz $(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz @@ -31,4 +36,5 @@ harfbuzz-install: $(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \ $(IDIR_HARFBUZZ)/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in new file mode 100644 index 000000000..8cb50339d --- /dev/null +++ b/package/harfbuzz/patches/patch-src_harfbuzz-icu_pc_in @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 000000000..90b2faf8f --- /dev/null +++ b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in @@ -0,0 +1,16 @@ +--- harfbuzz-0.9.28.orig/src/harfbuzz.pc.in 2013-10-28 00:45:25.000000000 +0100 ++++ harfbuzz-0.9.28/src/harfbuzz.pc.in 2014-05-23 18:08:04.000000000 +0200 +@@ -1,11 +1,8 @@ + prefix=%prefix% +-exec_prefix=%exec_prefix% +-libdir=%libdir% +-includedir=%includedir% + + Name: harfbuzz + Description: HarfBuzz text shaping library + Version: %VERSION% + +-Libs: -L${libdir} -lharfbuzz +-Cflags: -I${includedir}/harfbuzz ++Libs: -L${prefix}/lib -lharfbuzz ++Cflags: -I${prefix}/include/harfbuzz |