From bd091932f757bb2f7b4eac4068e5b1d9d25fd13b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Mar 2022 06:56:03 +0100 Subject: remove midori, it needs libpeas, which needs gobject-introspection I am not able to cross-compile gobject-introspection and not ever willing to try it again. It's a mess. Update all packages required on the way to midori, which now will be removed. sorry. --- package/harfbuzz/Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'package/harfbuzz/Makefile') diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 41711b0e4..12b640b83 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 1.4.2 +PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 -PKG_HASH:= 8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3 +PKG_HASH:= 810bcd3d22fae3c2c18c3688455abc1cd0d7fb2fae25404890b0d77e6443bd0a PKG_DESCR:= opentype text shaping engine PKG_SECTION:= libs/fonts -PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ +PKG_SITES:= https://github.com/harfbuzz/harfbuzz/archive/refs/tags/ PKG_DEPENDS:= cairo icu4c PKG_BUILDDEP:= cairo icu4c HOST_BUILDDEP:= cairo-host icu4c-host PKG_NEEDS:= c++ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,8 +24,19 @@ 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})) -HOST_LDFLAGS+= -lpthread -lrt -HOST_STYLE:= auto +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dfreetype=disabled \ + -Dtests=disabled + +host-postinstall: + $(CP) $(WRKBUILD)/meson-private/harfbuzz.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig/ harfbuzz-install: $(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib -- cgit v1.2.3