remove-generic-name-assignment-and-aliasing.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103
  1. From d9ee532b4f0a879372bdb006ac85d7807629ea98 Mon Sep 17 00:00:00 2001
  2. From: Fabian Greffrath <fabian@greffrath.com>
  3. Date: Mon, 15 May 2017 21:08:12 +0200
  4. Subject: [PATCH] fontconfig: remove generic name assignment and aliasing
  5. This removes the generic name assignment and the generic name aliasing
  6. rules for the three standard DejaVu Sans, Sans-Mono and Serif fonts.
  7. These rules are redundant as they are already in the fontconfig
  8. upstream config files 45-latin.conf and 60-latin.conf, respectively,
  9. for at least 10 years now, c.f.:
  10. https://cgit.freedesktop.org/fontconfig/commit/conf.d/45-latin.conf?id=4b51f173c99152586db26b03752873a4b4020672
  11. https://cgit.freedesktop.org/fontconfig/commit/conf.d/60-latin.conf?id=6c5619a08575943f75d2341e1a4931ec5faf716b
  12. We have a bug report in Debian from a user who complains that he
  13. changed the preference for the default sans-serif font in the expected
  14. rule, i.e. 60-latin.conf, and was confused when his change was
  15. overridden by fonts-dejavu's own rule in 57-dejavu-sans.conf:
  16. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753401
  17. The reporter confirms that removing the offending lines from the
  18. config files in the fonts-dejavu package causes the intended changes
  19. applied to the 60-latin.conf file to take effect.
  20. Thanks for considering!
  21. ---
  22. fontconfig/57-dejavu-sans-mono.conf | 14 --------------
  23. fontconfig/57-dejavu-sans.conf | 14 --------------
  24. fontconfig/57-dejavu-serif.conf | 14 --------------
  25. 3 files changed, 42 deletions(-)
  26. diff --git a/fontconfig/57-dejavu-sans-mono.conf b/fontconfig/57-dejavu-sans-mono.conf
  27. index cc42561e..2c75b5cf 100644
  28. --- a/fontconfig/57-dejavu-sans-mono.conf
  29. +++ b/fontconfig/57-dejavu-sans-mono.conf
  30. @@ -45,18 +45,4 @@
  31. <family>DejaVu Sans Mono</family>
  32. </accept>
  33. </alias>
  34. - <!-- Generic name assignment -->
  35. - <alias>
  36. - <family>DejaVu Sans Mono</family>
  37. - <default>
  38. - <family>monospace</family>
  39. - </default>
  40. - </alias>
  41. - <!-- Generic name aliasing -->
  42. - <alias>
  43. - <family>monospace</family>
  44. - <prefer>
  45. - <family>DejaVu Sans Mono</family>
  46. - </prefer>
  47. - </alias>
  48. </fontconfig>
  49. diff --git a/fontconfig/57-dejavu-sans.conf b/fontconfig/57-dejavu-sans.conf
  50. index 565cab5f..cff7a842 100644
  51. --- a/fontconfig/57-dejavu-sans.conf
  52. +++ b/fontconfig/57-dejavu-sans.conf
  53. @@ -70,18 +70,4 @@
  54. <family>DejaVu Sans</family>
  55. </accept>
  56. </alias>
  57. - <!-- Generic name assignment -->
  58. - <alias>
  59. - <family>DejaVu Sans</family>
  60. - <default>
  61. - <family>sans-serif</family>
  62. - </default>
  63. - </alias>
  64. - <!-- Generic name aliasing -->
  65. - <alias>
  66. - <family>sans-serif</family>
  67. - <prefer>
  68. - <family>DejaVu Sans</family>
  69. - </prefer>
  70. - </alias>
  71. </fontconfig>
  72. diff --git a/fontconfig/57-dejavu-serif.conf b/fontconfig/57-dejavu-serif.conf
  73. index a922e9b2..10ae70fd 100644
  74. --- a/fontconfig/57-dejavu-serif.conf
  75. +++ b/fontconfig/57-dejavu-serif.conf
  76. @@ -52,18 +52,4 @@
  77. <family>DejaVu Serif</family>
  78. </accept>
  79. </alias>
  80. - <!-- Generic name assignment -->
  81. - <alias>
  82. - <family>DejaVu Serif</family>
  83. - <default>
  84. - <family>serif</family>
  85. - </default>
  86. - </alias>
  87. - <!-- Generic name aliasing -->
  88. - <alias>
  89. - <family>serif</family>
  90. - <prefer>
  91. - <family>DejaVu Serif</family>
  92. - </prefer>
  93. - </alias>
  94. </fontconfig>