2.10.3

7 files changed, 56 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca28d79955c7..cb0b8cafd6d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.2+p40+gb7c467b6e
+	pkgver = 2.10.3+p0+g337670af0
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
-	arch = i686
 	arch = x86_64
+	arch = i686
 	license = GPL
 	makedepends = libx11
 	makedepends = git
@@ -26,17 +26,17 @@ pkgbase = freetype2-git
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 44395c31c36255ea0e5c96c03df92cc975e55e28b0c80fbb0da3d9f05e50a150
-	sha256sums = 67abb3c86fa9a72c5f78bb390c6e09f4277a76e84a2a291798ed6b5362c2fcf7
-	sha256sums = b92a8421ea4ab3e7ee7173f7de51d98bff376663662772a952e7a4cad4bf10f3
-	sha256sums = df0c73f02040c64bed479e41b86da7a4890d1ab31eab20c75e850aab1b86250b
-	sha256sums = 1b7d38b082d32b19d5fd21c17c9ae187ada00f9c978dc2877edebbe19a9da9ed
+	sha256sums = f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1
+	sha256sums = dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7
+	sha256sums = 21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f
+	sha256sums = 266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e
+	sha256sums = 04e622f514bc0ae6ecd21c8050115e2356058fcb49bc21d0f54358972f5d5639
 	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.10.2+p40+gb7c467b6e
+	provides = freetype2=2.10.3+p0+g337670af0
 	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.2+p40+gb7c467b6e
+	provides = freetype2-demos=2.10.3+p0+g337670af0
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.2+p40+gb7c467b6e
+	provides = freetype2-docs=2.10.3+p0+g337670af0
 	conflicts = freetype2-docs
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index d017d5d05262..4c469faf6313 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,7 +1,7 @@
-From 68277dfaeac91da6ecd9ca8948591b58c2aa4999 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/5] Enable table validation modules
+Subject: [PATCH] Enable table validation modules
 
 ---
  modules.cfg | 4 ++--
@@ -40,6 +40,3 @@ index d6cdbe523..181f91541 100644
  
  # Auxiliary PostScript driver component to share common code.
  #
--- 
-2.27.0
-
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index fd52d2c474de..26360b5c04b7 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,14 +1,14 @@
-From 40dba82266ae30ba29dce9bef6eb98c72c983a03 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/5] Enable subpixel rendering
+Subject: [PATCH] Enable subpixel rendering
 
 ---
  include/freetype/config/ftoption.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index fd686d954..2e4e05273 100644
+index 097f19b8a..e5de62e35 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -124,7 +124,7 @@ FT_BEGIN_HEADER
@@ -20,6 +20,3 @@ index fd686d954..2e4e05273 100644
  
  
    /**************************************************************************
--- 
-2.27.0
-
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index 9ee057c25c8d..d2369893a92b 100644
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -1,14 +1,14 @@
-From e7f309c526b98d9de21527c4216fa536cc8379ec Mon Sep 17 00:00:00 2001
+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 3/5] Enable infinality subpixel hinting
+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 2e4e05273..6fc26a0bb 100644
+index e5de62e35..acb4d6d6a 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -672,8 +672,8 @@ FT_BEGIN_HEADER
@@ -22,6 +22,3 @@ index 2e4e05273..6fc26a0bb 100644
  
  
    /**************************************************************************
--- 
-2.27.0
-
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
index 657f799bdc23..45fb72c4b5f8 100644
--- a/0004-Enable-long-PCF-family-names.patch
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -1,14 +1,14 @@
-From ee8a9f58fb102d85cd0f473489094d9624c00705 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Sun, 14 May 2017 18:09:31 +0200
-Subject: [PATCH 4/5] Enable long PCF family names
+Subject: [PATCH] Enable long PCF family names
 
 ---
  include/freetype/config/ftoption.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 6fc26a0bb..776a7e938 100644
+index acb4d6d6a..efa13b9c6 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -861,7 +861,7 @@ FT_BEGIN_HEADER
@@ -20,6 +20,3 @@ index 6fc26a0bb..776a7e938 100644
  
  
    /*************************************************************************/
--- 
-2.27.0
-
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 94fd614f298b..8ee0e83ea3bb 100644
--- a/0005-Enable-old-engines-but-keep-adobe-as-default.patch
+++ b/0005-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -1,7 +1,7 @@
-From 4a9da1400b53567f30effea451b7531338e0a049 Mon Sep 17 00:00:00 2001
+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 5/5] Enable old engines, but keep adobe as default
+Subject: [PATCH] Enable old engines, but keep adobe as default
 
 ---
  include/freetype/config/ftoption.h | 4 ++--
@@ -11,7 +11,7 @@ Subject: [PATCH 5/5] Enable old engines, but keep adobe as default
  4 files changed, 2 insertions(+), 14 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 776a7e938..71d9fba3c 100644
+index efa13b9c6..f3b35758c 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -792,7 +792,7 @@ FT_BEGIN_HEADER
@@ -33,10 +33,10 @@ index 776a7e938..71d9fba3c 100644
  
    /*************************************************************************/
 diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
-index 5e5831568..c66857037 100644
+index d555d5235..418c0c0ae 100644
 --- a/src/cff/cffobjs.c
 +++ b/src/cff/cffobjs.c
