[arch-commits] Commit in ttf-dejavu/trunk (2 files)

[Jan de Groot]

    Date: Friday, February 16, 2018 @ 23:05:51
  Author: jgc
Revision: 317179

upgpkg: ttf-dejavu 2.37-2

Fix homepage url (FS#57231)
Apply upstream patch for FS#57169

Added:
  ttf-dejavu/trunk/remove-generic-name-assignment-and-aliasing.patch
Modified:
  ttf-dejavu/trunk/PKGBUILD

---------------------------------------------------+
 PKGBUILD                                          |   18 ++-
 remove-generic-name-assignment-and-aliasing.patch |  102 ++++++++++++++++++++
 2 files changed, 114 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-16 22:54:41 UTC (rev 317178)
+++ PKGBUILD	2018-02-16 23:05:51 UTC (rev 317179)
@@ -1,20 +1,26 @@
 # $Id$
-# Maintainer:
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Michal Krenek <mikos at sg1.cz>
 
 pkgname=ttf-dejavu
 pkgver=2.37
-pkgrel=1
+pkgrel=2
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 arch=('any')
-url="http://dejavu-fonts.org/wiki/Main_Page"
+url="https://dejavu-fonts.github.io/"
 license=('custom')
 depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir')
 provides=('ttf-font')
-source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2)
-sha256sums=('fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7')
+source=(https://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2
+        remove-generic-name-assignment-and-aliasing.patch)
+sha256sums=('fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7'
+            '21d85a4f6ea7856074a4eb5c5fce6a10e764d11ff4336e92c4f009815efebb0c')
 
+prepare() {
+  cd dejavu-fonts-ttf-$pkgver
+  patch -Np1 -i ../remove-generic-name-assignment-and-aliasing.patch
+}
+
 package() {
   install -dm755 "${pkgdir}"/etc/fonts/conf.avail
   install -dm755 "${pkgdir}"/etc/fonts/conf.d

Added: remove-generic-name-assignment-and-aliasing.patch
===================================================================
--- remove-generic-name-assignment-and-aliasing.patch	                        (rev 0)
+++ remove-generic-name-assignment-and-aliasing.patch	2018-02-16 23:05:51 UTC (rev 317179)
@@ -0,0 +1,102 @@
+From d9ee532b4f0a879372bdb006ac85d7807629ea98 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian at greffrath.com>
+Date: Mon, 15 May 2017 21:08:12 +0200
+Subject: [PATCH] fontconfig: remove generic name assignment and aliasing
+
+This removes the generic name assignment and the generic name aliasing
+rules for the three standard DejaVu Sans, Sans-Mono and Serif fonts.
+
+These rules are redundant as they are already in the fontconfig
+upstream config files 45-latin.conf and 60-latin.conf, respectively,
+for at least 10 years now, c.f.:
+
+https://cgit.freedesktop.org/fontconfig/commit/conf.d/45-latin.conf?id=4b51f173c99152586db26b03752873a4b4020672
+https://cgit.freedesktop.org/fontconfig/commit/conf.d/60-latin.conf?id=6c5619a08575943f75d2341e1a4931ec5faf716b
+
+We have a bug report in Debian from a user who complains that he
+changed the preference for the default sans-serif font in the expected
+rule, i.e. 60-latin.conf, and was confused when his change was
+overridden by fonts-dejavu's own rule in 57-dejavu-sans.conf:
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753401
+
+The reporter confirms that removing the offending lines from the
+config files in the fonts-dejavu package causes the intended changes
+applied to the 60-latin.conf file to take effect.
+
+Thanks for considering!
+---
+ fontconfig/57-dejavu-sans-mono.conf | 14 --------------
+ fontconfig/57-dejavu-sans.conf      | 14 --------------
+ fontconfig/57-dejavu-serif.conf     | 14 --------------
+ 3 files changed, 42 deletions(-)
+
+diff --git a/fontconfig/57-dejavu-sans-mono.conf b/fontconfig/57-dejavu-sans-mono.conf
+index cc42561e..2c75b5cf 100644
+--- a/fontconfig/57-dejavu-sans-mono.conf
++++ b/fontconfig/57-dejavu-sans-mono.conf
+@@ -45,18 +45,4 @@
+       <family>DejaVu Sans Mono</family>
+     </accept>
+   </alias>
+-  <!-- Generic name assignment -->
+-  <alias>
+-    <family>DejaVu Sans Mono</family>
+-    <default>
+-      <family>monospace</family>
+-    </default>
+-  </alias>
+-  <!-- Generic name aliasing -->
+-  <alias>
+-    <family>monospace</family>
+-    <prefer>
+-      <family>DejaVu Sans Mono</family>
+-    </prefer>
+-  </alias>
+ </fontconfig>
+diff --git a/fontconfig/57-dejavu-sans.conf b/fontconfig/57-dejavu-sans.conf
+index 565cab5f..cff7a842 100644
+--- a/fontconfig/57-dejavu-sans.conf
++++ b/fontconfig/57-dejavu-sans.conf
+@@ -70,18 +70,4 @@
+       <family>DejaVu Sans</family>
+     </accept>
+   </alias>
+-  <!-- Generic name assignment -->
+-  <alias>
+-    <family>DejaVu Sans</family>
+-    <default>
+-      <family>sans-serif</family>
+-    </default>
+-  </alias>
+-  <!-- Generic name aliasing -->
+-  <alias>
+-    <family>sans-serif</family>
+-    <prefer>
+-      <family>DejaVu Sans</family>
+-    </prefer>
+-  </alias>
+ </fontconfig>
+diff --git a/fontconfig/57-dejavu-serif.conf b/fontconfig/57-dejavu-serif.conf
+index a922e9b2..10ae70fd 100644
+--- a/fontconfig/57-dejavu-serif.conf
++++ b/fontconfig/57-dejavu-serif.conf
+@@ -52,18 +52,4 @@
+       <family>DejaVu Serif</family>
+     </accept>
+   </alias>
+-  <!-- Generic name assignment -->
+-  <alias>
+-    <family>DejaVu Serif</family>
+-    <default>
+-      <family>serif</family>
+-    </default>
+-  </alias>
+-  <!-- Generic name aliasing -->
+-  <alias>
+-    <family>serif</family>
+-    <prefer>
+-      <family>DejaVu Serif</family>
+-    </prefer>
+-  </alias>
+ </fontconfig>