diff options
author | Sam James <sam@gentoo.org> | 2022-04-02 00:20:01 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-04-02 04:07:31 +0100 |
commit | 7ad7b980f0cc6497bed201469ce0d5949260d558 (patch) | |
tree | 0add098b62429fdb918d9322dbfdc738c0a1192e /media-libs/fontconfig/files | |
parent | x11-misc/dunst: drop 1.7.3-r1 (diff) | |
download | gentoo-7ad7b980f0cc6497bed201469ce0d5949260d558.tar.gz gentoo-7ad7b980f0cc6497bed201469ce0d5949260d558.tar.bz2 gentoo-7ad7b980f0cc6497bed201469ce0d5949260d558.zip |
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 <sam@gentoo.org>
Diffstat (limited to 'media-libs/fontconfig/files')
6 files changed, 112 insertions, 23 deletions
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.ac 2012-11-26 09:21:13.000000000 +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 0000000..28a3bd2 --- /dev/null +++ b/test/test-issue110.c @@ -0,0 +1,245 @@ @@ -318,6 +311,3 @@ index 0000000..28a3bd2 + return retval; +} + --- -2.18.0 - diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch index 7a0edfd849ab..d78317da0b3c 100644 --- a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch +++ b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch @@ -4,9 +4,6 @@ Date: Mon, 3 Sep 2018 04:56:16 +0000 Subject: [PATCH] Fix the build issue with --enable-static Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109 ---- -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h -index bac1dda..af870d0 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8 *string, @@ -20,8 +17,6 @@ index bac1dda..af870d0 100644 FcPublic FcChar8 * FcStrDirname (const FcChar8 *file); -diff --git a/src/fcint.h b/src/fcint.h -index de78cd8..a9d075a 100644 --- a/src/fcint.h +++ b/src/fcint.h @@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s); @@ -35,8 +30,6 @@ index de78cd8..a9d075a 100644 FcPrivate FcChar8 * FcStrLastSlash (const FcChar8 *path); -diff --git a/test/test-bz106632.c b/test/test-bz106632.c -index daa0c1e..2d67c2e 100644 --- a/test/test-bz106632.c +++ b/test/test-bz106632.c @@ -25,25 +25,26 @@ @@ -96,6 +89,3 @@ index daa0c1e..2d67c2e 100644 int main (void) { --- -2.18.0 - diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch new file mode 100644 index 000000000000..b9d5e8e5b5e2 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch @@ -0,0 +1,29 @@ +https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/223 + +From d4a8381169984246dbb14b7a810abd170d7d0afd Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +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 <sam@gentoo.org> +--- 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.0-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch new file mode 100644 index 000000000000..2ae36f4ae4d6 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch @@ -0,0 +1,66 @@ +https://bugs.gentoo.org/130466 +--- a/conf.d/60-latin.conf ++++ b/conf.d/60-latin.conf +@@ -5,47 +5,50 @@ + <alias> + <family>serif</family> + <prefer> ++ <family>Liberation Serif</family> + <family>Noto Serif</family> + <family>DejaVu Serif</family> + <family>Times New Roman</family> +- <family>Thorndale AMT</family> + <family>Luxi Serif</family> + <family>Nimbus Roman No9 L</family> + <family>Nimbus Roman</family> + <family>Times</family> ++ <family>Thorndale AMT</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> ++ <family>Liberation Sans</family> + <family>Noto Sans</family> + <family>DejaVu Sans</family> +- <family>Verdana</family> + <family>Arial</family> +- <family>Albany AMT</family> + <family>Luxi Sans</family> + <family>Nimbus Sans L</family> + <family>Nimbus Sans</family> + <family>Helvetica</family> + <family>Lucida Sans Unicode</family> + <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> ++ <family>Verdana</family> + <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai --> ++ <family>Albany AMT</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> ++ <family>Liberation Mono</family> + <family>Noto Sans Mono</family> + <family>DejaVu Sans Mono</family> + <family>Inconsolata</family> + <family>Andale Mono</family> + <family>Courier New</family> +- <family>Cumberland AMT</family> + <family>Luxi Mono</family> + <family>Nimbus Mono L</family> + <family>Nimbus Mono</family> + <family>Nimbus Mono PS</family> + <family>Courier</family> ++ <family>Cumberland AMT</family> + </prefer> + </alias> + <!-- +@@ -66,6 +69,7 @@ + <alias> + <family>cursive</family> + <prefer> ++ <family>Comic Neue</family> + <family>ITC Zapf Chancery Std</family> + <family>Zapfino</family> + <family>Comic Sans MS</family> diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch b/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch new file mode 100644 index 000000000000..7d0041ad9765 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch @@ -0,0 +1,14 @@ +https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/320 +--- a/test/run-test.sh ++++ b/test/run-test.sh +@@ -40,9 +40,7 @@ EXPECTED=${EXPECTED-"out.expected"} + FCLIST="$LOG_COMPILER ../fc-list/fc-list$EXEEXT" + FCCACHE="$LOG_COMPILER ../fc-cache/fc-cache$EXEEXT" + +-if [ -x "$(command -v bwrap)" ]; then +- BWRAP="$(command -v bwrap)" +-fi ++BWRAP="" + + FONT1=$TESTDIR/4x6.pcf + FONT2=$TESTDIR/8x16.pcf |