Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/files/
Date: Sun, 30 Oct 2022 09:28:32
Message-Id: 1667122005.bd054ea5d06a3e84dd37805f21745f1e48d332ae.sam@gentoo
1 commit: bd054ea5d06a3e84dd37805f21745f1e48d332ae
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Oct 30 07:53:20 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 09:26:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd054ea5
7
8 media-libs/fontconfig: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/28033
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 .../files/fontconfig-2.10.2-docbook.patch | 16 ------
15 .../files/fontconfig-2.13.93-latin-update.patch | 62 ----------------------
16 2 files changed, 78 deletions(-)
17
18 diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
19 deleted file mode 100644
20 index 94bea6327148..000000000000
21 --- a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
22 +++ /dev/null
23 @@ -1,16 +0,0 @@
24 -https://bugs.gentoo.org/310157
25 ---- fontconfig-2.10.2-orig/configure.ac
26 -+++ fontconfig-2.10.2/configure.ac
27 -@@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
28 - # Let people not build/install docs if they don't have docbook
29 - #
30 -
31 --AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
32 -+AC_ARG_ENABLE(docbook, [ --disable-docbook Don't build documentation],,)
33 -+
34 -+if test x$enable_docbook != xno; then
35 -+ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
36 -+fi
37 -
38 - AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
39 -
40
41 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
42 deleted file mode 100644
43 index 910f0c7ef565..000000000000
44 --- a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
45 +++ /dev/null
46 @@ -1,62 +0,0 @@
47 ---- fontconfig-2.13.93/conf.d/60-latin.conf
48 -+++ fontconfig-2.13.93/conf.d/60-latin.conf
49 -@@ -5,44 +5,47 @@
50 - <alias>
51 - <family>serif</family>
52 - <prefer>
53 -+ <family>Liberation Serif</family>
54 - <family>DejaVu Serif</family>
55 - <family>Times New Roman</family>
56 -- <family>Thorndale AMT</family>
57 - <family>Luxi Serif</family>
58 - <family>Nimbus Roman No9 L</family>
59 - <family>Nimbus Roman</family>
60 - <family>Times</family>
61 -+ <family>Thorndale AMT</family>
62 - </prefer>
63 - </alias>
64 - <alias>
65 - <family>sans-serif</family>
66 - <prefer>
67 -+ <family>Liberation Sans</family>
68 - <family>DejaVu Sans</family>
69 -- <family>Verdana</family>
70 - <family>Arial</family>
71 -- <family>Albany AMT</family>
72 - <family>Luxi Sans</family>
73 - <family>Nimbus Sans L</family>
74 - <family>Nimbus Sans</family>
75 - <family>Helvetica</family>
76 - <family>Lucida Sans Unicode</family>
77 - <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
78 -+ <family>Verdana</family>
79 - <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
80 -+ <family>Albany AMT</family>
81 - </prefer>
82 - </alias>
83 - <alias>
84 - <family>monospace</family>
85 - <prefer>
86 -+ <family>Liberation Mono</family>
87 - <family>DejaVu Sans Mono</family>
88 - <family>Inconsolata</family>
89 - <family>Andale Mono</family>
90 - <family>Courier New</family>
91 -- <family>Cumberland AMT</family>
92 - <family>Luxi Mono</family>
93 - <family>Nimbus Mono L</family>
94 - <family>Nimbus Mono</family>
95 - <family>Nimbus Mono PS</family>
96 - <family>Courier</family>
97 -+ <family>Cumberland AMT</family>
98 - </prefer>
99 - </alias>
100 - <!--
101 -@@ -63,6 +66,7 @@
102 - <alias>
103 - <family>cursive</family>
104 - <prefer>
105 -+ <family>Comic Neue</family>
106 - <family>ITC Zapf Chancery Std</family>
107 - <family>Zapfino</family>
108 - <family>Comic Sans MS</family>