From afd2d02bfc8d803a85f1ef17e55e092ff77f6035 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Feb 2023 08:21:16 +0100 Subject: fontconfig: upgrade 2.14.1 -> 2.14.2 License-update: remove fccache.c as all licenses are collected in COPYING. fcache.c used to contain a public domain notice of md5 implementation in the middle of itself, but that too has moved to COPYING. (From OE-Core rev: 1a4b8736a8c6317b47156ec3d81776793a97939b) Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../fontconfig/fontconfig_2.14.1.bb | 70 ---------------------- .../fontconfig/fontconfig_2.14.2.bb | 69 +++++++++++++++++++++ 2 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb create mode 100644 meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb deleted file mode 100644 index ae5a45be54..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "Generic font configuration library" -DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ -does not depend on the X Window System. It is designed to locate \ -fonts within the system and select them according to requirements \ -specified by applications. \ -Fontconfig is not a rasterization library, nor does it impose a \ -particular rasterization library on the application. The X-specific \ -library 'Xft' uses fontconfig along with freetype to specify and \ -rasterize fonts." - -HOMEPAGE = "http://www.fontconfig.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" - -LICENSE = "MIT & MIT & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \ - file://src/fcfreetype.c;endline=45;md5=ce976b310a013a6ace6b60afa71851c1 \ - file://src/fccache.c;beginline=1671;endline=1686;md5=906c2f04b0c79a1bcc84ecfca4de5619 \ - " - -SECTION = "libs" - -DEPENDS = "expat freetype zlib gperf-native util-linux" - -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://revert-static-pkgconfig.patch \ - " - -SRC_URI[sha256sum] = "ae480e9ca34382790312ff062c625ec70df94d6d9a9366e2b2b3d525f7f90387" - -UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.(?!9\d+)\d+)" - -do_configure:prepend() { - # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280 - rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf -} - -do_install:append:class-target() { - # duplicate fc-cache for postinstall script - mkdir -p ${D}${libexecdir} - ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache -} - -do_install:append:class-nativesdk() { - # duplicate fc-cache for postinstall script - mkdir -p ${D}${libexecdir} - ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache -} - -PACKAGES =+ "fontconfig-utils" -FILES:${PN} =+ "${datadir}/xml/*" -FILES:${PN}-dev += "${datadir}/gettext/*" -FILES:fontconfig-utils = "${bindir}/* ${libexecdir}/*" - -# Work around past breakage in debian.bbclass -RPROVIDES:fontconfig-utils = "libfontconfig-utils" -RREPLACES:fontconfig-utils = "libfontconfig-utils" -RCONFLICTS:fontconfig-utils = "libfontconfig-utils" -DEBIAN_NOAUTONAME:fontconfig-utils = "1" - -inherit autotools pkgconfig relative_symlinks gettext - -FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" - -# comma separated list of additional directories -# /usr/share/fonts is already included by default (you can change it with --with-default-fonts) -FONTCONFIG_FONT_DIRS ?= "no" - -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb new file mode 100644 index 0000000000..a3d29ddbae --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb @@ -0,0 +1,69 @@ +SUMMARY = "Generic font configuration library" +DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ +does not depend on the X Window System. It is designed to locate \ +fonts within the system and select them according to requirements \ +specified by applications. \ +Fontconfig is not a rasterization library, nor does it impose a \ +particular rasterization library on the application. The X-specific \ +library 'Xft' uses fontconfig along with freetype to specify and \ +rasterize fonts." + +HOMEPAGE = "http://www.fontconfig.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" + +LICENSE = "MIT & MIT & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \ + file://src/fcfreetype.c;endline=45;md5=ce976b310a013a6ace6b60afa71851c1 \ + " + +SECTION = "libs" + +DEPENDS = "expat freetype zlib gperf-native util-linux" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ + file://revert-static-pkgconfig.patch \ + " + +SRC_URI[sha256sum] = "3ba2dd92158718acec5caaf1a716043b5aa055c27b081d914af3ccb40dce8a55" + +UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.(?!9\d+)\d+)" + +do_configure:prepend() { + # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280 + rm -f ${S}/src/fcobjshash.h ${S}/src/fcobjshash.gperf +} + +do_install:append:class-target() { + # duplicate fc-cache for postinstall script + mkdir -p ${D}${libexecdir} + ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache +} + +do_install:append:class-nativesdk() { + # duplicate fc-cache for postinstall script + mkdir -p ${D}${libexecdir} + ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache +} + +PACKAGES =+ "fontconfig-utils" +FILES:${PN} =+ "${datadir}/xml/*" +FILES:${PN}-dev += "${datadir}/gettext/*" +FILES:fontconfig-utils = "${bindir}/* ${libexecdir}/*" + +# Work around past breakage in debian.bbclass +RPROVIDES:fontconfig-utils = "libfontconfig-utils" +RREPLACES:fontconfig-utils = "libfontconfig-utils" +RCONFLICTS:fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME:fontconfig-utils = "1" + +inherit autotools pkgconfig relative_symlinks gettext + +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" + +# comma separated list of additional directories +# /usr/share/fonts is already included by default (you can change it with --with-default-fonts) +FONTCONFIG_FONT_DIRS ?= "no" + +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf