summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2017-09-17 01:56:58 +0200
committerJan Alexander Steffens (heftig)2017-09-17 01:59:36 +0200
commitdf040a712688837bb8c6b79817e600e55c142bc3 (patch)
treed23724116475b02cf27302e77cbf145ba5894673
parentc5b8b6f5c958600052bb14e662bd3f19de7ba079 (diff)
downloadaur-df040a712688837bb8c6b79817e600e55c142bc3.tar.gz
Sync with testing
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD43
2 files changed, 36 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ca15603b68..4ff1f83b853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Sep 16 23:59:17 UTC 2017
+# Sat Sep 16 23:59:23 UTC 2017
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.8+p86+g410f3799
- pkgrel = 2
+ pkgver = 2.8.1+p0+g39ce3ac4
+ pkgrel = 1
epoch = 1
url = https://www.freetype.org/
arch = i686
@@ -35,7 +35,7 @@ pkgbase = freetype2-git
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.8+p86+g410f3799
+ provides = freetype2=2.8.1+p0+g39ce3ac4
conflicts = freetype2
backup = etc/profile.d/freetype2.sh
@@ -43,6 +43,12 @@ pkgname = freetype2-demos-git
pkgdesc = Freetype tools and demos (from git)
depends = freetype2-git
depends = libx11
- provides = freetype2-demos=2.8+p86+g410f3799
+ provides = freetype2-demos=2.8.1+p0+g39ce3ac4
conflicts = freetype2-demos
+pkgname = freetype2-docs-git
+ pkgdesc = Freetype documentation (from git)
+ depends = freetype2-git
+ provides = freetype2-docs=2.8.1+p0+g39ce3ac4
+ conflicts = freetype2-docs
+
diff --git a/PKGBUILD b/PKGBUILD
index 1b2a78c2d38..464c84dd959 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgbase=freetype2-git
-pkgname=('freetype2-git' 'freetype2-demos-git')
-pkgver=2.8+p86+g410f3799
-pkgrel=2
+pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
+pkgver=2.8.1+p0+g39ce3ac4
+pkgrel=1
epoch=1
pkgdesc="Font rasterization library (from git)"
arch=(i686 x86_64)
@@ -30,6 +30,16 @@ sha1sums=('SKIP'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+pkgver() {
+ local _tag _count
+
+ cd "${srcdir}/freetype2"
+ _tag=$(git describe --abbrev=0 )
+ _count=$(git rev-list --count ${_tag}..HEAD)
+ _tag=${_tag#VER-}
+ echo ${_tag//-/.}+p$_count+g$(git rev-parse --short HEAD)
+}
+
prepare() {
mkdir path
ln -s /usr/bin/python2 path/python
@@ -49,16 +59,6 @@ prepare() {
sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
}
-pkgver() {
- local _tag _count
-
- cd "${srcdir}/freetype2"
- _tag=$(git describe --abbrev=0 )
- _count=$(git rev-list --count ${_tag}..HEAD)
- _tag=${_tag#VER-}
- echo ${_tag//-/.}+p$_count+g$(git rev-parse --short HEAD)
-}
-
build() {
cd freetype2
./configure --prefix=/usr --disable-static
@@ -85,11 +85,7 @@ package_freetype2-git() {
cd freetype2
make DESTDIR="${pkgdir}" install
- install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
-
- # Package docs
- install -d "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+ install -Dt "${pkgdir}/etc/profile.d" -m644 ../freetype2.sh
}
package_freetype2-demos-git() {
@@ -105,4 +101,15 @@ package_freetype2-demos-git() {
done
}
+package_freetype2-docs-git() {
+ pkgdesc="Freetype documentation (from git)"
+ depends=('freetype2-git')
+ provides=("freetype2-docs=$pkgver")
+ conflicts=('freetype2-docs')
+
+ cd freetype2
+ install -d "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+}
+
# vim:set ts=2 sw=2 et: