Use make refdoc-venv

2 files changed, 8 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb0b8cafd6d7..2eb915c9748e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.3+p0+g337670af0
+	pkgver = 2.10.4+p10+g22bb0660a
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
@@ -9,7 +9,7 @@ pkgbase = freetype2-git
 	license = GPL
 	makedepends = libx11
 	makedepends = git
-	makedepends = python
+	makedepends = python-virtualenv
 	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.10.3+p0+g337670af0
+	provides = freetype2=2.10.4+p10+g22bb0660a
 	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.10.3+p0+g337670af0
+	provides = freetype2-demos=2.10.4+p10+g22bb0660a
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.3+p0+g337670af0
+	provides = freetype2-docs=2.10.4+p10+g22bb0660a
 	conflicts = freetype2-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index c004eed31760..37610ca6c1c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=freetype2-git
 pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.10.3+p0+g337670af0
+pkgver=2.10.4+p10+g22bb0660a
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -13,7 +13,7 @@ license=(GPL)
 # 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 python)
+makedepends=(libx11 git python-virtualenv)
 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,9 +43,6 @@ pkgver() {
 }
 
 prepare() {
-  python -m venv venv
-  venv/bin/pip install docwriter
-
   cd freetype2
   patch -Np1 -i ../0001-Enable-table-validation-modules.patch
   patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
@@ -62,14 +59,12 @@ prepare() {
 }
 
 build() {
-  export PATH="$srcdir/venv/bin:$PATH"
-
   cd freetype2
   ./configure --prefix=/usr --disable-static
   make
 
   # Build docs
-  make refdoc
+  make refdoc-venv
 
   # Build demos
   cd ../freetype2-demos