Sync with extra

2 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be9401abb0d0..12a1d3f72778 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.11.0+p110+g842ec5ed6
+	pkgver = 2.11.1+p0+g3f83daeec
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
@@ -39,7 +39,7 @@ pkgbase = freetype2-git
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.11.0+p110+g842ec5ed6
+	provides = freetype2=2.11.1+p0+g3f83daeec
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -48,11 +48,11 @@ pkgname = freetype2-demos-git
 	depends = freetype2-git
 	depends = libx11
 	optdepends = qt5-base: ftinspect
-	provides = freetype2-demos=2.11.0+p110+g842ec5ed6
+	provides = freetype2-demos=2.11.1+p0+g3f83daeec
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.11.0+p110+g842ec5ed6
+	provides = freetype2-docs=2.11.1+p0+g3f83daeec
 	conflicts = freetype2-docs
diff --git a/PKGBUILD b/PKGBUILD
index cea738057db6..2833a9235db9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=freetype2-git
 pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.11.0+p110+g842ec5ed6
+pkgver=2.11.1+p0+g3f83daeec
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -43,18 +43,16 @@ pkgver() {
 }
 
 prepare() {
+  ln -sr freetype freetype-demos/subprojects/freetype2
   python -m venv docwriter-venv
   docwriter-venv/bin/pip install docwriter
 
   cd freetype
-
   patch -Np1 -i ../0001-Enable-table-validation-modules.patch
   patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
   patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
   patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
   patch -Np1 -i ../0005-Run-docwriter-via-venv.patch
-
-  ln -sr . ../freetype-demos/subprojects/freetype2
 }
 
 build() {
@@ -91,9 +89,8 @@ package_freetype2-git() {
   install -Dt "$pkgdir/usr/share/aclocal" -m644 \
     freetype/builds/unix/freetype2.m4
 
-  cd "$pkgdir"
-  _pick demos usr/bin
-  _pick demos usr/share/man/man1
+  _pick demos "$pkgdir"/usr/bin
+  _pick demos "$pkgdir"/usr/share/man/man1
 }
 
 package_freetype2-demos-git() {