diff options
| -rw-r--r-- | package/font-adobe-100dpi/Makefile | 4 | ||||
| -rw-r--r-- | package/font-adobe-75dpi/Makefile | 4 | ||||
| -rw-r--r-- | package/fontconfig/Makefile | 14 | ||||
| -rw-r--r-- | package/freetype/Makefile | 6 | ||||
| -rw-r--r-- | package/libxml2/Makefile | 6 |
5 files changed, 15 insertions, 19 deletions
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index a9fcab4ff..cf4f25c08 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-100dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/100dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile index 4f9d4dae9..61dc6568a 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-75dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 614a16381..aeb6fc8e9 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,20 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.15.0 +PKG_VERSION:= 2.16.0 PKG_RELEASE:= 1 -PKG_HASH:= f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4 +PKG_HASH:= 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts -PKG_DEPENDS:= libxml2 +PKG_DEPENDS:= libfreetype libxml2 PKG_BUILDDEP:= freetype libxml2 gperf-host util-linux HOST_BUILDDEP:= expat-host PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -25,11 +23,13 @@ $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE}) $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) HOST_STYLE:= auto -CONFIGURE_ARGS+= --with-arch=${ADK_TARGET_ARCH} \ - --enable-libxml2 \ +CONFIGURE_ARGS+= --enable-libxml2 \ --disable-docs fontconfig-install: + ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/fc-* \ + ${IDIR_FONTCONFIG}/usr/bin ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5db6dea81..1c6c264d7 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freetype -PKG_VERSION:= 2.11.1 -PKG_RELEASE:= 2 -PKG_HASH:= f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b +PKG_VERSION:= 2.13.3 +PKG_RELEASE:= 1 +PKG_HASH:= 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 078788d7e..a38d6898d 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.10.3 +PKG_VERSION:= 2.14.2 PKG_RELEASE:= 1 -PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c +PKG_HASH:= 353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6 PKG_DESCR:= xml parser and toolkit PKG_SECTION:= libs/data PKG_DEPENDS:= zlib PKG_BUILDDEP:= libxml2-host python3 zlib HOST_BUILDDEP:= python3-host PKG_URL:= http://www.xmlsoft.org/ -PKG_SITES:= https://download.gnome.org/sources/libxml2/2.10/ +PKG_SITES:= https://download.gnome.org/sources/libxml2/2.14/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/host.mk |