Date: Monday, March 27, 2023 @ 09:25:39
  Author: mtorromeo
Revision: 1429829

upgpkg: ttf-ubuntu-font-family 1:0.83-1: downgrade to stable version

Added:
  ttf-ubuntu-font-family/trunk/81-ubuntu.conf
Modified:
  ttf-ubuntu-font-family/trunk/PKGBUILD

----------------+
 81-ubuntu.conf |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD       |   36 +++++++++---------------------
 2 files changed, 77 insertions(+), 25 deletions(-)

Added: 81-ubuntu.conf
===================================================================
--- 81-ubuntu.conf                              (rev 0)
+++ 81-ubuntu.conf      2023-03-27 09:25:39 UTC (rev 1429829)
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- Fixes for Ubuntu family:
+     - Medium variant is used instead of Regular on Qt apps:
+       https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+     - Medium and Bold looks the same in certain applications:
+       https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+-->
+
+<match target="scan">
+       <test name="fullname" compare="eq">
+               <string>Ubuntu Light</string>
+       </test>
+       <edit name="family" mode="assign">
+               <string>Ubuntu</string>
+       </edit>
+       <edit name="style" mode="assign">
+               <string>Light</string>
+       </edit>
+</match>
+
+<match target="scan">
+       <test name="fullname" compare="eq">
+               <string>Ubuntu Light Italic</string>
+       </test>
+       <edit name="family" mode="assign">
+               <string>Ubuntu</string>
+       </edit>
+       <edit name="style" mode="assign">
+               <string>Light Italic</string>
+       </edit>
+</match>
+
+<match target="scan">
+       <test name="fullname" compare="eq">
+               <string>Ubuntu Medium</string>
+       </test>
+       <edit name="family" mode="assign">
+               <string>Ubuntu</string>
+       </edit>
+       <edit name="style" mode="assign">
+               <string>Medium</string>
+       </edit>
+       <edit name="weight" mode="assign">
+               <const>demibold</const>
+       </edit>
+</match>
+
+<match target="scan">
+       <test name="fullname" compare="eq">
+               <string>Ubuntu Medium Italic</string>
+       </test>
+       <edit name="family" mode="assign">
+               <string>Ubuntu</string>
+       </edit>
+       <edit name="style" mode="assign">
+               <string>Medium Italic</string>
+       </edit>
+       <edit name="weight" mode="assign">
+               <const>demibold</const>
+       </edit>
+</match>
+
+</fontconfig>

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-27 09:09:22 UTC (rev 1429828)
+++ PKGBUILD    2023-03-27 09:25:39 UTC (rev 1429829)
@@ -1,37 +1,23 @@
 # Maintainer: Massimiliano Torromeo <[email protected]>
 
 pkgname=ttf-ubuntu-font-family
-pkgver=0.863
+epoch=1
+pkgver=0.83
 pkgrel=1
 pkgdesc="Ubuntu font family"
 arch=('any')
 url="https://design.ubuntu.com/font/";
 license=('custom:Ubuntu Font Licence 1.0')
-source=(https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/fonts-ubuntu/$pkgver-0ubuntu1/fonts-ubuntu_$pkgver.orig.tar.gz)
-sha256sums=('dbea8a5a0849673098a5ce33c49d9a7edcaf7787f58d110fad71b3eb75dc21f6')
+source=(https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-$pkgver.zip
+        81-ubuntu.conf)
+sha256sums=('456d7d42797febd0d7d4cf1b782a2e03680bb4a5ee43cc9d06bda172bac05b42'
+            '16e29b1b8d13edddb588e4470f6da4c15870a9a27dd25eb4553c2c575d6dc14e')
 
 package() {
-       cd fonts-ubuntu-$pkgver
-       install -Dm644 -t "$pkgdir"/usr/share/fonts/TTF *.ttf
+       cd ubuntu-font-family-$pkgver
+       install -dm755 "$pkgdir"/usr/share/fontconfig/conf.default
+       install -Dm644 -t "$pkgdir"/usr/share/fonts/ubuntu *.ttf
        install -Dm644 LICENCE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENCE
-
-       cd "$pkgdir"/usr/share/fonts/TTF
-
-       ln -s "Ubuntu[wdth,wght].ttf" Ubuntu-B.ttf
-       ln -s "Ubuntu[wdth,wght].ttf" Ubuntu-C.ttf
-       ln -s "Ubuntu[wdth,wght].ttf" Ubuntu-L.ttf
-       ln -s "Ubuntu[wdth,wght].ttf" Ubuntu-M.ttf
-       ln -s "Ubuntu[wdth,wght].ttf" Ubuntu-R.ttf
-       ln -s "Ubuntu[wdth,wght].ttf" Ubuntu-Th.ttf
-
-       ln -s "Ubuntu-Italic[wdth,wght].ttf" Ubuntu-BI.ttf
-       ln -s "Ubuntu-Italic[wdth,wght].ttf" Ubuntu-LI.ttf
-       ln -s "Ubuntu-Italic[wdth,wght].ttf" Ubuntu-MI.ttf
-       ln -s "Ubuntu-Italic[wdth,wght].ttf" Ubuntu-RI.ttf
-
-       ln -s "UbuntuMono[wght].ttf" UbuntuMono-B.ttf
-       ln -s "UbuntuMono[wght].ttf" UbuntuMono-R.ttf
-
-       ln -s "UbuntuMono-Italic[wght].ttf" UbuntuMono-BI.ttf
-       ln -s "UbuntuMono-Italic[wght].ttf" UbuntuMono-RI.ttf
+       install -Dm644 "$srcdir"/81-ubuntu.conf 
"$pkgdir"/usr/share/fontconfig/conf.avail/81-ubuntu.conf
+       ln -s ../conf.avail/81-ubuntu.conf 
"$pkgdir"/usr/share/fontconfig/conf.default/81-ubuntu.conf
 }

Reply via email to