Attachment 205723 Details for Bug 239167 – patch to update fontconfig

[patch] patch to update fontconfig

fontconfig-rev0.diff (text/plain), 10.99 KB, created by Steve Wills on 2019-07-12 16:15:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2019-07-12 16:15:15 UTC

Size: 10.99 KB

patch

obsolete

>diff --git x11-fonts/fontconfig/distinfo x11-fonts/fontconfig/distinfo
>index d1c5b13e3170..a992ee62543a 100644
>--- x11-fonts/fontconfig/distinfo
>+++ x11-fonts/fontconfig/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1505981313
>-SHA256 (fontconfig-2.12.6.tar.bz2) = cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
>-SIZE (fontconfig-2.12.6.tar.bz2) = 1624683
>+TIMESTAMP = 1550745725
>+SHA256 (fontconfig-2.13.1.tar.bz2) = f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
>+SIZE (fontconfig-2.13.1.tar.bz2) = 1723639
>diff --git x11-fonts/fontconfig/Makefile x11-fonts/fontconfig/Makefile
>index 72758a3be76f..39b3d3d47855 100644
>--- x11-fonts/fontconfig/Makefile
>+++ x11-fonts/fontconfig/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fontconfig
>-PORTVERSION=	2.12.6
>+PORTVERSION=	2.13.1
> PORTREVISION?=	0
> PORTEPOCH?=	1
> CATEGORIES=	x11-fonts
>@@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		gperf tar:bzip2
> 
>-.if !defined(REFERENCE_PORT)
>-
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
>+		libuuid.so:misc/e2fsprogs-libuuid \
> 		libexpat.so:textproc/expat2
> 
> USES+=		cpe gmake libtool pathfix pkgconfig
>@@ -49,7 +48,7 @@ INSTALL_TARGET=install-strip
> PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
> PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
> 
>-OPTIONS_DEFINE=	DOCS NO_BITMAPS
>+OPTIONS_DEFINE=	DOCS NO_BITMAPS NLS
> OPTIONS_DEFAULT=HINTING_SLIGHT
> OPTIONS_SUB=	yes
> 
>@@ -63,6 +62,9 @@ HINTING_${opt}_DESC=	${opt:tl}
> HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
> .endfor
> 
>+NLS_USES=		gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+
> post-patch-NO_BITMAPS-on:
> 	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
> 		'/^CONF_LINKS =/s|$$|\${.newline}	70-no-bitmaps.conf \\|' \
>@@ -84,5 +86,3 @@ post-install-DOCS-on:
> 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>-
>-.endif
>diff --git x11-fonts/fontconfig/pkg-plist x11-fonts/fontconfig/pkg-plist
>index 4ef2fb2a2c9c..79d54b5679d2 100644
>--- x11-fonts/fontconfig/pkg-plist
>+++ x11-fonts/fontconfig/pkg-plist
>@@ -1,5 +1,6 @@
> bin/fc-cache
> bin/fc-cat
>+bin/fc-conflist
> bin/fc-list
> bin/fc-match
> bin/fc-pattern
>@@ -10,7 +11,7 @@ etc/fonts/conf.avail/10-autohint.conf
> etc/fonts/conf.avail/10-hinting-full.conf
> etc/fonts/conf.avail/10-hinting-medium.conf
> etc/fonts/conf.avail/10-hinting-none.conf
>-etc/fonts/conf.avail/10-hinting-slight.conf
>+etc/fonts/conf.avail/10-hinting-%%PREFERRED_HINTING%%.conf
> etc/fonts/conf.avail/10-no-sub-pixel.conf
> etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
> etc/fonts/conf.avail/10-sub-pixel-bgr.conf
>@@ -67,10 +68,11 @@ include/fontconfig/fontconfig.h
> lib/libfontconfig.a
> lib/libfontconfig.so
> lib/libfontconfig.so.1
>-lib/libfontconfig.so.1.10.1
>+lib/libfontconfig.so.1.12.0
> libdata/pkgconfig/fontconfig.pc
> man/man1/fc-cache.1.gz
> man/man1/fc-cat.1.gz
>+man/man1/fc-conflist.1.gz
> man/man1/fc-list.1.gz
> man/man1/fc-match.1.gz
> man/man1/fc-pattern.1.gz
>@@ -78,4 +80,8 @@ man/man1/fc-query.1.gz
> man/man1/fc-scan.1.gz
> man/man1/fc-validate.1.gz
> man/man5/fonts-conf.5.gz
>+share/gettext/its/fontconfig.its
>+share/gettext/its/fontconfig.loc
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
> @dir /var/db/fontconfig
>diff --git x11-fonts/fontconfig-reference/Makefile x11-fonts/fontconfig-reference/Makefile
>deleted file mode 100644
>index e3e4d32a38b2..000000000000
>--- x11-fonts/fontconfig-reference/Makefile
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
>-# $FreeBSD$
>-
>-PORTREVISION=	0
>-PORTEPOCH=	0
>-
>-NO_ARCH=	yes
>-
>-DOCSDIR=	${PREFIX}/share/doc/fontconfig-devel
>-
>-do-install:
>-	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/doc/fontconfig-devel.pdf \
>-		${WRKSRC}/doc/fontconfig-devel.txt ${STAGEDIR}${DOCSDIR}
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
>-	${INSTALL_DATA} ${WRKSRC}/doc/fontconfig-devel/* ${STAGEDIR}${DOCSDIR}/html
>-
>-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
>diff --git x11-fonts/fontconfig-reference/pkg-descr x11-fonts/fontconfig-reference/pkg-descr
>deleted file mode 100644
>index 6de649ca9410..000000000000
>--- x11-fonts/fontconfig-reference/pkg-descr
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-This port contains the programming reference for x11-fonts/fontconfig.
>-
>-WWW: http://fontconfig.org/
>diff --git x11-fonts/fontconfig-reference/pkg-plist x11-fonts/fontconfig-reference/pkg-plist
>deleted file mode 100644
>index 48085c9e591d..000000000000
>--- x11-fonts/fontconfig-reference/pkg-plist
>+++ /dev/null
>@@ -1,199 +0,0 @@
>-man/man3/FcAtomicCreate.3.gz
>-man/man3/FcAtomicDeleteNew.3.gz
>-man/man3/FcAtomicDestroy.3.gz
>-man/man3/FcAtomicLock.3.gz
>-man/man3/FcAtomicNewFile.3.gz
>-man/man3/FcAtomicOrigFile.3.gz
>-man/man3/FcAtomicReplaceOrig.3.gz
>-man/man3/FcAtomicUnlock.3.gz
>-man/man3/FcBlanksAdd.3.gz
>-man/man3/FcBlanksCreate.3.gz
>-man/man3/FcBlanksDestroy.3.gz
>-man/man3/FcBlanksIsMember.3.gz
>-man/man3/FcCacheCopySet.3.gz
>-man/man3/FcCacheCreateTagFile.3.gz
>-man/man3/FcCacheDir.3.gz
>-man/man3/FcCacheNumFont.3.gz
>-man/man3/FcCacheNumSubdir.3.gz
>-man/man3/FcCacheSubdir.3.gz
>-man/man3/FcCharSetAddChar.3.gz
>-man/man3/FcCharSetCopy.3.gz
>-man/man3/FcCharSetCount.3.gz
>-man/man3/FcCharSetCoverage.3.gz
>-man/man3/FcCharSetCreate.3.gz
>-man/man3/FcCharSetDelChar.3.gz
>-man/man3/FcCharSetDestroy.3.gz
>-man/man3/FcCharSetEqual.3.gz
>-man/man3/FcCharSetFirstPage.3.gz
>-man/man3/FcCharSetHasChar.3.gz
>-man/man3/FcCharSetIntersect.3.gz
>-man/man3/FcCharSetIntersectCount.3.gz
>-man/man3/FcCharSetIsSubset.3.gz
>-man/man3/FcCharSetMerge.3.gz
>-man/man3/FcCharSetNew.3.gz
>-man/man3/FcCharSetNextPage.3.gz
>-man/man3/FcCharSetSubtract.3.gz
>-man/man3/FcCharSetSubtractCount.3.gz
>-man/man3/FcCharSetUnion.3.gz
>-man/man3/FcConfigAppFontAddDir.3.gz
>-man/man3/FcConfigAppFontAddFile.3.gz
>-man/man3/FcConfigAppFontClear.3.gz
>-man/man3/FcConfigBuildFonts.3.gz
>-man/man3/FcConfigCreate.3.gz
>-man/man3/FcConfigDestroy.3.gz
>-man/man3/FcConfigEnableHome.3.gz
>-man/man3/FcConfigFilename.3.gz
>-man/man3/FcConfigGetBlanks.3.gz
>-man/man3/FcConfigGetCache.3.gz
>-man/man3/FcConfigGetCacheDirs.3.gz
>-man/man3/FcConfigGetConfigDirs.3.gz
>-man/man3/FcConfigGetConfigFiles.3.gz
>-man/man3/FcConfigGetCurrent.3.gz
>-man/man3/FcConfigGetFontDirs.3.gz
>-man/man3/FcConfigGetFonts.3.gz
>-man/man3/FcConfigGetRescanInterval.3.gz
>-man/man3/FcConfigGetSysRoot.3.gz
>-man/man3/FcConfigHome.3.gz
>-man/man3/FcConfigParseAndLoad.3.gz
>-man/man3/FcConfigParseAndLoadFromMemory.3.gz
>-man/man3/FcConfigReference.3.gz
>-man/man3/FcConfigSetCurrent.3.gz
>-man/man3/FcConfigSetRescanInterval.3.gz
>-man/man3/FcConfigSetSysRoot.3.gz
>-man/man3/FcConfigSubstitute.3.gz
>-man/man3/FcConfigSubstituteWithPat.3.gz
>-man/man3/FcConfigUptoDate.3.gz
>-man/man3/FcDefaultSubstitute.3.gz
>-man/man3/FcDirCacheClean.3.gz
>-man/man3/FcDirCacheLoad.3.gz
>-man/man3/FcDirCacheLoadFile.3.gz
>-man/man3/FcDirCacheRead.3.gz
>-man/man3/FcDirCacheRescan.3.gz
>-man/man3/FcDirCacheUnlink.3.gz
>-man/man3/FcDirCacheUnload.3.gz
>-man/man3/FcDirCacheValid.3.gz
>-man/man3/FcDirSave.3.gz
>-man/man3/FcDirScan.3.gz
>-man/man3/FcFileIsDir.3.gz
>-man/man3/FcFileScan.3.gz
>-man/man3/FcFini.3.gz
>-man/man3/FcFontList.3.gz
>-man/man3/FcFontMatch.3.gz
>-man/man3/FcFontRenderPrepare.3.gz
>-man/man3/FcFontSetAdd.3.gz
>-man/man3/FcFontSetCreate.3.gz
>-man/man3/FcFontSetDestroy.3.gz
>-man/man3/FcFontSetList.3.gz
>-man/man3/FcFontSetMatch.3.gz
>-man/man3/FcFontSetPrint.3.gz
>-man/man3/FcFontSetSort.3.gz
>-man/man3/FcFontSetSortDestroy.3.gz
>-man/man3/FcFontSort.3.gz
>-man/man3/FcFreeTypeCharIndex.3.gz
>-man/man3/FcFreeTypeCharSet.3.gz
>-man/man3/FcFreeTypeCharSetAndSpacing.3.gz
>-man/man3/FcFreeTypeQuery.3.gz
>-man/man3/FcFreeTypeQueryFace.3.gz
>-man/man3/FcGetDefaultLangs.3.gz
>-man/man3/FcGetLangs.3.gz
>-man/man3/FcGetVersion.3.gz
>-man/man3/FcInit.3.gz
>-man/man3/FcInitBringUptoDate.3.gz
>-man/man3/FcInitLoadConfig.3.gz
>-man/man3/FcInitLoadConfigAndFonts.3.gz
>-man/man3/FcInitReinitialize.3.gz
>-man/man3/FcIsLower.3.gz
>-man/man3/FcIsUpper.3.gz
>-man/man3/FcLangGetCharSet.3.gz
>-man/man3/FcLangNormalize.3.gz
>-man/man3/FcLangSetAdd.3.gz
>-man/man3/FcLangSetCompare.3.gz
>-man/man3/FcLangSetContains.3.gz
>-man/man3/FcLangSetCopy.3.gz
>-man/man3/FcLangSetCreate.3.gz
>-man/man3/FcLangSetDel.3.gz
>-man/man3/FcLangSetDestroy.3.gz
>-man/man3/FcLangSetEqual.3.gz
>-man/man3/FcLangSetGetLangs.3.gz
>-man/man3/FcLangSetHasLang.3.gz
>-man/man3/FcLangSetHash.3.gz
>-man/man3/FcLangSetSubtract.3.gz
>-man/man3/FcLangSetUnion.3.gz
>-man/man3/FcMatrixCopy.3.gz
>-man/man3/FcMatrixEqual.3.gz
>-man/man3/FcMatrixInit.3.gz
>-man/man3/FcMatrixMultiply.3.gz
>-man/man3/FcMatrixRotate.3.gz
>-man/man3/FcMatrixScale.3.gz
>-man/man3/FcMatrixShear.3.gz
>-man/man3/FcNameConstant.3.gz
>-man/man3/FcNameGetConstant.3.gz
>-man/man3/FcNameGetObjectType.3.gz
>-man/man3/FcNameParse.3.gz
>-man/man3/FcNameRegisterConstants.3.gz
>-man/man3/FcNameRegisterObjectTypes.3.gz
>-man/man3/FcNameUnparse.3.gz
>-man/man3/FcNameUnregisterConstants.3.gz
>-man/man3/FcNameUnregisterObjectTypes.3.gz
>-man/man3/FcObjectSetAdd.3.gz
>-man/man3/FcObjectSetBuild.3.gz
>-man/man3/FcObjectSetCreate.3.gz
>-man/man3/FcObjectSetDestroy.3.gz
>-man/man3/FcPatternAdd-Type.3.gz
>-man/man3/FcPatternAdd.3.gz
>-man/man3/FcPatternAddWeak.3.gz
>-man/man3/FcPatternBuild.3.gz
>-man/man3/FcPatternCreate.3.gz
>-man/man3/FcPatternDel.3.gz
>-man/man3/FcPatternDestroy.3.gz
>-man/man3/FcPatternDuplicate.3.gz
>-man/man3/FcPatternEqual.3.gz
>-man/man3/FcPatternEqualSubset.3.gz
>-man/man3/FcPatternFilter.3.gz
>-man/man3/FcPatternFormat.3.gz
>-man/man3/FcPatternGet-Type.3.gz
>-man/man3/FcPatternGet.3.gz
>-man/man3/FcPatternGetWithBinding.3.gz
>-man/man3/FcPatternHash.3.gz
>-man/man3/FcPatternPrint.3.gz
>-man/man3/FcPatternReference.3.gz
>-man/man3/FcPatternRemove.3.gz
>-man/man3/FcRangeCopy.3.gz
>-man/man3/FcRangeCreateDouble.3.gz
>-man/man3/FcRangeCreateInteger.3.gz
>-man/man3/FcRangeDestroy.3.gz
>-man/man3/FcRangeGetDouble.3.gz
>-man/man3/FcStrBasename.3.gz
>-man/man3/FcStrCmp.3.gz
>-man/man3/FcStrCmpIgnoreCase.3.gz
>-man/man3/FcStrCopy.3.gz
>-man/man3/FcStrCopyFilename.3.gz
>-man/man3/FcStrDirname.3.gz
>-man/man3/FcStrDowncase.3.gz
>-man/man3/FcStrFree.3.gz
>-man/man3/FcStrListCreate.3.gz
>-man/man3/FcStrListDone.3.gz
>-man/man3/FcStrListFirst.3.gz
>-man/man3/FcStrListNext.3.gz
>-man/man3/FcStrPlus.3.gz
>-man/man3/FcStrSetAdd.3.gz
>-man/man3/FcStrSetAddFilename.3.gz
>-man/man3/FcStrSetCreate.3.gz
>-man/man3/FcStrSetDel.3.gz
>-man/man3/FcStrSetDestroy.3.gz
>-man/man3/FcStrSetEqual.3.gz
>-man/man3/FcStrSetMember.3.gz
>-man/man3/FcStrStr.3.gz
>-man/man3/FcStrStrIgnoreCase.3.gz
>-man/man3/FcToLower.3.gz
>-man/man3/FcUcs4ToUtf8.3.gz
>-man/man3/FcUtf16Len.3.gz
>-man/man3/FcUtf16ToUcs4.3.gz
>-man/man3/FcUtf8Len.3.gz
>-man/man3/FcUtf8ToUcs4.3.gz
>-man/man3/FcValueDestroy.3.gz
>-man/man3/FcValueEqual.3.gz
>-man/man3/FcValuePrint.3.gz
>-man/man3/FcValueSave.3.gz
>-man/man3/FcWeightFromOpenType.3.gz
>-man/man3/FcWeightToOpenType.3.gz
>diff --git x11-fonts/Makefile x11-fonts/Makefile
>index 24cee4126c25..747115c995db 100644
>--- x11-fonts/Makefile
>+++ x11-fonts/Makefile
>@@ -97,7 +97,6 @@
>     SUBDIR += font-winitzki-cyrillic
>     SUBDIR += font-xfree86-type1
>     SUBDIR += fontconfig
>-    SUBDIR += fontconfig-reference
>     SUBDIR += fonts-indic
>     SUBDIR += fonttosfnt
>     SUBDIR += freefont-ttf

Actions: View | Diff

Attachments on bug 239167: 205723 | 205785 | 205786 | 205810 | 205827 | 205855 | 206007 | 206009 | 206030 | 206087 | 206117 | 212601 | 212602 | 212603 | 212612 | 212643 | 212645