[arch-commits] Commit in cantarell-fonts/trunk (PKGBUILD weights.diff)

[Jan Steffens]

    Date: Monday, September 3, 2018 @ 13:01:13
  Author: heftig
Revision: 333210

0.110-2: weight hackfix

Added:
  cantarell-fonts/trunk/weights.diff
Modified:
  cantarell-fonts/trunk/PKGBUILD

--------------+
 PKGBUILD     |   27 +++++++++++++++++++------
 weights.diff |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-03 10:05:58 UTC (rev 333209)
+++ PKGBUILD	2018-09-03 13:01:13 UTC (rev 333210)
@@ -2,24 +2,39 @@
 
 pkgname=cantarell-fonts
 pkgver=0.110
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Humanist sans serif font"
 url="https://gitlab.gnome.org/GNOME/cantarell-fonts"
 arch=(any)
 license=(custom:SIL)
-makedepends=(meson appstream-glib)
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:5}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a454d75db51ab5b76b4c5fa2d779e8796ee01102847d50311dc8ca4e20a034a7')
+makedepends=(meson appstream-glib git)
+_commit=801f581de296a1d2d0ddca3db6565d4bca5044d3  # tags/v0.110^0
+source=("git+https://gitlab.gnome.org/GNOME/cantarell-fonts.git#commit=$_commit"
+        weights.diff)
+sha256sums=('SKIP'
+            '93a3f89efa12895a33ce0aaea717767a34fde0584c7969c0334ea38573c753cb')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  python -m venv venv
+  venv/bin/pip install fontmake psautohint
+  cd $pkgname
+  patch -Np1 -i ../weights.diff
+}
+
 build() {
-  arch-meson $pkgname-$pkgver build
+  PATH="$srcdir/venv/bin:$PATH" arch-meson $pkgname build
   ninja -C build
 }
 
 package() {
   DESTDIR="$pkgdir" meson install -C build
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname-$pkgver/COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING
 }
 
 # vim:set ts=2 sw=2 et:

Added: weights.diff
===================================================================
--- weights.diff	                        (rev 0)
+++ weights.diff	2018-09-03 13:01:13 UTC (rev 333210)
@@ -0,0 +1,61 @@
+ prebuilt/meson.build | 2 +-
+ src/Cantarell.glyphs | 8 ++++----
+ src/meson.build      | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git c/prebuilt/meson.build i/prebuilt/meson.build
+index 3b5f29eb..023a72f5 100644
+--- c/prebuilt/meson.build
++++ i/prebuilt/meson.build
+@@ -2,4 +2,4 @@ install_data('Cantarell-Thin.otf', install_dir : fontsdir)
+ install_data('Cantarell-Light.otf', install_dir : fontsdir)
+ install_data('Cantarell-Regular.otf', install_dir : fontsdir)
+ install_data('Cantarell-Bold.otf', install_dir : fontsdir)
+-install_data('Cantarell-ExtraBold.otf', install_dir : fontsdir)
++install_data('Cantarell-Black.otf', install_dir : fontsdir)
+diff --git c/src/Cantarell.glyphs i/src/Cantarell.glyphs
+index 4330dc87..1d5c9fdd 100644
+--- c/src/Cantarell.glyphs
++++ i/src/Cantarell.glyphs
+@@ -202,7 +202,7 @@ GSOffsetVertical = 10;
+ verticalStems = (
+ 20
+ );
+-weight = Light;
++weight = Thin;
+ weightValue = 20;
+ xHeight = 480;
+ },
+@@ -286,7 +286,7 @@ GSOffsetVertical = 10;
+ verticalStems = (
+ 174
+ );
+-weight = Bold;
++weight = Black;
+ weightValue = 170;
+ xHeight = 490;
+ }
+@@ -82206,8 +82206,8 @@ interpolationWeight = 170;
+ instanceInterpolations = {
+ "51C2DFEF-3776-4D13-9284-96485B799B57" = 1;
+ };
+-name = "Extra Bold";
+-weightClass = ExtraBold;
++name = "Black";
++weightClass = Black;
+ }
+ );
+ manufacturerURL = "http://abattis.org";
+diff --git c/src/meson.build i/src/meson.build
+index f452eb00..26bc2657 100644
+--- c/src/meson.build
++++ i/src/meson.build
+@@ -6,7 +6,7 @@ custom_target(
+         'Cantarell-Light.otf',
+         'Cantarell-Regular.otf',
+         'Cantarell-Bold.otf',
+-        'Cantarell-ExtraBold.otf',
++        'Cantarell-Black.otf',
+     ],
+     command: [python3, fontmake_wrapper, fontmake, psautohint, '@INPUT@', '@OUTDIR@'],
+     install: true,