2.13.1+p0+ge4586d960-1: Sync with testing, unbreak build

8 files changed, 94 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43f7f7b041d3..1d58585b3f28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,52 +1,49 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.12.0+p2+g385345037
+	pkgver = 2.13.1+p0+ge4586d960
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
-	arch = x86_64
 	arch = i686
+	arch = x86_64
 	license = GPL
+	makedepends = git
+	makedepends = librsvg
 	makedepends = libx11
-	makedepends = qt5-base
 	makedepends = meson
-	makedepends = librsvg
-	makedepends = git
-	depends = zlib
+	makedepends = qt5-base
+	depends = brotli
 	depends = bzip2
-	depends = sh
 	depends = libpng
+	depends = sh
+	depends = zlib
 	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 = 0003-Enable-long-PCF-family-names.patch
 	source = freetype2.sh
 	validpgpkeys = E30674707856409FF1948010BE6C3AAC63AD8E3F
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = 12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da
-	sha256sums = 2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f
-	sha256sums = caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20
-	sha256sums = 8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb
-	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = 2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1
+	b2sums = 9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115
+	b2sums = 66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c
+	b2sums = a964f46886b5017a5c180f29408f72ae8aba29f37404c48b4681ff12ca0a2cfa2a8e219480e98d63d45fb5c266a6e5826df170c9a0d701cd866e395c5ac6e87d
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.12.0+p2+g385345037
+	provides = freetype2=2.13.1+p0+ge4586d960
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
 pkgname = freetype2-demos-git
 	pkgdesc = Freetype tools and demos (from git)
 	depends = freetype2-git
-	depends = libx11
 	depends = librsvg
+	depends = libx11
 	optdepends = qt5-base: ftinspect
-	provides = freetype2-demos=2.12.0+p2+g385345037
+	provides = freetype2-demos=2.13.1+p0+ge4586d960
 	conflicts = freetype2-demos
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 969e6025d832..f360a143132c 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 aded92e5e922..f133c65b27e2 100644
+index 5b6c9b5a5c1d..b4933bea7654 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -117,26 +117,26 @@ AUX_MODULES += cache
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index 8f16e7a5f26c..95f40a306efa 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 c5bde243b127..77d6efb2e5f2 100644
+index 1976b33af959..b3425e55feec 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
deleted file mode 100644
index eee5e3ee703b..000000000000
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH] Enable infinality subpixel hinting
-
----
- 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 77d6efb2e5f2..c33c51eeb2e7 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -706,8 +706,8 @@ FT_BEGIN_HEADER
-    * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
-    */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2         */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )
- 
- 
-   /**************************************************************************
diff --git a/0004-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 93e04473cbe9..e38679e4184d 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0003-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 c33c51eeb2e7..c33ddb4bf60c 100644
+index b3425e55feec..ecff3ccd12d6 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -895,7 +895,7 @@ FT_BEGIN_HEADER
+@@ -887,7 +887,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/PKGBUILD b/PKGBUILD
index 4664df257b08..0b341f449ca7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,55 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=freetype2-git
-pkgname=(freetype2-git freetype2-demos-git)
-pkgver=2.12.0+p2+g385345037
+pkgname=(
+  freetype2-git
+  freetype2-demos-git
+)
+pkgver=2.13.1+p0+ge4586d960
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
 url="https://www.freetype.org/"
-arch=(x86_64 i686)
+arch=(
+  i686
+  x86_64
+)
 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)
-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
-        freetype2.sh)
-sha256sums=('SKIP'
-            'SKIP'
-            '12c869eeba212c74d07d3d7815848b047ecb5282d5463dffb3bb6d219315d4da'
-            '2497dcb3650271db9bb7ad4f3379b5b3c6a19f5ca5388dd9ba7d42b5c15c8c4f'
-            'caa0bc7d3dfa3b4c6b9beecda6141405dafe540f99a655dc83d1704fa232ac20'
-            '8bf978cd1abd73f54c53f7d214c368b1fd8921cd9800d2cc84427c662ffbbdcb'
-            'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
-validpgpkeys=(E30674707856409FF1948010BE6C3AAC63AD8E3F) # Werner Lemberg <wl@gnu.org>
+depends=(
+  brotli
+  bzip2
+  libpng
+  sh
+  zlib
+
+  # adding harfbuzz for improved OpenType features auto-hinting
+  # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+  harfbuzz
+)
+makedepends=(
+  git
+  librsvg
+  libx11
+  meson
+  qt5-base
+)
+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-long-PCF-family-names.patch
+  freetype2.sh
+)
+b2sums=('SKIP'
+        'SKIP'
+        '2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1'
+        '9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115'
+        '66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c'
+        'a964f46886b5017a5c180f29408f72ae8aba29f37404c48b4681ff12ca0a2cfa2a8e219480e98d63d45fb5c266a6e5826df170c9a0d701cd866e395c5ac6e87d')
+validpgpkeys=(
+  E30674707856409FF1948010BE6C3AAC63AD8E3F  # Werner Lemberg <wl@gnu.org>
+)
 
 pkgver() {
   local _tag _count
@@ -42,18 +63,21 @@ pkgver() {
 }
 
 prepare() {
+  # Build FreeType as part of the demos
   ln -sr freetype freetype-demos/subprojects/freetype2
 
   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 ../0003-Enable-long-PCF-family-names.patch
 }
 
 build() {
-  arch-meson freetype-demos build \
+  local meson_options=(
     -D freetype2:default_library=shared
+  )
+
+  arch-meson freetype-demos build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -72,7 +96,10 @@ _pick() {
 }
 
 package_freetype2-git() {
-  provides=(libfreetype.so "freetype2=$pkgver")
+  provides=(
+    libfreetype.so
+    "freetype2=$pkgver"
+  )
   conflicts=(freetype2)
   install=freetype2.install
   backup=(etc/profile.d/freetype2.sh)
@@ -88,11 +115,18 @@ package_freetype2-git() {
 
 package_freetype2-demos-git() {
   pkgdesc="Freetype tools and demos (from git)"
-  depends=(freetype2-git libx11 librsvg)
-  optdepends=('qt5-base: ftinspect')
+  depends=(
+    freetype2-git
+    librsvg
+    libx11
+  )
+  optdepends=(
+    'qt5-base: ftinspect'
+  )
   provides=("freetype2-demos=$pkgver")
   conflicts=(freetype2-demos)
+
   mv demos/* "$pkgdir"
 }
 
-# vim:set sw=2 et:
+# vim:set sw=2 sts=-1 et:
diff --git a/freetype2.install b/freetype2.install
index c900ae8a018d..6c20de7621bc 100644
--- a/freetype2.install
+++ b/freetype2.install
@@ -5,4 +5,12 @@ post_upgrade() {
   Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
 MSG
   fi
+
+  if (( $(vercmp $2 1:2.13.1+p0+ge4586d960-1) < 0 )); then
+    cat <<MSG
+  The "Infinality" TrueType interpreter version has been removed.
+  If you've previously configured "truetype:interpreter-version=38",
+  please update your choice in /etc/profile.d/freetype2.sh .
+MSG
+  fi
 }
diff --git a/freetype2.sh b/freetype2.sh
index 93165d30fe7f..febb62de8414 100644
--- a/freetype2.sh
+++ b/freetype2.sh
@@ -2,7 +2,6 @@
 # version. The available settings are:
 #
 #     truetype:interpreter-version=35  # Classic mode (default in 2.6)
-#     truetype:interpreter-version=38  # Infinality mode
 #     truetype:interpreter-version=40  # Minimal mode (default in 2.7)
 #
 # There are more properties that can be set, separated by whitespace. Please