Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07ce20dd0ff4b99c2bfb625d6dbc2d27bf3fb713
commit 07ce20dd0ff4b99c2bfb625d6dbc2d27bf3fb713 Author: crazy <[email protected]> Date: Wed Jul 12 10:11:17 2017 +0200 fontconfig-2.12.4-1-x86_64 * Version bump diff --git a/source/lib/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch b/source/lib/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch deleted file mode 100644 index cad7170..0000000 --- a/source/lib/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 11 Dec 2016 14:32:00 -0800 -Subject: [PATCH] Avoid conflicts with integer width macros from TS - 18661-1:2014 - -glibc 2.25+ has now defined these macros in <limits.h> -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Submitted - - fontconfig/fontconfig.h | 2 +- - src/fcobjs.h | 2 +- - src/fcobjshash.gperf | 2 +- - src/fcobjshash.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -Index: fontconfig-2.12.1/fontconfig/fontconfig.h -=================================================================== ---- fontconfig-2.12.1.orig/fontconfig/fontconfig.h -+++ fontconfig-2.12.1/fontconfig/fontconfig.h -@@ -128,7 +128,8 @@ typedef int FcBool; - #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ --#define FC_CHAR_WIDTH "charwidth" /* Int */ -+#define FC_CHARWIDTH "charwidth" /* Int */ -+#define FC_CHAR_WIDTH FC_CHARWIDTH - #define FC_CHAR_HEIGHT "charheight"/* Int */ - #define FC_MATRIX "matrix" /* FcMatrix */ - -Index: fontconfig-2.12.1/src/fcobjs.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjs.h -+++ fontconfig-2.12.1/src/fcobjs.h -@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) - FC_OBJECT (RGBA, FcTypeInteger, NULL) - FC_OBJECT (SCALE, FcTypeDouble, NULL) - FC_OBJECT (MINSPACE, FcTypeBool, NULL) --FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) -+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) - FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) - FC_OBJECT (MATRIX, FcTypeMatrix, NULL) - FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) -Index: fontconfig-2.12.1/src/fcobjshash.gperf -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.gperf -+++ fontconfig-2.12.1/src/fcobjshash.gperf -@@ -44,7 +44,7 @@ int id; - "rgba",FC_RGBA_OBJECT - "scale",FC_SCALE_OBJECT - "minspace",FC_MINSPACE_OBJECT --"charwidth",FC_CHAR_WIDTH_OBJECT -+"charwidth",FC_CHARWIDTH_OBJECT - "charheight",FC_CHAR_HEIGHT_OBJECT - "matrix",FC_MATRIX_OBJECT - "charset",FC_CHARSET_OBJECT -Index: fontconfig-2.12.1/src/fcobjshash.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.h -+++ fontconfig-2.12.1/src/fcobjshash.h -@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, - {-1}, - #line 47 "fcobjshash.gperf" -- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, -+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, - #line 48 "fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, - #line 55 "fcobjshash.gperf" diff --git a/source/lib/fontconfig/FrugalBuild b/source/lib/fontconfig/FrugalBuild index 90fd940..dee23be 100644 --- a/source/lib/fontconfig/FrugalBuild +++ b/source/lib/fontconfig/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=fontconfig -pkgver=2.12.3 +pkgver=2.12.4 pkgrel=1 pkgdesc="A library for configuring and customizing font access" url="http://fontconfig.org/"; @@ -14,12 +14,9 @@ groups=('lib' 'misc-fonts') archs=("x86_64") up2date="lynx -dump http://fontconfig.org/release|Flasttar" options=('force') -source=($url/release/$pkgname-$pkgver.tar.gz \ - 25-no-bitmap.conf \ - gperf.patch) -sha1sums=('3ec4c0edb3b1165adbe63bc521f1d001b88b2b4a' \ - '72ed9989eb96475b0c077dda2e47188583d63420' \ - '406a3bc0302b7c28f5b4be025c93325b2757cc60') +source=($url/release/$pkgname-$pkgver.tar.gz 25-no-bitmap.conf) +sha1sums=('bd47252383fff73d51ebc6bb562f035e5caa7549' \ + '72ed9989eb96475b0c077dda2e47188583d63420') ## NOTE: !!! DO _NOT_ BUMP , CHANGE or whatever else without permission from m8r or vmiklos !!! ## Fconfopts=" --with-add-fonts=/usr/share/fonts/X11" diff --git a/source/lib/fontconfig/gperf.patch b/source/lib/fontconfig/gperf.patch deleted file mode 100644 index 3dba0bb..0000000 --- a/source/lib/fontconfig/gperf.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 28139816d62b8444ca61a000a87c71e59fef104d Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <[email protected]> -Date: Mon, 5 Jun 2017 21:00:36 +0900 -Subject: Fix the build failure when srcdir != builddir and have gperf 3.1 or - later installed - - -diff --git a/src/Makefile.am b/src/Makefile.am -index bbbfeda..bd5ac1f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -104,7 +104,11 @@ noinst_PROGRAMS = fcarch - ../fc-lang/fclang.h: - cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h - --fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h -+fcobjshash.gperf: Makefile stamp-fcobjshash.gperf -+ -@$(RM) stamp-fcobjshash.gperf -+ @$(MAKE) stamp-fcobjshash.gperf -+ @touch -r stamp-fcobjshash.gperf $@ -+stamp-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h - $(AM_V_GEN) $(CPP) -I$(top_srcdir) $< | \ - $(SED) 's/^ *//;s/ *, */,/' | \ - $(GREP) '^[^#]' | \ -@@ -113,7 +117,7 @@ fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h - /CUT_OUT_END/ { no_write=0; next; }; \ - { if (!no_write) print; next; }; \ - ' - > [email protected] && \ -- mv -f [email protected] $@ || ( $(RM) [email protected] && false ) -+ mv -f [email protected] fcobjshash.gperf && touch $@ || ( $(RM) [email protected] && false ) - - fcobjshash.h: Makefile fcobjshash.gperf - $(AM_V_GEN) $(GPERF) -m 100 fcobjshash.gperf > [email protected] && \ -@@ -198,7 +202,7 @@ stamp-fcstdint: $(top_builddir)/config.status - @touch $@ - - CLEANFILES = $(ALIAS_FILES) fontconfig.def --DISTCLEANFILES = stamp-fcstdint fcstdint.h -+DISTCLEANFILES = stamp-fcstdint fcstdint.h stamp-fcobjshash.gperf - - fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES) - echo Generating $@ --- -cgit v0.10.2 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
