2.12.0+p2+g385345037-1: remove the broken and torturous docs build

7 files changed, 23 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7e7fa7d6e13..4d18676a8136 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.11.1+p110+g6c5522c6f
+	pkgver = 2.12.0+p2+g385345037
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
@@ -12,35 +12,33 @@ pkgbase = freetype2-git
 	makedepends = meson
 	makedepends = librsvg
 	makedepends = git
-	makedepends = python-virtualenv
 	depends = zlib
 	depends = bzip2
 	depends = sh
 	depends = libpng
 	depends = harfbuzz
 	depends = brotli
+	options = debug
 	source = git+https://gitlab.freedesktop.org/freetype/freetype.git
 	source = git+https://gitlab.freedesktop.org/freetype/freetype-demos.git
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
 	source = 0003-Enable-infinality-subpixel-hinting.patch
 	source = 0004-Enable-long-PCF-family-names.patch
-	source = 0005-Run-docwriter-via-venv.patch
 	source = freetype2.sh
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53
-	sha256sums = 17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05
-	sha256sums = 0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0
-	sha256sums = 6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e
-	sha256sums = 27b2d2358e2d0488d4a7f714986e311de514ab8e173f11120395784894fdd2a4
+	sha256sums = 12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da
+	sha256sums = 2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f
+	sha256sums = caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20
+	sha256sums = 8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb
 	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.11.1+p110+g6c5522c6f
+	provides = freetype2=2.12.0+p2+g385345037
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -50,11 +48,5 @@ pkgname = freetype2-demos-git
 	depends = libx11
 	depends = librsvg
 	optdepends = qt5-base: ftinspect
-	provides = freetype2-demos=2.11.1+p110+g6c5522c6f
+	provides = freetype2-demos=2.12.0+p2+g385345037
 	conflicts = freetype2-demos
-
-pkgname = freetype2-docs-git
-	pkgdesc = Freetype documentation (from git)
-	depends = freetype2-git
-	provides = freetype2-docs=2.11.1+p110+g6c5522c6f
-	conflicts = freetype2-docs
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 5adeb2124f0c..969e6025d832 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable table validation modules
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index 30f7fac45abd..a9a4703989b9 100644
+index aded92e5e922..f133c65b27e2 100644
 --- a/modules.cfg
 +++ b/modules.cfg
-@@ -114,26 +114,26 @@ AUX_MODULES += cache
+@@ -117,26 +117,26 @@ AUX_MODULES += cache
  
  # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
  #
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 03f911a26a8d..8f16e7a5f26c 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable subpixel rendering
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 4227fd376e41..32da3fa03903 100644
+index c5bde243b127..77d6efb2e5f2 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -123,7 +123,7 @@ FT_BEGIN_HEADER
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index dc0adb23e135..eee5e3ee703b 100644
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable infinality subpixel hinting
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 32da3fa03903..0dd4021e2433 100644
+index 77d6efb2e5f2..c33c51eeb2e7 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -688,8 +688,8 @@ FT_BEGIN_HEADER
+@@ -706,8 +706,8 @@ FT_BEGIN_HEADER
     * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
     */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 2c932957e27f..93e04473cbe9 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable long PCF family names
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 0dd4021e2433..8da3073b6d71 100644
+index c33c51eeb2e7..c33ddb4bf60c 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -877,7 +877,7 @@ FT_BEGIN_HEADER
+@@ -895,7 +895,7 @@ FT_BEGIN_HEADER
     * If this option is activated, it can be controlled with the
     * `no-long-family-names` property of the 'pcf' driver module.
     */
diff --git a/0005-Run-docwriter-via-venv.patch b/0005-Run-docwriter-via-venv.patch
deleted file mode 100644
index ee7baaa0f826..000000000000
--- a/0005-Run-docwriter-via-venv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Fri, 23 Jul 2021 21:27:19 +0000
-Subject: [PATCH] Run docwriter via venv
-
----
- builds/meson/generate_reference_docs.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/builds/meson/generate_reference_docs.py b/builds/meson/generate_reference_docs.py
-index 15d9b066005e..124c174ff570 100644
---- a/builds/meson/generate_reference_docs.py
-+++ b/builds/meson/generate_reference_docs.py
-@@ -65,22 +65,24 @@ def main():
-             "Not a directory: " + args.output_dir
-         )
- 
-+    executable = os.getenv("DOCWRITER_PYTHON")
-+
-     cmds = [
--        sys.executable,
-+        executable,
-         "-m",
-         "docwriter",
-         "--prefix=ft2",
-         "--title=FreeType-" + args.version,
-         "--site=reference",
-         "--output=" + args.output_dir,
-     ] + all_headers
- 
-     print("Running docwriter...")
-     subprocess.check_call(cmds)
- 
-     print("Building static site...")
-     subprocess.check_call(
--        [sys.executable, "-m", "mkdocs", "build"], cwd=args.output_dir
-+        [executable, "-m", "mkdocs", "build"], cwd=args.output_dir
-     )
-     return 0
- 
diff --git a/PKGBUILD b/PKGBUILD
index 442a203f77b9..34d27861bdc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=freetype2-git
-pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.11.1+p110+g6c5522c6f
+pkgname=(freetype2-git freetype2-demos-git)
+pkgver=2.12.0+p2+g385345037
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -13,22 +13,21 @@ 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 brotli)
-makedepends=(libx11 qt5-base meson librsvg git python-virtualenv)
+makedepends=(libx11 qt5-base meson librsvg git)
+options=(debug)
 source=(git+https://gitlab.freedesktop.org/freetype/freetype.git
         git+https://gitlab.freedesktop.org/freetype/freetype-demos.git
         0001-Enable-table-validation-modules.patch
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
         0004-Enable-long-PCF-family-names.patch
-        0005-Run-docwriter-via-venv.patch
         freetype2.sh)
 sha256sums=('SKIP'
             'SKIP'
-            '663310ef70f7830de462fb8964ee4fa1d49ad4aeb1a6eae5857707e161039a53'
-            '17cd4bd0c650b9bdd3bc30581ad6457524db14ec34b56f98e243357c3ab4bc05'
-            '0607ac8176d4f08bcfb78d07bdc2c66fcbe7dfde6c82a0e98d6e625597442fd0'
-            '6e5192dc08119e32992eee5a15595e131adcc9d2411066ca8691bfe2af14d97e'
-            '27b2d2358e2d0488d4a7f714986e311de514ab8e173f11120395784894fdd2a4'
+            '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da'
+            '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f'
+            'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20'
+            '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb'
             'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
 validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl@gnu.org>
 
@@ -44,24 +43,18 @@ 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
 }
 
 build() {
   arch-meson freetype-demos build \
     -D freetype2:default_library=shared
   meson compile -C build
-
-  DOCWRITER_PYTHON="$PWD/docwriter-venv/bin/python" \
-    ninja -C build subprojects/freetype2/docs
 }
 
 check() {
@@ -102,15 +95,4 @@ package_freetype2-demos-git() {
   mv demos/* "$pkgdir"
 }
 
-package_freetype2-docs-git() {
-  pkgdesc="Freetype documentation (from git)"
-  depends=(freetype2-git)
-  provides=("freetype2-docs=$pkgver")
-  conflicts=(freetype2-docs)
-
-  mkdir -p "${pkgdir}/usr/share/doc"
-  cp -r freetype/docs "$pkgdir/usr/share/doc/freetype2"
-  cp -r build/subprojects/freetype2/docs/* "$pkgdir/usr/share/doc/freetype2"
-}
-
 # vim:set sw=2 et: