[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2024-02-14 Thread Sam James 
commit: ade3abb3586f5cd46401afa207c323a5e7e38169
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 14 18:21:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 14 18:22:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3abb3

media-libs/fontconfig: fix -lm linkage for `fabs`

Signed-off-by: Sam James  gentoo.org>

 .../files/fontconfig-2.14.2-math-fabs.patch| 42 ++
 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild  |  3 +-
 media-libs/fontconfig/fontconfig-2.15.0.ebuild |  3 +-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.2-math-fabs.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.2-math-fabs.patch
new file mode 100644
index ..669e4ebbd65f
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.2-math-fabs.patch
@@ -0,0 +1,42 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/309
+
+From 81d410310ffee8761819e72151ec25efde2f5b24 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 14 Feb 2024 18:12:46 +
+Subject: [PATCH] meson: detect-and-use `-lm` for `fabs` in fcmatch
+
+We had a bug report in Gentoo of a sparc64 build failure with -O0:
+```
+FAILED: src/libfontconfig.so.1.13.0
+sparc64-unknown-linux-gnu-gcc  -o src/libfontconfig.so.1.13.0 
src/libfontconfig.so.1.13.0.p/fcatomic.c.o 
src/libfontconfig.so.1.13.0.p/fccache.c.o 
src/libfontconfig.so.1.13.0.p/fccfg.c.o 
src/libfontconfig.so.1.13.0.p/fccharset.c.o 
src/libfontconfig.so.1.13.0.p/fccompat.c.o 
src/libfontconfig.so.1.13.0.p/fcdbg.c.o 
src/libfontconfig.so.1.13.0.p/fcdefault.c.o 
src/libfontconfig.so.1.13.0.p/fcdir.c.o 
src/libfontconfig.so.1.13.0.p/fcformat.c.o 
src/libfontconfig.so.1.13.0.p/fcfreetype.c.o 
src/libfontconfig.so.1.13.0.p/fcfs.c.o 
src/libfontconfig.so.1.13.0.p/fcptrlist.c.o 
src/libfontconfig.so.1.13.0.p/fchash.c.o 
src/libfontconfig.so.1.13.0.p/fcinit.c.o 
src/libfontconfig.so.1.13.0.p/fclang.c.o 
src/libfontconfig.so.1.13.0.p/fclist.c.o 
src/libfontconfig.so.1.13.0.p/fcmatch.c.o 
src/libfontconfig.so.1.13.0.p/fcmatrix.c.o 
src/libfontconfig.so.1.13.0.p/fcname.c.o 
src/libfontconfig.so.1.13.0.p/fcobjs.c.o 
src/libfontconfig.so.1.13.0.p/fcpat.c.o 
src/libfontconfig.so.1.13.0.p/fcrange.c.o src/libfontconf
 ig.so.1.13.0.p/fcserialize.c.o src/libfontconfig.so.1.13.0.p/fcstat.c.o 
src/libfontconfig.so.1.13.0.p/fcstr.c.o 
src/libfontconfig.so.1.13.0.p/fcweight.c.o 
src/libfontconfig.so.1.13.0.p/fcxml.c.o 
src/libfontconfig.so.1.13.0.p/ftglue.c.o -Wl,--as-needed -Wl,--no-undefined 
-shared -fPIC -Wl,--start-group -Wl,-soname,libfontconfig.so.1 -m64 -g -O0 
-mno-app-regs -mcpu=ultrasparc -mtune=ultrasparc -mno-vis -mno-vis2 -mno-vis3 
-mno-vis4 -mno-vis4b -mno-cbcond -mno-fmaf -mno-fsmuld -mno-popc -mno-subxc 
-fno-builtin -fno-fast-math -Wl,-O1 -Wl,--as-needed -Wl,--no-keep-memory 
/usr/lib64/libfreetype.so /usr/lib64/libexpat.so -Wl,--end-group -pthread
+/usr/lib/gcc/sparc64-unknown-linux-gnu/12/../../../../sparc64-unknown-linux-gnu/bin/ld:
 src/libfontconfig.so.1.13.0.p/fcmatch.c.o: in function `FcCompareRange':
+/var/tmp/portage/media-libs/fontconfig-2.14.2-r3/work/fontconfig-2.14.2-.sparc64/../fontconfig-2.14.2/src/fcmatch.c:220:
 undefined reference to `fabs'
+```
+
+Ask Meson to detect `-lm` and add the missing `-lm` for `fabs` usage.
+
+Signed-off-by: Sam James 
+--- a/meson.build
 b/meson.build
+@@ -23,7 +23,7 @@ freetype_req = '>= 21.0.15'
+ freetype_req_cmake = '>= 2.8.1'
+ 
+ cc = meson.get_compiler('c')
+-
++math_dep = cc.find_library('m', required: false)
+ 
+ freetype_dep = dependency('freetype2', method: 'pkg-config', version: 
freetype_req, required: false)
+ 
+--- a/src/meson.build
 b/src/meson.build
+@@ -65,7 +65,7 @@ libfontconfig = library('fontconfig',
+   fc_sources, alias_headers, ft_alias_headers, fclang_h, fccase_h, 
fcobjshash_h,
+   c_args: c_args + fc_extra_c_args,
+   include_directories: incbase,
+-  dependencies: deps,
++  dependencies: [deps, math_dep],
+   install: true,
+   soversion: soversion,
+   version: libversion,
+-- 
+GitLab

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index 2d4a41d85739..1f3f04e3cc61 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,6 +66,7 @@ PATCHES=(
 
# Patches from upstream (can usually be removed with next version bump)
"${FILESDIR}"/${P}-fix-sysroot-fc-cache.patch
+   "${FILESDIR}"/${PN}-2.14.2-math-fabs.patch
 )
 
 DOC_CONTENTS="Please make fontconfig configuration changes using

diff --git a/media-libs/fontconfig/fontconfig-2.15.0.ebuild 
b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
index 01f18ac3a8ab..87e30591256d

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2023-11-30 Thread Matt Turner 
commit: f225d76a1bd43a38280f7c524bfffd413f7c5a68
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec  1 00:02:32 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec  1 00:11:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f225d76a

media-libs/fontconfig: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/fontconfig/Manifest |   2 -
 .../files/fontconfig-2.14.0-docbook.patch  |  29 ---
 .../fontconfig-2.14.1-gperf-meson-debugging.patch  |  23 ---
 .../files/fontconfig-2.14.1-gperf-meson.patch  |  79 
 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild  | 224 -
 media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild  | 218 
 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 216 
 7 files changed, 791 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 1577f159cec8..330e1e1816f4 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1 @@
-DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
-DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 
4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73
 SHA512 
ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 
4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d
 SHA512 
23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
deleted file mode 100644
index b9d5e8e5b5e2..
--- a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/223
-
-From d4a8381169984246dbb14b7a810abd170d7d0afd Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sat, 2 Apr 2022 02:36:24 +0100
-Subject: [PATCH] configure.ac: allow disabling docbook
-
-Sometimes we might want to build docs (install man pages, etc)
-but allow disabling use of docbook.
-
-Bug: https://bugs.gentoo.org/310157
-Signed-off-by: Sam James 
 a/configure.ac
-+++ b/configure.ac
-@@ -736,7 +736,13 @@ dnl 
===
- # Let people not build/install docs if they don't have docbook
- #
- 
--AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+AC_ARG_ENABLE(docbook,
-+  [AS_HELP_STRING([--disable-docbook],
-+  [Disable building docs with docbook2html (default: no)])],,)
-+
-+if test x$enable_docbook != xno; then
-+  AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+fi
- 
- AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
- 

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
deleted file mode 100644
index fb5e8a14f8b8..
--- a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/240
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
-
-From c42eb5b503a44b0b062b041d2e8a0138ce21a0c7 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH 
-Date: Thu, 27 Oct 2022 12:32:07 +0900
-Subject: [PATCH] Fix the build issue on meson when -g option is added to
- c_args
-
-Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
 a/src/cutout.py
-+++ b/src/cutout.py
-@@ -24,7 +24,8 @@ if __name__== '__main__':
- break
- 
- cpp = args[1]
--ret = subprocess.run(cpp + host_cargs + [args[0].input], 
stdout=subprocess.PIPE, check=True)
-+cpp_args = [i for i in host_cargs + [args[0].input] if not 
i.startswith('-g')]
-+ret = subprocess.run(cpp + cpp_args, stdout=subprocess.PIPE, check=True)
- 
- stdout = ret.stdout.decode('utf8')
- 
-GitLab

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
deleted file mode 100644
index 5565012cad65..
--- a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a07e2f1e8ad049772cd24b7daa0a4a168f33bfba.patch
-
-From

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2022-10-26 Thread Sam James 
commit: bc7faf4170568a07dcb742e474f7c8a0a89eedf2
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 27 04:02:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 27 04:46:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7faf41

media-libs/fontconfig: add 2.14.1

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 .../fontconfig-2.14.1-gperf-meson-debugging.patch  |  23 +++
 .../files/fontconfig-2.14.1-gperf-meson.patch  |  79 
 media-libs/fontconfig/fontconfig-2.14.1.ebuild | 215 +
 4 files changed, 318 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 24cff4b4b53f..0ea3b7ff5d5e 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
+DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 
4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73
 SHA512 
ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
new file mode 100644
index ..fb5e8a14f8b8
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/240
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
+
+From c42eb5b503a44b0b062b041d2e8a0138ce21a0c7 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Thu, 27 Oct 2022 12:32:07 +0900
+Subject: [PATCH] Fix the build issue on meson when -g option is added to
+ c_args
+
+Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
+--- a/src/cutout.py
 b/src/cutout.py
+@@ -24,7 +24,8 @@ if __name__== '__main__':
+ break
+ 
+ cpp = args[1]
+-ret = subprocess.run(cpp + host_cargs + [args[0].input], 
stdout=subprocess.PIPE, check=True)
++cpp_args = [i for i in host_cargs + [args[0].input] if not 
i.startswith('-g')]
++ret = subprocess.run(cpp + cpp_args, stdout=subprocess.PIPE, check=True)
+ 
+ stdout = ret.stdout.decode('utf8')
+ 
+GitLab

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
new file mode 100644
index ..5565012cad65
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
@@ -0,0 +1,79 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a07e2f1e8ad049772cd24b7daa0a4a168f33bfba.patch
+
+From a07e2f1e8ad049772cd24b7daa0a4a168f33bfba Mon Sep 17 00:00:00 2001
+From: Christopher Degawa 
+Date: Tue, 25 Oct 2022 14:41:05 -0500
+Subject: [PATCH] meson: modify gperf test to remove sh dependency
+
+modifies the gperf test to instead rely on a file input
+rather than piping in using sh, as sh is often not reliable
+on Windows due to paths.
+
+Also changes the if else ladder into a foreach loop.
+
+Signed-off-by: Christopher Degawa 
+--- /dev/null
 b/meson-cc-tests/gperf.txt
+@@ -0,0 +1 @@
++foo,bar
+--- a/meson.build
 b/meson.build
+@@ -315,39 +315,33 @@ if fc_configdir.startswith(fc_baseconfigdir + '/')
+   fonts_conf.set('CONFIGDIR', fc_configdir.split(fc_baseconfigdir + '/')[1])
+ endif
+ 
+-# It will automatically fallback to subproject if not found on system
+-gperf = find_program('gperf')
++gperf = find_program('gperf', required: false)
++gperf_len_type = ''
+ 
+-sh = find_program('sh', required : false)
+-
+-if not sh.found() # host_machine.system() == 'windows' or not sh.found()
+-  # TODO: This is not always correct
+-  if cc.get_id() == 'msvc'
+-gperf_len_type = 'size_t'
+-  else
+-gperf_len_type = 'unsigned'
+-  endif
+-else
++if gperf.found()
+   gperf_test_format = '''
+   #include 
+   const char * in_word_set(const char *, @0@);
+   @1@
+   '''
+-  gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
+-  gperf_snippet = run_command(sh, '-c', 
gperf_snippet_format.format(gperf.full_path()),
+-check: true)
+-  gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2022-04-01 Thread Sam James 
commit: 7ad7b980f0cc6497bed201469ce0d5949260d558
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  1 23:20:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  2 03:07:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad7b980

media-libs/fontconfig: add 2.14.0

- Clean up ebuild
- Rebased patches (and submitted our docbook one upstream)
- Add json-c test-only dependency
- Scrub patches
- Drop global scope usage from 2.13.93 while at it (fixes previous cleanup)
- Rely on cache generation to create /var/cache/fontconfig

Closes: https://bugs.gentoo.org/587492
Closes: https://bugs.gentoo.org/710184
Closes: https://bugs.gentoo.org/785100
Fixes: 35ac56d0683de8ad8ab4316b109ef77a88a77300
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 .../files/fontconfig-2.10.2-docbook.patch  |   6 +-
 .../files/fontconfig-2.13.1-proper_homedir.patch   |  10 --
 .../files/fontconfig-2.13.1-static_build.patch |  10 --
 .../files/fontconfig-2.14.0-docbook.patch  |  29 +
 .../files/fontconfig-2.14.0-latin-update.patch |  66 ++
 .../fontconfig-2.14.0-skip-bubblewrap-tests.patch  |  14 ++
 media-libs/fontconfig/fontconfig-2.13.93.ebuild|   2 -
 ...fig-2.13.93.ebuild => fontconfig-2.14.0.ebuild} | 141 -
 9 files changed, 196 insertions(+), 83 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 21aef1e5b150..a42cf3ac9874 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
+DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc

diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch 
b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
index 33d6549c8147..94bea6327148 100644
--- a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
@@ -1,6 +1,6 @@
-diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac 
fontconfig-2.10.2/configure.ac
 fontconfig-2.10.2-orig/configure.ac2012-11-26 09:21:13.0 
+0100
-+++ fontconfig-2.10.2/configure.ac 2013-01-05 15:40:54.541682239 +0100
+https://bugs.gentoo.org/310157
+--- fontconfig-2.10.2-orig/configure.ac
 fontconfig-2.10.2/configure.ac
 @@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
  # Let people not build/install docs if they don't have docbook
  #

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
index 19aee94ba988..71c27f56f644 100644
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] Fix the issue that '~' wasn't extracted to the 
proper homedir
 this behavior was broken by d1f48f11. this change fixes it back to the correct 
behavior.
 
 https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
-diff --git a/src/fccfg.c b/src/fccfg.c
-index d7c48e8..4a53581 100644
 --- a/src/fccfg.c
 +++ b/src/fccfg.c
 @@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
@@ -40,8 +38,6 @@ index d7c48e8..4a53581 100644
  return file;
  }
  
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 79bcede..9f4d48a 100644
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
 @@ -91,6 +91,22 @@ test_bz106632_CFLAGS =  
\
@@ -67,9 +63,6 @@ index 79bcede..9f4d48a 100644
  EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) 
out.expected-long-family-names out.expected-no-long-family-names
  
  CLEANFILES=out out1 out2 fonts.conf out.expected
-diff --git a/test/test-issue110.c b/test/test-issue110.c
-new file mode 100644
-index 000..28a3bd2
 --- /dev/null
 +++ b/test/test-issue110.c
 @@ -0,0 +1,245 @@
@@ -318,6 +311,3 @@ index 000..28a3bd2
 +return retval;
 +}
 +
--- 
-2.18.0
-

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2021-01-13 Thread Lars Wendler 
commit: b0f701a775a9f787c59018f388772b3fc31b3da6
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 11:43:15 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 13:18:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f701a7

media-libs/fontconfig: Removed old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/fontconfig/Manifest |   2 -
 .../fontconfig-2.13.0-add-missing-lintl.patch  |  34 
 .../files/fontconfig-2.13.0-locale.patch   | 177 -
 .../fontconfig/files/fontconfig-2.13.0-names.patch |  93 ---
 media-libs/fontconfig/fontconfig-2.12.6.ebuild | 160 ---
 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild  | 169 
 6 files changed, 635 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 684dfc449fd..86eb4310757 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1 @@
-DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 
48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f
 SHA512 
2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B 
bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a
 SHA512 
f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
deleted file mode 100644
index 6bea02b1fca..000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH 
-Date: Fri, 9 Mar 2018 11:55:43 +0900
-Subject: Fix the build issue again on MinGW with enabling nls
-

- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1ff065b..2111ce0 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -82,7 +82,7 @@ AM_CPPFLAGS =
\
-   -DFC_CACHEDIR='"$(FC_CACHEDIR)"'\
-   -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'  \
-   -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
--LDADD  = $(INTLLIBS)
-+LDADD  = $(LIBINTL)
- 
- EXTRA_DIST += makealias
- 
-@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
- libfontconfig_la_LDFLAGS =\
-   -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
- 
--libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) 
$(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
-+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) 
$(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
- 
- libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
- 
--- 
-cgit v1.1
-

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
deleted file mode 100644
index 002e493a409..000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-https://bugs.gentoo.org/650332
-Do not set locale in the library.
-Patch from upstream.
-
 a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -41,6 +41,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #if defined (_WIN32)
- #define STRICT
-@@ -302,6 +303,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
- int   c;
- 
-+setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
- while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1)
- #else
 a/fc-cat/fc-cat.c
-+++ b/fc-cat/fc-cat.c
-@@ -40,6 +40,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef ENABLE_NLS
- #include 
-@@ -271,6 +272,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
- int   c;
- 
-+setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
- while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1)
- #else
 a/fc-conflist/fc-conflist.c
-+++ b/fc-conflist/fc-conflist.c
-@@ -38,6 +38,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef ENABLE_NLS
- #include 
-@@ -102,6 +103,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
- int   c;
- 
-+setlocale

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2021-01-13 Thread Lars Wendler 
commit: 11a04d7749c8f49b6bbc6683b00ec3be08e48dd9
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 12:43:28 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 13:18:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a04d77

media-libs/fontconfig: Bump to version 2.13.93

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 .../files/fontconfig-2.13.93-latin-update.patch|  62 +++
 media-libs/fontconfig/fontconfig-2.13.93.ebuild| 195 +
 3 files changed, 258 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 86eb4310757..21aef1e5b15 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1 +1,2 @@
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
+DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
new file mode 100644
index 000..910f0c7ef56
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
@@ -0,0 +1,62 @@
+--- fontconfig-2.13.93/conf.d/60-latin.conf
 fontconfig-2.13.93/conf.d/60-latin.conf
+@@ -5,44 +5,47 @@
+   
+   serif
+   
++  Liberation Serif
+   DejaVu Serif
+   Times New Roman
+-  Thorndale AMT
+   Luxi Serif
+   Nimbus Roman No9 L
+   Nimbus Roman
+   Times
++  Thorndale AMT
+   
+   
+   
+   sans-serif
+   
++  Liberation Sans
+   DejaVu Sans
+-  Verdana
+   Arial
+-  Albany AMT
+   Luxi Sans
+   Nimbus Sans L
+   Nimbus Sans
+   Helvetica
+   Lucida Sans Unicode
+   BPG Glaho International 
++  Verdana
+   Tahoma 
++  Albany AMT
+   
+   
+   
+   monospace
+   
++  Liberation Mono
+   DejaVu Sans Mono
+   Inconsolata
+   Andale Mono
+   Courier New
+-  Cumberland AMT
+   Luxi Mono
+   Nimbus Mono L
+   Nimbus Mono
+   Nimbus Mono PS
+   Courier
++  Cumberland AMT
+   
+   
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2018-09-19 Thread Lars Wendler 
commit: 2e23da62f35f8c716af5e6342ac9cdbb96898c14
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Sep 18 23:41:07 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Sep 19 08:06:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e23da62

media-libs/fontconfig: Revert part of upstream commit which causes sandbox 
violations for fonts cache.

Closes: https://bugs.gentoo.org/666418

 ...1-revert_delete_.uuid_for_empty_directory.patch | 43 ++
 13.1-r1.ebuild => fontconfig-2.13.1-r2.ebuild} |  1 +
 2 files changed, 44 insertions(+)

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
 
b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
new file mode 100644
index 000..cd66082eedd
--- /dev/null
+++ 
b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
@@ -0,0 +1,43 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
+
+Reversion of part of:
+https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf
+
+--- /src/fcdir.c
 /src/fcdir.c
+@@ -421,13 +421,6 @@
+ /* Not using existing cache file, construct new cache */
+ if (!cache)
+   cache = FcDirCacheScan (dir, config);
+-if (cache)
+-{
+-  FcFontSet *fs = FcCacheSet (cache);
+-
+-  if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
+-  FcDirCacheDeleteUUID (dir, config);
+-}
+ 
+ return cache;
+ }
+--- /test/run-test.sh
 /test/run-test.sh
+@@ -239,19 +239,4 @@
+ 
+ rm -rf $MyPWD/sysroot
+ 
+-dotest "deleting .uuid file on empty dir"
+-prep
+-cp $FONT1 $FONT2 $FONTDIR
+-$FCCACHE $FONTDIR
+-sleep 1
+-rm -f $FONTDIR/*pcf
+-$FCCACHE $FONTDIR
+-rmdir $FONTDIR > /dev/null 2>&1
+-if [ $? != 0 ]; then
+-  echo "*** Test failed: $TEST"
+-  echo "$FONTDIR isn't empty"
+-  ls -al $FONTDIR
+-  exit 1
+-fi
+-
+ rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
similarity index 98%
rename from media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
rename to media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index fdc25117f94..0ba7f651fab 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -36,6 +36,7 @@ PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
 PATCHES=(
"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make 
liberation default
+   "${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 
666418
 
# Patches from upstream (can usually be removed with next version bump)
"${FILESDIR}"/${P}-static_build.patch

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2018-04-20 Thread Lars Wendler 
commit: 4631d0e111044db76bac330da6206e84bf17e8e3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Apr 20 11:11:49 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Apr 20 11:11:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4631d0e1

media-libs/fontconfig: Removed old.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-libs/fontconfig/Manifest |   1 -
 .../files/fontconfig-2.12.2-gperf31.patch  |  61 
 media-libs/fontconfig/fontconfig-2.12.4.ebuild | 162 -
 media-libs/fontconfig/fontconfig-2.13.0.ebuild | 162 -
 4 files changed, 386 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 0ab2d6c2885..de6fde79604 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1,2 @@
-DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 
9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c
 SHA512 
f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 
48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f
 SHA512 
2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B 
bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a
 SHA512 
f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc

diff --git a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch 
b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
deleted file mode 100644
index ce90c450b36..000
--- a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9878b306f6c673d3d6cd9db487f67eb426cc03df Mon Sep 17 00:00:00 2001
-From: Akira TAGOH 
-Date: Thu, 23 Feb 2017 21:39:10 +0900
-Subject: Fix the build issue with gperf 3.1
-
-To support the one of changes in gperf 3.1:
-* The 'len' parameter of the hash function and of the lookup function is now
-  of type 'size_t' instead of 'unsigned int'. This makes it safe to call these
-  functions with strings of length > 4 GB, on 64-bit machines.
-
-diff --git a/configure.ac b/configure.ac
-index 4948816..8fbf3d3 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -193,6 +193,26 @@ fi
- AC_CHECK_MEMBERS([struct dirent.d_type],,,
-   [#include ])
- 
-+# Check the argument type of the gperf hash/lookup function
-+AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
-+fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+  #include 
-+
-+  const char *in_word_set(register const char *, register size_t);
-+  $fc_gperf_test
-+  ]])], [FC_GPERF_SIZE_T=size_t],
-+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+  #include 
-+
-+  const char *in_word_set(register const char *, register 
unsigned int);
-+  $fc_gperf_test
-+  ]])], [FC_GPERF_SIZE_T="unsigned int"],
-+  [AC_MSG_ERROR([Unable to determine the type of the len parameter of the 
gperf hash/lookup function])]
-+)])
-+AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len 
parameter of the gperf hash/lookup function])
-+AC_MSG_RESULT($FC_GPERF_SIZE_T)
-+
- #
- # Checks for iconv
- #
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 16ff31c..33bba8d 100644
 a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -25,10 +25,10 @@
- #include "fcint.h"
- 
- static unsigned int
--FcObjectTypeHash (register const char *str, register unsigned int len);
-+FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
- 
- static const struct FcObjectTypeInfo *
--FcObjectTypeLookup (register const char *str, register unsigned int len);
-+FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
- 
- #include "fcobjshash.h"
- 
--- 
-cgit v0.10.2
-

diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild 
b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
deleted file mode 100644
index 154f2350796..000
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/;
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2018-03-14 Thread Ulrich Müller 
commit: 34fb871502ff7941c54b6058727caf3ef563dc39
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Mar 14 12:31:50 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Mar 14 12:31:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fb8715

media-libs/fontconfig: Fix handling of locale and of font weights.

Non-maintainer commit. Patches from upstream.

Closes: https://bugs.gentoo.org/650332
Closes: https://bugs.gentoo.org/650370
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/fontconfig-2.13.0-locale.patch   |  37 +
 .../fontconfig/files/fontconfig-2.13.0-names.patch |  93 
 media-libs/fontconfig/fontconfig-2.13.0-r1.ebuild  | 164 +
 3 files changed, 294 insertions(+)

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
new file mode 100644
index 000..70868b1abc1
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/650332
+
+From 923b5be626a6e03fbaeee0b5cd6d0246c2f8f36f Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Wed, 14 Mar 2018 12:35:05 +0900
+Subject: [PATCH] Do not override locale if already set by app
+
+https://bugs.freedesktop.org/show_bug.cgi?id=105492
+---
+ src/fccfg.c | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/fccfg.c b/src/fccfg.c
+index eb0b76d..e311f17 100644
+--- a/src/fccfg.c
 b/src/fccfg.c
+@@ -45,11 +45,16 @@ retry_locale:
+ is_locale_initialized = (intptr_t) fc_atomic_ptr_get 
(_is_locale_initialized);
+ if (!is_locale_initialized)
+ {
++  char *loc;
++
+   is_locale_initialized = FcTrue;
+   if (!fc_atomic_ptr_cmpexch (_is_locale_initialized, NULL,
+   (void *)(intptr_t) is_locale_initialized))
+   goto retry_locale;
+-  setlocale (LC_ALL, "");
++
++  loc = setlocale (LC_ALL, NULL);
++  if (!loc || strcmp (loc, "C") == 0)
++  setlocale (LC_ALL, "");
+ }
+ retry_config:
+ config = fc_atomic_ptr_get (&_fcConfig);
+-- 
+2.16.2
+

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch
new file mode 100644
index 000..dddc8bb9572
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch
@@ -0,0 +1,93 @@
+https://bugs.gentoo.org/650370
+
+From 198358dd8ff858c9e36531a7406ccb2246ae77b7 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Mon, 12 Mar 2018 11:49:58 +0900
+Subject: [PATCH 1/2] Allow the constant names in the range
+
+https://bugs.freedesktop.org/show_bug.cgi?id=105415
+---
+ src/fcname.c | 34 +-
+ 1 file changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/src/fcname.c b/src/fcname.c
+index 79e413e..15fb659 100644
+--- a/src/fcname.c
 b/src/fcname.c
+@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string)
+ case FcTypeRange:
+   if (sscanf ((char *) string, "[%lg %lg]", , ) != 2)
+   {
+-  v.u.d = strtod ((char *) string, );
+-  if (p != NULL && p[0] != 0)
++  char *sc, *ec;
++  size_t len = strlen ((const char *) string);
++  int si, ei;
++
++  sc = malloc (len);
++  ec = malloc (len);
++  if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2)
+   {
+-  v.type = FcTypeVoid;
+-  break;
++  if (FcNameConstant ((const FcChar8 *) sc, ) &&
++  FcNameConstant ((const FcChar8 *) ec, ))
++  v.u.r =  FcRangeCreateDouble (si, ei);
++  else
++  goto bail1;
++  }
++  else
++  {
++  bail1:
++  v.type = FcTypeDouble;
++  if (FcNameConstant (string, ))
++  {
++  v.u.d = (double) si;
++  } else {
++  v.u.d = strtod ((char *) string, );
++  if (p != NULL && p[0] != 0)
++  v.type = FcTypeVoid;
++  }
+   }
+-  v.type = FcTypeDouble;
++  if (sc)
++  free (sc);
++  if (ec)
++  free (ec);
+   }
+   else
+   v.u.r = FcRangeCreateDouble (b, e);
+-- 
+2.16.2
+
+From 4699406a68321179b14fae7412f828e2f37a7033 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Wed, 14 Mar 2018 18:31:30 +0900
+Subject: [PATCH 2/2] Add the value of the constant name to the implicit object
+ in the pattern
+
+For objects which has been changed the object type to FcTypeRange.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=105415
+---
+ src/fcname.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/fcname.c b/src/fcname.c
+index 15fb659..c9320ae 100644
+--- a/src/fcname.c
 b/src/fcname.c

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2017-09-23 Thread Lars Wendler 
commit: 80ccaad7222c654940b7d8777cc9f78ea1aaac50
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep 23 22:50:59 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep 23 22:51:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ccaad7

media-libs/fontconfig: Removed old.

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 media-libs/fontconfig/Manifest |   1 -
 .../files/fontconfig-2.11.93-latin-update.patch|  67 -
 ...fix-ts18661-1-namespace-conflicts-w-glibc.patch |  59 
 media-libs/fontconfig/fontconfig-2.12.3-r1.ebuild  | 162 -
 4 files changed, 289 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 0eae100e8ca..8c6e3fe103a 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,4 +1,3 @@
 DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 
dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 
acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 WHIRLPOOL 
45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b
-DIST fontconfig-2.12.3.tar.bz2 1600509 SHA256 
bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd SHA512 
311a3c98a05afbe35c1215b41edb2bbcfe3069f85814c882ef0e40f0404cca4bb59a544b14eee9430ea902fd8bc3bfeccb37e42b9fe3bb3a6c71bb0c5332f2c7
 WHIRLPOOL 
7b3ec6f364d1b701ae1eb676b3f4cffef91af2d0b3f78719119449dfc6d679d1da20224e9148aa970d60c0d531ee5dfbb3c256ffc18edb142648fa06c0704c93
 DIST fontconfig-2.12.4.tar.bz2 1613580 SHA256 
668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c SHA512 
f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 WHIRLPOOL 
6f0b98e80bdbe5077047b42c7b998a7879e8cd1a7d53598ed6d1cc7110e7ba99b4d3cac6c14875744f7d43e05f338eec1588934e5511e3b1cd8d28d7292fcd72
 DIST fontconfig-2.12.6.tar.bz2 1624683 SHA256 
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 SHA512 
2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 WHIRLPOOL 
45741ad1389604325bdd517098edf8075a4302d35c680eb5b2280732c112c4c65521fa6b84c58647b4629a57b244f5e717d8a70afc14f3b72a8652c0670a63de

diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch 
b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch
deleted file mode 100644
index 033fe895bc1..000
--- a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch
+++ /dev/null
@@ -1,67 +0,0 @@
 fontconfig-2.11.93.orig/conf.d/60-latin.conf   2015-04-18 
20:06:06.070687989 +0800
-+++ fontconfig-2.11.93/conf.d/60-latin.conf2015-04-18 20:14:15.245732796 
+0800
-@@ -4,46 +4,49 @@
-   
-   serif
-   
--  Bitstream Vera Serif
-+  Liberation Serif
-   DejaVu Serif
-   Times New Roman
--  Thorndale AMT
-   Luxi Serif
-   Nimbus Roman No9 L
-   Nimbus Roman
-   Times
-+  Thorndale AMT
-+  Bitstream Vera Serif
-   
-   
-   
-   sans-serif
-   
--  Bitstream Vera Sans
-+  Liberation Sans
-   DejaVu Sans
--  Verdana
-   Arial
--  Albany AMT
-   Luxi Sans
-   Nimbus Sans L
-   Nimbus Sans
-   Helvetica
-   Lucida Sans Unicode
-   BPG Glaho International 
-+  Verdana
-   Tahoma 
-+  Albany AMT
-+  Bitstream Vera Sans
-   
-   
-   
-   monospace
-   
--  Bitstream Vera Sans Mono
-+  Liberation Mono
-   DejaVu Sans Mono
-   Inconsolata
-   Andale Mono
-   Courier New
--  Cumberland AMT
-   Luxi Mono
-   Nimbus Mono L
-   Nimbus Mono
-   Courier
-+  Cumberland AMT
-+  Bitstream Vera Sans Mono
-   
-   
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2017-06-02 Thread Lars Wendler 
commit: 9dba4210d815224e9179b3776061d77be738ad81
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jun  1 15:04:52 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun  2 20:30:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dba4210

media-libs/fontconfig: Bump to version 2.12.3

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/fontconfig/Manifest |   1 +
 .../files/fontconfig-2.12.2-gperf31.patch  |  61 
 .../files/fontconfig-2.12.3-latin-update.patch |  68 +
 media-libs/fontconfig/fontconfig-2.12.3.ebuild | 161 +
 4 files changed, 291 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index cc0fe6a3d07..fc77b7e3da0 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1,4 @@
 DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 
dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 
acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 WHIRLPOOL 
45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b
 DIST fontconfig-2.12.0.tar.bz2 1605355 SHA256 
b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224 SHA512 
b8f005d56aa9fe6a756be1cb4d843c69c746915c10fe968393527bd3469e4df0401a10edf5b0a69b0e2732cc07f71ad001c19a07726e5dfa881b9d94bb6935f9
 WHIRLPOOL 
e43670c00b21760fdfdb2e03d7d4a2e49b7300572de81ea8716160a1abf8e63aa7d05d95d53f5e24b8e148eeef88d375bd67edff956224571725b3bd77263ab4
 DIST fontconfig-2.12.1.tar.bz2 1608901 SHA256 
b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 SHA512 
a5ba2c1a52272b39aad20394dcc85c202159af0d3d2c1b34b24cbdbc8babb3157005a79d25c21a9bf6ec0459681b1ab05af102b2c0594f485c49e3b3b531067e
 WHIRLPOOL 
1900e3a48fdf65f762a7e9c138a3ffe716f6db96d808f8b10ebf99e7e20d8b32a042406f3ac43ca947b9710f97b31c5caae0609986b1e41ec8604050d2b37955
+DIST fontconfig-2.12.3.tar.bz2 1600509 SHA256 
bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd SHA512 
311a3c98a05afbe35c1215b41edb2bbcfe3069f85814c882ef0e40f0404cca4bb59a544b14eee9430ea902fd8bc3bfeccb37e42b9fe3bb3a6c71bb0c5332f2c7
 WHIRLPOOL 
7b3ec6f364d1b701ae1eb676b3f4cffef91af2d0b3f78719119449dfc6d679d1da20224e9148aa970d60c0d531ee5dfbb3c256ffc18edb142648fa06c0704c93

diff --git a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch 
b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
new file mode 100644
index 000..ce90c450b36
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
@@ -0,0 +1,61 @@
+From 9878b306f6c673d3d6cd9db487f67eb426cc03df Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Thu, 23 Feb 2017 21:39:10 +0900
+Subject: Fix the build issue with gperf 3.1
+
+To support the one of changes in gperf 3.1:
+* The 'len' parameter of the hash function and of the lookup function is now
+  of type 'size_t' instead of 'unsigned int'. This makes it safe to call these
+  functions with strings of length > 4 GB, on 64-bit machines.
+
+diff --git a/configure.ac b/configure.ac
+index 4948816..8fbf3d3 100644
+--- a/configure.ac
 b/configure.ac
+@@ -193,6 +193,26 @@ fi
+ AC_CHECK_MEMBERS([struct dirent.d_type],,,
+   [#include ])
+ 
++# Check the argument type of the gperf hash/lookup function
++AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
++fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++  #include 
++
++  const char *in_word_set(register const char *, register size_t);
++  $fc_gperf_test
++  ]])], [FC_GPERF_SIZE_T=size_t],
++  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++  #include 
++
++  const char *in_word_set(register const char *, register 
unsigned int);
++  $fc_gperf_test
++  ]])], [FC_GPERF_SIZE_T="unsigned int"],
++  [AC_MSG_ERROR([Unable to determine the type of the len parameter of the 
gperf hash/lookup function])]
++)])
++AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len 
parameter of the gperf hash/lookup function])
++AC_MSG_RESULT($FC_GPERF_SIZE_T)
++
+ #
+ # Checks for iconv
+ #
+diff --git a/src/fcobjs.c b/src/fcobjs.c
+index 16ff31c..33bba8d 100644
+--- a/src/fcobjs.c
 b/src/fcobjs.c
+@@ -25,10 +25,10 @@
+ #include "fcint.h"
+ 
+ static unsigned int
+-FcObjectTypeHash (register const char *str, register unsigned int len);
++FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
+ 
+ static const struct FcObjectTypeInfo *
+-FcObjectTypeLookup (register const char *str, register unsigned int len);
++FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
+ 
+ #include "fcobjshash.h"
+ 
+-- 
+cgit v0.10.2
+

diff --git

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2016-04-10 Thread Lars Wendler 
commit: 3a9da408519e59323183186634d6a525856f24cb
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Apr 10 17:25:39 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Apr 10 17:27:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9da408

media-libs/fontconfig: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/fontconfig/Manifest |   1 -
 .../files/fontconfig-2.10.92-automake-1.13.patch   | 152 --
 .../files/fontconfig-2.10.92-closing-fp.patch  |  21 ---
 .../files/fontconfig-2.10.92-fix-check.patch   | 143 -
 .../files/fontconfig-2.10.92-fix-woff.patch| 157 --
 .../files/fontconfig-2.10.92-ft-face.patch | 144 -
 .../files/fontconfig-2.10.92-ft-face2.patch| 177 -
 .../files/fontconfig-2.10.92-native-fonts.patch|  73 -
 .../files/fontconfig-2.10.92-use-glob.patch| 164 ---
 .../fontconfig-2.11.0-baseconfigdir_fix.patch  |  21 ---
 .../files/fontconfig-2.11.0-solaris.patch  |  57 ---
 .../files/fontconfig-2.11.0-solaris10.patch|  63 
 .../files/fontconfig-2.11.93-addfile.patch | 109 -
 .../files/fontconfig-2.11.93-fix-sigfpe.patch  |  22 ---
 .../files/fontconfig-2.11.93-rmdead.patch  |  22 ---
 .../files/fontconfig-2.3.2-docbook.patch   |  15 --
 .../files/fontconfig-2.8.0-urw-aliases.patch   |  18 ---
 media-libs/fontconfig/fontconfig-2.11.93.ebuild| 155 --
 18 files changed, 1514 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 9b7534a..29261b1 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,4 +1,3 @@
 DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 
dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 
acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 WHIRLPOOL 
45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b
-DIST fontconfig-2.11.93.tar.bz2 1565609 SHA256 
381e7c14c7a8bc268a9c07589837f0ea24139abc15f46171b7f94751c969a0af SHA512 
68e1728884e4c1bc236cd164fe0b8912c194e8b69bcbffdb3bc8a718737e640061d01a543d90d4198fb2a2d2df0d36b40fac40a27d9845579e1893428d3a22bd
 WHIRLPOOL 
b596c1e015e48945158d9d8ffe5e1bf91e6912ac9187fefa829960897fba5c9810ff73ec5ea255b6ca490adb768bd20a50ca0eda41763824cd59b180071600f2
 DIST fontconfig-2.11.94.tar.bz2 1567540 SHA256 
d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df SHA512 
ab0639afbe37c46197aa31178f928a000e0662edf794bcd421e396bae2298edc23851ff58deeb448cc14ac1206683494817a64a75ab9f7bb9bce6321ccf5c1f2
 WHIRLPOOL 
cb4df2eafa2748ad51efde09225ccb5ec5e1154c0b2b1074aa6151c289d8f44dd14ed641ef092db5f8f2b986afed8d64167f6d2da9bd7afb3f2dab725a0434d4
 DIST fontconfig-2.11.95.tar.bz2 1591200 SHA256 
7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89 SHA512 
e3d7696814b585512bbe191ae4e5a4fe5a645895b4b1f5783dc575efe3f0a2b725daa48eb9c43168d2cd2fc752bf114be41c58a4ae81f2db49f431984e134b54
 WHIRLPOOL 
5c3b084dc2dcd8b0b7c6bf9b71903973a58a31110c5cb7a6ed90822a520dca9e997a2e6a4283ffadbb6fe1d8f1005148f6eeb022b86a2a47bac807a25677

diff --git a/media-libs/fontconfig/files/fontconfig-2.10.92-automake-1.13.patch 
b/media-libs/fontconfig/files/fontconfig-2.10.92-automake-1.13.patch
deleted file mode 100644
index 02b89fa..000
--- a/media-libs/fontconfig/files/fontconfig-2.10.92-automake-1.13.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001
-From: Sebastian Freundt 
-Date: Sun, 07 Apr 2013 00:02:58 +
-Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS
-
-As of automake-13.1 the INCLUDES directive is no longer supported.
-An automake run will return with an error.
-
-This changeset simply follows automake's advice to replace INCLUDES
-by AM_CPPFLAGS.

-diff --git a/Tools.mk b/Tools.mk
-index 56766da..f0fa0ec 100644
 a/Tools.mk
-+++ b/Tools.mk
-@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD)
- 
- EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST)
- 
--INCLUDES = \
-+AM_CPPFLAGS = \
-  -I$(builddir) \
-  -I$(srcdir) \
-  -I$(top_builddir)/src \
-@@ -43,7 +43,7 @@ INCLUDES = \
-  $(WARN_CFLAGS)
- 
- $(TOOL): $(TSRC) $(ALIAS_FILES)
--  $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES)
-+  $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
- 
- $(TARG): $(TMPL) $(TSRC) $(DEPS)
-   $(AM_V_GEN) $(MAKE) $(TOOL) && \
-diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
-index 7f7d1b1..0e10786 100644
 a/fc-cache/Makefile.am
-+++ b/fc-cache/Makefile.am
-@@ -36,7 +36,7 @@ uninstall-local:
-