diff options
Diffstat (limited to 'package/font-util')
| -rw-r--r-- | package/font-util/Makefile | 7 | ||||
| -rw-r--r-- | package/font-util/patches/patch-fontutil_pc_in | 13 |
2 files changed, 13 insertions, 7 deletions
diff --git a/package/font-util/Makefile b/package/font-util/Makefile index ec2559275..eeb265a28 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= font-util -PKG_VERSION:= 1.3.1 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b +PKG_HASH:= f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76 PKG_DESCR:= font utility PKG_SECTION:= x11/fonts PKG_URL:= http://www.x.org/ @@ -14,8 +14,10 @@ PKG_SITES:= http://www.x.org/releases/individual/font/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # XXX: Push the mapping files to a place where we can find them @@ -38,4 +40,5 @@ font-util-install: ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \ ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-util/patches/patch-fontutil_pc_in b/package/font-util/patches/patch-fontutil_pc_in index 4662db361..2b2ed3d53 100644 --- a/package/font-util/patches/patch-fontutil_pc_in +++ b/package/font-util/patches/patch-fontutil_pc_in @@ -1,11 +1,14 @@ ---- font-util-1.1.1.orig/fontutil.pc.in 2009-10-11 06:32:56.000000000 +0200 -+++ font-util-1.1.1/fontutil.pc.in 2010-12-02 22:28:16.000000000 +0100 -@@ -4,7 +4,7 @@ libdir=@libdir@ +--- font-util-1.3.2.orig/fontutil.pc.in 2019-08-26 00:25:25.000000000 +0200 ++++ font-util-1.3.2/fontutil.pc.in 2022-03-01 21:10:24.228234038 +0100 +@@ -2,9 +2,9 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ datarootdir=@datarootdir@ - datadir=@datadir@ +-datadir=@datadir@ ++datadir=${prefix}/share fontrootdir=@fontrootdir@ -mapdir=@MAPDIR@ -+mapdir=${prefix}/../@MAPDIR@ ++mapdir=${fontrootdir}/util Name: FontUtil Description: Font utilities dirs |