Sync with testing (use meson)

9 files changed, 142 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10a8585119e8..844934f176ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.4+p183+g2149b51f2
+	pkgver = 2.11.0+p0+g801cd842e
 	pkgrel = 2
 	epoch = 1
 	url = https://www.freetype.org/
@@ -8,6 +8,8 @@ pkgbase = freetype2-git
 	arch = i686
 	license = GPL
 	makedepends = libx11
+	makedepends = qt5-base
+	makedepends = meson
 	makedepends = git
 	makedepends = python-virtualenv
 	depends = zlib
@@ -15,28 +17,29 @@ pkgbase = freetype2-git
 	depends = sh
 	depends = libpng
 	depends = harfbuzz
+	depends = brotli
 	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-Enable-old-engines-but-keep-adobe-as-default.patch
+	source = 0005-Run-docwriter-via-venv.patch
 	source = freetype2.sh
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = c83f4bb4b86877ceae5bf481419776e3f19876b2a1e5f481446ed2d5f4ff6766
-	sha256sums = 9c9b379ccf549b0826620d9d4468cba1f8c40f18c5ab1ed6da409d2b628eaad2
-	sha256sums = 50f7b54e946224e9eb10b9ac51e344582038b9cd0469b64380f8809ac61ae796
-	sha256sums = 0f79260c148461a303da06a869890c22b7bb2984b6d01075cfc59bdefd988582
-	sha256sums = 4aa6ffc3b8c66f2ef23f234570196e1209d2abb9ce0a5c7bfbc1321b2e81b68e
+	sha256sums = e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c
+	sha256sums = 17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468
+	sha256sums = 561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a
+	sha256sums = 9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6
+	sha256sums = 5b6f2292e7956510c6729c0de1a86be66886d9d10c8723fe399b6eb42003d8ac
 	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.10.4+p183+g2149b51f2
+	provides = freetype2=2.11.0+p0+g801cd842e
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -44,12 +47,12 @@ pkgname = freetype2-demos-git
 	pkgdesc = Freetype tools and demos (from git)
 	depends = freetype2-git
 	depends = libx11
-	provides = freetype2-demos=2.10.4+p183+g2149b51f2
+	optdepends = qt5-base: ftinspect
+	provides = freetype2-demos=2.11.0+p0+g801cd842e
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.4+p183+g2149b51f2
+	provides = freetype2-docs=2.11.0+p0+g801cd842e
 	conflicts = freetype2-docs
-
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index e48ae4c2d4f9..67dea6e4dc5e 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable table validation modules
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index de66ee53a0..6fb67b85ba 100644
+index 30f7fac45a..a9a4703989 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -114,26 +114,26 @@ AUX_MODULES += cache
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 91227d00a858..8a1cddb96252 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -8,10 +8,10 @@ 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 da4250b083..5669cf2496 100644
+index 4227fd376e..32da3fa039 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -124,7 +124,7 @@ FT_BEGIN_HEADER
+@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
     * When this macro is not defined, FreeType offers alternative LCD
     * rendering technology that produces excellent output.
     */
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index a2a904d96d91..cc1aa73d4566 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 5669cf2496..ee313322f2 100644
+index 32da3fa039..0dd4021e24 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -689,8 +689,8 @@ FT_BEGIN_HEADER
+@@ -688,8 +688,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 d9d3abf9eaa9..1c082b79c7c5 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 ee313322f2..d6ab02542f 100644
+index 0dd4021e24..8da3073b6d 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -878,7 +878,7 @@ FT_BEGIN_HEADER
+@@ -877,7 +877,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-Enable-old-engines-but-keep-adobe-as-default.patch b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
deleted file mode 100644
index 79df966dc959..000000000000
--- a/0005-Enable-old-engines-but-keep-adobe-as-default.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sat, 16 Dec 2017 23:08:02 +0100
-Subject: [PATCH] Enable old engines, but keep adobe as default
-
----
- include/freetype/config/ftoption.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index d6ab02542f..67d15eeb6a 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -809,7 +809,7 @@ FT_BEGIN_HEADER
-    * switch between the two engines using the `hinting-engine` property of
-    * the 'type1' driver module.
-    */
--/* #define T1_CONFIG_OPTION_OLD_ENGINE */
-+#define T1_CONFIG_OPTION_OLD_ENGINE
- 
- 
-   /*************************************************************************/
-@@ -851,7 +851,7 @@ FT_BEGIN_HEADER
-    * between the two engines using the `hinting-engine` property of the 'cff'
-    * driver module.
-    */
--/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
-+#define CFF_CONFIG_OPTION_OLD_ENGINE
- 
- 
-   /*************************************************************************/
diff --git a/0005-Run-docwriter-via-venv.patch b/0005-Run-docwriter-via-venv.patch
new file mode 100644
index 000000000000..eff4c35b75b9
--- /dev/null
+++ b/0005-Run-docwriter-via-venv.patch
@@ -0,0 +1,54 @@
+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 ++++--
+ meson.build                             | 2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/builds/meson/generate_reference_docs.py b/builds/meson/generate_reference_docs.py
+index 15d9b06600..124c174ff5 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/meson.build b/meson.build
+index 0eb780bfd6..295a3853f8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -392,7 +392,7 @@ gen_docs = custom_target('freetype2 reference documentation',
+   command: [python_exe,
+     files('builds/meson/generate_reference_docs.py'),
+     '--version=' + meson.project_version(),
+-    '--input-dir=' + meson.source_root(),
++    '--input-dir=' + meson.current_source_dir(),
+     '--output-dir=@OUTPUT@'
+   ],
+ )
diff --git a/0005-Use-docwriter-from-PATH.patch b/0005-Use-docwriter-from-PATH.patch
new file mode 100644
index 000000000000..c648cba2c5c9
--- /dev/null
+++ b/0005-Use-docwriter-from-PATH.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Fri, 23 Jul 2021 21:12:45 +0000
+Subject: [PATCH] Use docwriter from PATH
+
+---
+ builds/meson/generate_reference_docs.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/builds/meson/generate_reference_docs.py b/builds/meson/generate_reference_docs.py
+index 15d9b06600..158c536a82 100644
+--- a/builds/meson/generate_reference_docs.py
++++ b/builds/meson/generate_reference_docs.py
+@@ -66,8 +66,6 @@ def main():
+         )
+ 
+     cmds = [
+-        sys.executable,
+-        "-m",
+         "docwriter",
+         "--prefix=ft2",
+         "--title=FreeType-" + args.version,
diff --git a/PKGBUILD b/PKGBUILD
index 74abb77e1ef8..d9e7835042cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=freetype2-git
 pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.10.4+p183+g2149b51f2
+pkgver=2.11.0+p0+g801cd842e
 pkgrel=2
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -12,23 +12,23 @@ arch=(x86_64 i686)
 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-virtualenv)