-@@ -1163,11 +1163,7 @@
+@@ -1174,11 +1174,7 @@
  
  
      /* set default property values, cf. `ftcffdrv.h' */
@@ -49,7 +49,7 @@ index 5e5831568..c66857037 100644
      driver->no_stem_darkening = TRUE;
  
 diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
-index 67dae5e1a..11ed32228 100644
+index 04b295eb8..53a8f1554 100644
 --- a/src/cid/cidobjs.c
 +++ b/src/cid/cidobjs.c
 @@ -479,11 +479,7 @@
@@ -65,10 +65,10 @@ index 67dae5e1a..11ed32228 100644
      driver->no_stem_darkening = TRUE;
  
 diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
-index ff2786ba2..fceb7bbfc 100644
+index 3b918b733..d85bf5c64 100644
 --- a/src/type1/t1objs.c
 +++ b/src/type1/t1objs.c
-@@ -599,11 +599,7 @@
+@@ -598,11 +598,7 @@
  
  
      /* set default property values, cf. `ftt1drv.h' */
@@ -80,6 +80,3 @@ index ff2786ba2..fceb7bbfc 100644
  
      driver->no_stem_darkening = TRUE;
  
--- 
-2.27.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 706c745c545e..c004eed31760 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=freetype2-git
-pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.10.2+p40+gb7c467b6e
+pkgname=(freetype2-git freetype2-demos-git freetype2-docs-git)
+pkgver=2.10.3+p0+g337670af0
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
-arch=(i686 x86_64)
-license=('GPL')
 url="https://www.freetype.org/"
+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')
+depends=(zlib bzip2 sh libpng harfbuzz)
+makedepends=(libx11 git python)
 source=(git://git.sv.gnu.org/freetype/freetype2.git
         git://git.sv.gnu.org/freetype/freetype2-demos.git
         0001-Enable-table-validation-modules.patch
@@ -24,20 +24,20 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
         freetype2.sh)
 sha256sums=('SKIP'
             'SKIP'
-            '44395c31c36255ea0e5c96c03df92cc975e55e28b0c80fbb0da3d9f05e50a150'
-            '67abb3c86fa9a72c5f78bb390c6e09f4277a76e84a2a291798ed6b5362c2fcf7'
-            'b92a8421ea4ab3e7ee7173f7de51d98bff376663662772a952e7a4cad4bf10f3'
-            'df0c73f02040c64bed479e41b86da7a4890d1ab31eab20c75e850aab1b86250b'
-            '1b7d38b082d32b19d5fd21c17c9ae187ada00f9c978dc2877edebbe19a9da9ed'
+            'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1'
+            'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7'
+            '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f'
+            '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e'
+            '04e622f514bc0ae6ecd21c8050115e2356058fcb49bc21d0f54358972f5d5639'
             'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl@gnu.org>
 
 pkgver() {
   local _tag _count
 
-  cd "${srcdir}/freetype2"
+  cd "$srcdir/freetype2"
   _tag=$(git describe --abbrev=0 )
-  _count=$(git rev-list --count ${_tag}..HEAD)
+  _count=$(git rev-list --count $_tag..HEAD)
   _tag=${_tag#VER-}
   echo ${_tag//-/.}+p$_count+g$(git rev-parse --short HEAD)
 }
@@ -82,38 +82,38 @@ check() {
 }
 
 package_freetype2-git() {
-  provides=('libfreetype.so' "freetype2=$pkgver")
-  conflicts=('freetype2')
+  provides=(libfreetype.so "freetype2=$pkgver")
+  conflicts=(freetype2)
   install=freetype2.install
-  backup=('etc/profile.d/freetype2.sh')
+  backup=(etc/profile.d/freetype2.sh)
 
   cd freetype2
-  make DESTDIR="${pkgdir}" install
-  install -Dt "${pkgdir}/etc/profile.d" -m644 ../freetype2.sh
+  make DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/etc/profile.d" -m644 ../freetype2.sh
 }
 
 package_freetype2-demos-git() {
   pkgdesc="Freetype tools and demos (from git)"
-  depends=('freetype2-git' 'libx11')
+  depends=(freetype2-git libx11)
   provides=("freetype2-demos=$pkgver")
-  conflicts=('freetype2-demos')
+  conflicts=(freetype2-demos)
 
   cd freetype2-demos
-  install -d "${pkgdir}/usr/bin"
+  install -d "$pkgdir/usr/bin"
   for _i in bin/{f,t}t*; do
-    libtool --mode=install install $_i "${pkgdir}/usr/bin"
+    libtool --mode=install install $_i "$pkgdir/usr/bin"
   done
 }
 
 package_freetype2-docs-git() {
   pkgdesc="Freetype documentation (from git)"
-  depends=('freetype2-git')
+  depends=(freetype2-git)
   provides=("freetype2-docs=$pkgver")
-  conflicts=('freetype2-docs')
+  conflicts=(freetype2-docs)
 
   cd freetype2
-  install -d "${pkgdir}/usr/share/doc"
-  cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+  install -d "$pkgdir/usr/share/doc"
+  cp -a docs "$pkgdir/usr/share/doc/freetype2"
 }
 
 # vim:set ts=2 sw=2 et: