From 7ad7b980f0cc6497bed201469ce0d5949260d558 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 2 Apr 2022 00:20:01 +0100 Subject: 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 --- 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 - media-libs/fontconfig/fontconfig-2.14.0.ebuild | 222 +++++++++++++++++++++ 9 files changed, 335 insertions(+), 25 deletions(-) create mode 100644 media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch create mode 100644 media-libs/fontconfig/files/fontconfig-2.14.0-latin-update.patch create mode 100644 media-libs/fontconfig/files/fontconfig-2.14.0-skip-bubblewrap-tests.patch create mode 100644 media-libs/fontconfig/fontconfig-2.14.0.ebuild (limited to 'media-libs/fontconfig') 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.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 +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.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 @@ + + serif + ++ Liberation Serif + Noto Serif + DejaVu Serif + Times New Roman +- Thorndale AMT + Luxi Serif + Nimbus Roman No9 L + Nimbus Roman + Times ++ Thorndale AMT + + + + sans-serif + ++ Liberation Sans + Noto 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 + Noto Sans Mono + DejaVu Sans Mono + Inconsolata + Andale Mono + Courier New +- Cumberland AMT + Luxi Mono + Nimbus Mono L + Nimbus Mono + Nimbus Mono PS + Courier ++ Cumberland AMT + + +