Date: Tuesday, September 4, 2018 @ 08:05:13 Author: heftig Revision: 333250
archrelease: copy trunk to extra-any Added: cantarell-fonts/repos/extra-any/PKGBUILD (from rev 333249, cantarell-fonts/trunk/PKGBUILD) Deleted: cantarell-fonts/repos/extra-any/PKGBUILD cantarell-fonts/repos/extra-any/weights.diff --------------+ PKGBUILD | 77 +++++++++++++++++++++++++++------------------------------ weights.diff | 61 --------------------------------------------- 2 files changed, 37 insertions(+), 101 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-09-04 08:04:39 UTC (rev 333249) +++ PKGBUILD 2018-09-04 08:05:13 UTC (rev 333250) @@ -1,40 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=cantarell-fonts -pkgver=0.110 -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 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() { - 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/COPYING -} - -# vim:set ts=2 sw=2 et: Copied: cantarell-fonts/repos/extra-any/PKGBUILD (from rev 333249, cantarell-fonts/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-09-04 08:05:13 UTC (rev 333250) @@ -0,0 +1,37 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=cantarell-fonts +pkgver=0.111 +pkgrel=1 +epoch=1 +pkgdesc="Humanist sans serif font" +url="https://gitlab.gnome.org/GNOME/cantarell-fonts" +arch=(any) +license=(custom:SIL) +makedepends=(meson appstream-glib git) +_commit=9c0eb3dc8c0b2e0d5b9e4dfcd48ca1b9531baaa9 # tags/v0.111^0 +source=("git+https://gitlab.gnome.org/GNOME/cantarell-fonts.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + python -m venv venv + venv/bin/pip install fontmake psautohint + cd $pkgname +} + +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/COPYING +} + +# vim:set ts=2 sw=2 et: Deleted: weights.diff =================================================================== --- weights.diff 2018-09-04 08:04:39 UTC (rev 333249) +++ weights.diff 2018-09-04 08:05:13 UTC (rev 333250) @@ -1,61 +0,0 @@ - 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,