+depends=(zlib bzip2 sh libpng harfbuzz brotli)
+makedepends=(libx11 qt5-base meson git python-virtualenv)
 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-Enable-old-engines-but-keep-adobe-as-default.patch
+        0005-Run-docwriter-via-venv.patch
         freetype2.sh)
 sha256sums=('SKIP'
             'SKIP'
-            'c83f4bb4b86877ceae5bf481419776e3f19876b2a1e5f481446ed2d5f4ff6766'
-            '9c9b379ccf549b0826620d9d4468cba1f8c40f18c5ab1ed6da409d2b628eaad2'
-            '50f7b54e946224e9eb10b9ac51e344582038b9cd0469b64380f8809ac61ae796'
-            '0f79260c148461a303da06a869890c22b7bb2984b6d01075cfc59bdefd988582'
-            '4aa6ffc3b8c66f2ef23f234570196e1209d2abb9ce0a5c7bfbc1321b2e81b68e'
+            'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
+            '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
+            '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
+            '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6'
+            '5b6f2292e7956510c6729c0de1a86be66886d9d10c8723fe399b6eb42003d8ac'
             'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
 validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl@gnu.org>
 
@@ -43,37 +43,41 @@ pkgver() {
 }
 
 prepare() {
+  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-Enable-old-engines-but-keep-adobe-as-default.patch
-
-  ./autogen.sh
-
-  cd ../freetype-demos
+  patch -Np1 -i ../0005-Run-docwriter-via-venv.patch
 
-  # Suppress RPATH
-  sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+  ln -sr . ../freetype-demos/subprojects/freetype2
 }
 
 build() {
-  cd freetype
-  ./configure --prefix=/usr --disable-static
-  make
-
-  # Build docs
-  make refdoc-venv
+  arch-meson freetype-demos build \
+    -D freetype2:default_library=shared
+  meson compile -C build
 
-  # Build demos
-  cd ../freetype-demos
-  make
+  DOCWRITER_PYTHON="$PWD/docwriter-venv/bin/python" \
+    ninja -C build subprojects/freetype2/docs
 }
 
 check() {
-  cd freetype
-  make -k check
+  meson test -C build --print-errorlogs
+}
+
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
 }
 
 package_freetype2-git() {
@@ -82,22 +86,23 @@ package_freetype2-git() {
   install=freetype2.install
   backup=(etc/profile.d/freetype2.sh)
 
-  cd freetype
-  make DESTDIR="$pkgdir" install
-  install -Dt "$pkgdir/etc/profile.d" -m644 ../freetype2.sh
+  meson install -C build --destdir="$pkgdir"
+  install -Dt "$pkgdir/etc/profile.d" -m644 freetype2.sh
+  install -Dt "$pkgdir/usr/share/aclocal" -m644 \
+    freetype/builds/unix/freetype2.m4
+
+  cd "$pkgdir"
+  _pick demos usr/bin
+  _pick demos usr/share/man/man1
 }
 
 package_freetype2-demos-git() {
   pkgdesc="Freetype tools and demos (from git)"
   depends=(freetype2-git libx11)
+  optdepends=('qt5-base: ftinspect')
   provides=("freetype2-demos=$pkgver")
   conflicts=(freetype2-demos)
-
-  cd freetype-demos
-  install -d "$pkgdir/usr/bin"
-  for _i in bin/{f,t}t*; do
-    libtool --mode=install install $_i "$pkgdir/usr/bin"
-  done
+  mv demos/* "$pkgdir"
 }
 
 package_freetype2-docs-git() {
@@ -106,10 +111,9 @@ package_freetype2-docs-git() {
   provides=("freetype2-docs=$pkgver")
   conflicts=(freetype2-docs)
 
-  cd freetype
-  install -d "$pkgdir/usr/share/doc"
-  cp -a docs "$pkgdir/usr/share/doc/freetype2"
-  rm -r "$pkgdir/usr/share/doc/freetype2/env"
+  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 ts=2 sw=2 et:
+# vim:set sw=2 et: