summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD33
2 files changed, 32 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07ce2b5ba2c..63bffde58f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jan 15 00:39:49 UTC 2017
+# Thu Jan 26 05:29:11 UTC 2017
pkgbase = ttf-merriweather-sans
pkgdesc = A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 1.006
- pkgrel = 2
+ pkgrel = 3
url = https://fonts.google.com/specimen/Merriweather+Sans
install = ttf-merriweather-sans.install
arch = any
@@ -14,15 +14,15 @@ pkgbase = ttf-merriweather-sans
conflicts = ttf-google-fonts-git
conflicts = ttf-google-fonts-opinionated-git
conflicts = ttf-merriweather-sans-ib
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-ExtraBoldItalic.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Italic.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Light.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-LightItalic.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Regular.ttf
- source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/OFL.txt
+ source = MerriweatherSans-Bold-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Bold.ttf
+ source = MerriweatherSans-BoldItalic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf
+ source = MerriweatherSans-ExtraBold-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf
+ source = MerriweatherSans-ExtraBoldItalic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-ExtraBoldItalic.ttf
+ source = MerriweatherSans-Italic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Italic.ttf
+ source = MerriweatherSans-Light-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Light.ttf
+ source = MerriweatherSans-LightItalic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-LightItalic.ttf
+ source = MerriweatherSans-Regular-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Regular.ttf
+ source = ttf-merriweather-sans-1.006-OFL.txt::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/OFL.txt
sha256sums = 9b17d0769b7f16eae06168007dfe129ca1be4e582d972949103daf9be393ba87
sha256sums = dc40cb2fb6d2e7d775cf63af674f137c74160d1de8af55d942192381a8eb7d2e
sha256sums = b3c4697d84a65397d98657ce2e934aa1dd0f9187776525b61ebf05e2779d4fef
@@ -31,7 +31,7 @@ pkgbase = ttf-merriweather-sans
sha256sums = 296f4c55d4df693b2ee8240184b2d8ff655c5f32944597f7733965dc76840d40
sha256sums = ff3b59fa8aca71e75e9aa329bf1e67bcf2fb4f5fa23edefba010c024941229f7
sha256sums = d8ca7e8e39b7e486d7545a0bbefdfe08dfd9b2ddaa672be07f48b16c46dbc24b
- sha256sums = SKIP
+ sha256sums = 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276
pkgname = ttf-merriweather-sans
diff --git a/PKGBUILD b/PKGBUILD
index caf1aeb9f98..5640cee2569 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ttf-merriweather-sans
pkgver=1.006
-pkgrel=2
+pkgrel=3
pkgdesc='A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co'
arch=('any')
url='https://fonts.google.com/specimen/Merriweather+Sans'
@@ -10,15 +10,15 @@ license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-sans-ib')
install="${pkgname}.install"
-source=('https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-ExtraBoldItalic.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Italic.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Light.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-LightItalic.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Regular.ttf'
- 'https://github.com/google/fonts/raw/master/ofl/merriweathersans/OFL.txt')
+source=("MerriweatherSans-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Bold.ttf"
+ "MerriweatherSans-BoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf"
+ "MerriweatherSans-ExtraBold-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf"
+ "MerriweatherSans-ExtraBoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-ExtraBoldItalic.ttf"
+ "MerriweatherSans-Italic-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Italic.ttf"
+ "MerriweatherSans-Light-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Light.ttf"
+ "MerriweatherSans-LightItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-LightItalic.ttf"
+ "MerriweatherSans-Regular-${pkgver}.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Regular.ttf"
+ "${pkgname}-${pkgver}-OFL.txt::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/OFL.txt")
sha256sums=('9b17d0769b7f16eae06168007dfe129ca1be4e582d972949103daf9be393ba87'
'dc40cb2fb6d2e7d775cf63af674f137c74160d1de8af55d942192381a8eb7d2e'
'b3c4697d84a65397d98657ce2e934aa1dd0f9187776525b61ebf05e2779d4fef'
@@ -27,10 +27,17 @@ sha256sums=('9b17d0769b7f16eae06168007dfe129ca1be4e582d972949103daf9be393ba87'
'296f4c55d4df693b2ee8240184b2d8ff655c5f32944597f7733965dc76840d40'
'ff3b59fa8aca71e75e9aa329bf1e67bcf2fb4f5fa23edefba010c024941229f7'
'd8ca7e8e39b7e486d7545a0bbefdfe08dfd9b2ddaa672be07f48b16c46dbc24b'
- 'SKIP')
+ '22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276')
package() {
install -dm 755 "${pkgdir}/usr/share/fonts/TTF"
- install -m 644 *.ttf "${pkgdir}/usr/share/fonts/TTF/"
- install -Dm644 *.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+ install -m 644 MerriweatherSans-Bold-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Bold.ttf"
+ install -m 644 MerriweatherSans-BoldItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-BoldItalic.ttf"
+ install -m 644 MerriweatherSans-ExtraBold-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-ExtraBold.ttf"
+ install -m 644 MerriweatherSans-ExtraBoldItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-ExtraBoldItalic.ttf"
+ install -m 644 MerriweatherSans-Italic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Italic.ttf"
+ install -m 644 MerriweatherSans-Light-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Light.ttf"
+ install -m 644 MerriweatherSans-LightItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-LightItalic.ttf"
+ install -m 644 MerriweatherSans-Regular-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Regular.ttf"
+ install -Dm644 ${pkgname}-${pkgver}-OFL.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
}