summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2018-11-08 01:37:20 +0000
committerJan Alexander Steffens (heftig)2018-11-08 01:37:20 +0000
commita4d87c19daa1450cb625dd8e39cc09ec3bddee27 (patch)
tree802930637891362d4ad2b619e7c525a2b08b23fa
parent1ff1d54c88f0d83f30f6f9df37b4163c2e86cdfa (diff)
downloadaur-a4d87c19daa1450cb625dd8e39cc09ec3bddee27.tar.gz
Better fix for docs
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
2 files changed, 12 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 838f6fe5d8d..c6d36ea9eb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freetype2-git
pkgdesc = Font rasterization library (from git)
- pkgver = 2.9.1+p197+gb287c80b6
+ pkgver = 2.9.1+p299+gfb0d66d04
pkgrel = 1
epoch = 1
url = https://www.freetype.org/
@@ -9,7 +9,7 @@ pkgbase = freetype2-git
license = GPL
makedepends = libx11
makedepends = git
- makedepends = python2-pip
+ makedepends = python
depends = zlib
depends = bzip2
depends = sh
@@ -36,7 +36,7 @@ pkgbase = freetype2-git
pkgname = freetype2-git
install = freetype2.install
provides = libfreetype.so
- provides = freetype2=2.9.1+p197+gb287c80b6
+ provides = freetype2=2.9.1+p299+gfb0d66d04
conflicts = freetype2
backup = etc/profile.d/freetype2.sh
@@ -44,12 +44,12 @@ pkgname = freetype2-demos-git
pkgdesc = Freetype tools and demos (from git)
depends = freetype2-git
depends = libx11
- provides = freetype2-demos=2.9.1+p197+gb287c80b6
+ provides = freetype2-demos=2.9.1+p299+gfb0d66d04
conflicts = freetype2-demos
pkgname = freetype2-docs-git
pkgdesc = Freetype documentation (from git)
depends = freetype2-git
- provides = freetype2-docs=2.9.1+p197+gb287c80b6
+ provides = freetype2-docs=2.9.1+p299+gfb0d66d04
conflicts = freetype2-docs
diff --git a/PKGBUILD b/PKGBUILD
index 29c4bf1a8bf..c82c64a1e99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=freetype2-git
pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.9.1+p197+gb287c80b6
+pkgver=2.9.1+p299+gfb0d66d04
pkgrel=1
epoch=1
pkgdesc="Font rasterization library (from git)"
@@ -13,7 +13,7 @@ url="https://www.freetype.org/"
# adding harfbuzz for improved OpenType features auto-hinting
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-makedepends=('libx11' 'git' 'python2-pip')
+makedepends=('libx11' 'git' 'python')
source=(git://git.sv.gnu.org/freetype/freetype2.git
git://git.sv.gnu.org/freetype/freetype2-demos.git
0001-Enable-table-validation-modules.patch
@@ -43,10 +43,8 @@ pkgver() {
}
prepare() {
- mkdir path
- ln -s /usr/bin/python2 path/python
-
- pip2 install --user docwriter
+ python -m venv venv
+ venv/bin/pip install docwriter
cd freetype2
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
@@ -65,12 +63,14 @@ prepare() {
}
build() {
+ export PATH="$srcdir/venv/bin:$PATH"
+
cd freetype2
./configure --prefix=/usr --disable-static
make
# Build docs
- PATH="$srcdir/path:$HOME/.local/bin:$PATH" make refdoc
+ make refdoc
# Build demos
cd ../freetype2-demos