Fix build

 - Build from the new upstream repos
 - Resync patches

8 files changed, 43 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff82107eb56c..10a8585119e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.4+p16+g5abd252a0
-	pkgrel = 1
+	pkgver = 2.10.4+p183+g2149b51f2
+	pkgrel = 2
 	epoch = 1
 	url = https://www.freetype.org/
 	arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = freetype2-git
 	depends = sh
 	depends = libpng
 	depends = harfbuzz
-	source = git://git.sv.gnu.org/freetype/freetype2.git
-	source = git://git.sv.gnu.org/freetype/freetype2-demos.git
+	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
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 8b6f8b0798e77b945bad03cb01b1dbd654b18b0e9adf39cb5106ccfa104530a6
-	sha256sums = 7da842a8f487e0948d34b0ed743ae48d43daee09f6f241fb2516be7e06d2c87c
-	sha256sums = b089eaa1a7fe97f3f6fc66c8d6f93ae9cb69db8b93711adabb4b2bd5a57b150e
-	sha256sums = 68eb9b5de88d562db961bb835dc55069474b7be3ce52b0909da95a74e8a69667
-	sha256sums = fabfa40b42fac7a41231d4484bad2b9310bda9b441a887e9c38869f19353649a
+	sha256sums = c83f4bb4b86877ceae5bf481419776e3f19876b2a1e5f481446ed2d5f4ff6766
+	sha256sums = 9c9b379ccf549b0826620d9d4468cba1f8c40f18c5ab1ed6da409d2b628eaad2
+	sha256sums = 50f7b54e946224e9eb10b9ac51e344582038b9cd0469b64380f8809ac61ae796
+	sha256sums = 0f79260c148461a303da06a869890c22b7bb2984b6d01075cfc59bdefd988582
+	sha256sums = 4aa6ffc3b8c66f2ef23f234570196e1209d2abb9ce0a5c7bfbc1321b2e81b68e
 	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.10.4+p16+g5abd252a0
+	provides = freetype2=2.10.4+p183+g2149b51f2
 	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.4+p16+g5abd252a0
+	provides = freetype2-demos=2.10.4+p183+g2149b51f2
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.4+p16+g5abd252a0
+	provides = freetype2-docs=2.10.4+p183+g2149b51f2
 	conflicts = freetype2-docs
 
diff --git a/.gitignore b/.gitignore
index c3ae16a7c931..c32df785afe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@
 /*.pkg.tar.*
 /.mkpkg_check
 /MKPKG
-/freetype2
-/freetype2-demos
+/freetype
+/freetype-demos
 /log
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 464ba908444c..e48ae4c2d4f9 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 d6cdbe5239..181f915416 100644
+index de66ee53a0..6fb67b85ba 100644
 --- a/modules.cfg
 +++ b/modules.cfg
-@@ -111,26 +111,26 @@ AUX_MODULES += cache
+@@ -114,26 +114,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 e7a57eb94e79..91227d00a858 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 097f19b8a5..e5de62e353 100644
+index da4250b083..5669cf2496 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -124,7 +124,7 @@ FT_BEGIN_HEADER
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index 868a3a11637c..a2a904d96d91 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 e5de62e353..acb4d6d6aa 100644
+index 5669cf2496..ee313322f2 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -672,8 +672,8 @@ FT_BEGIN_HEADER
+@@ -689,8 +689,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 af66b329db07..d9d3abf9eaa9 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 acb4d6d6aa..efa13b9c66 100644
+index ee313322f2..d6ab02542f 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -861,7 +861,7 @@ FT_BEGIN_HEADER
+@@ -878,7 +878,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
index d4ccd57fdba6..79df966dc959 100644
--- a/0005-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable old engines, but keep adobe as default
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index efa13b9c66..f3b35758c7 100644
+index d6ab02542f..67d15eeb6a 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -792,7 +792,7 @@ FT_BEGIN_HEADER
+@@ -809,7 +809,7 @@ FT_BEGIN_HEADER
     * switch between the two engines using the `hinting-engine` property of
     * the 'type1' driver module.
     */
@@ -20,7 +20,7 @@ index efa13b9c66..f3b35758c7 100644
  
  
    /*************************************************************************/
-@@ -834,7 +834,7 @@ FT_BEGIN_HEADER
+@@ -851,7 +851,7 @@ FT_BEGIN_HEADER
     * between the two engines using the `hinting-engine` property of the 'cff'
     * driver module.
     */
diff --git a/PKGBUILD b/PKGBUILD
index 644a80c9b30d..74abb77e1ef8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=freetype2-git
 pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
-pkgver=2.10.4+p16+g5abd252a0
-pkgrel=1
+pkgver=2.10.4+p183+g2149b51f2
+pkgrel=2
 epoch=1
 pkgdesc="Font rasterization library (from git)"
 url="https://www.freetype.org/"
@@ -14,8 +14,8 @@ license=(GPL)
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=(zlib bzip2 sh libpng harfbuzz)
 makedepends=(libx11 git python-virtualenv)
-source=(git://git.sv.gnu.org/freetype/freetype2.git
-        git://git.sv.gnu.org/freetype/freetype2-demos.git
+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
@@ -24,18 +24,18 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
         freetype2.sh)
 sha256sums=('SKIP'
             'SKIP'
-            '8b6f8b0798e77b945bad03cb01b1dbd654b18b0e9adf39cb5106ccfa104530a6'
-            '7da842a8f487e0948d34b0ed743ae48d43daee09f6f241fb2516be7e06d2c87c'
-            'b089eaa1a7fe97f3f6fc66c8d6f93ae9cb69db8b93711adabb4b2bd5a57b150e'
-            '68eb9b5de88d562db961bb835dc55069474b7be3ce52b0909da95a74e8a69667'
-            'fabfa40b42fac7a41231d4484bad2b9310bda9b441a887e9c38869f19353649a'
+            'c83f4bb4b86877ceae5bf481419776e3f19876b2a1e5f481446ed2d5f4ff6766'
+            '9c9b379ccf549b0826620d9d4468cba1f8c40f18c5ab1ed6da409d2b628eaad2'
+            '50f7b54e946224e9eb10b9ac51e344582038b9cd0469b64380f8809ac61ae796'
+            '0f79260c148461a303da06a869890c22b7bb2984b6d01075cfc59bdefd988582'
+            '4aa6ffc3b8c66f2ef23f234570196e1209d2abb9ce0a5c7bfbc1321b2e81b68e'
             'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
 validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl@gnu.org>
 
 pkgver() {
   local _tag _count
 
-  cd "$srcdir/freetype2"
+  cd freetype
   _tag=$(git describe --abbrev=0 )
   _count=$(git rev-list --count $_tag..HEAD)
   _tag=${_tag#VER-}
@@ -43,7 +43,7 @@ pkgver() {
 }
 
 prepare() {
-  cd 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
@@ -52,14 +52,14 @@ prepare() {
 
   ./autogen.sh
 
-  cd ../freetype2-demos
+  cd ../freetype-demos
 
   # Suppress RPATH
   sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
 }
 
 build() {
-  cd freetype2
+  cd freetype
   ./configure --prefix=/usr --disable-static
   make
 
@@ -67,12 +67,12 @@ build() {
   make refdoc-venv
 
   # Build demos
-  cd ../freetype2-demos
+  cd ../freetype-demos
   make
 }
 
 check() {
-  cd freetype2
+  cd freetype
   make -k check
 }
 
@@ -82,7 +82,7 @@ package_freetype2-git() {
   install=freetype2.install
   backup=(etc/profile.d/freetype2.sh)
 
-  cd freetype2
+  cd freetype
   make DESTDIR="$pkgdir" install
   install -Dt "$pkgdir/etc/profile.d" -m644 ../freetype2.sh
 }
@@ -93,7 +93,7 @@ package_freetype2-demos-git() {
   provides=("freetype2-demos=$pkgver")
   conflicts=(freetype2-demos)
 
-  cd 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"
@@ -106,9 +106,10 @@ package_freetype2-docs-git() {
   provides=("freetype2-docs=$pkgver")
   conflicts=(freetype2-docs)
 
-  cd freetype2
+  cd freetype
   install -d "$pkgdir/usr/share/doc"
   cp -a docs "$pkgdir/usr/share/doc/freetype2"
+  rm -r "$pkgdir/usr/share/doc/freetype2/env"
 }
 
 # vim:set ts=2 sw=2 et: