Upstream update

3 files changed, 47 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78f346e1c327..6295309df399 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-ultimate5
 	pkgdesc = FreeType patched for effect similar to Infinality's ultimate5 preset.
-	pkgver = 2.9.1
+	pkgver = 2.10.0
 	pkgrel = 1
 	url = https://www.freetype.org/
 	arch = x86_64
@@ -10,19 +10,19 @@ pkgbase = freetype2-ultimate5
 	depends = bzip2
 	depends = libpng
 	depends = harfbuzz
-	provides = freetype2=2.9.1
+	provides = freetype2=2.10.0
 	provides = libfreetype.so
 	conflicts = freetype2
 	source = like-ultimate5.patch
-	source = upstream_1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?h=packages/freetype2&id=72c442c80be19348b3dad3285ad2646a1d91d3f2
-	source = upstream_2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0002-Enable-infinality-subpixel-hinting.patch?h=packages/freetype2&id=72c442c80be19348b3dad3285ad2646a1d91d3f2
-	source = upstream_3.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0003-Enable-long-PCF-family-names.patch?h=packages/freetype2&id=72c442c80be19348b3dad3285ad2646a1d91d3f2
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2
-	sha1sums = 97253086dd201b7e368e8ee897a0c977b0908c4e
-	sha1sums = d9eb22e5c962923089b0c9fc5491cf28a19bd982
-	sha1sums = d13503902e0404cf3558db76b477f23f9910d06e
-	sha1sums = fc49742fb6c19fe0677e3552bb7c00aac8530265
-	sha1sums = 220c82062171c513e4017c523d196933c9de4a7d
+	source = upstream_1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?h=packages/freetype2&id=df0c9a0527d8d4d1f128191c0d3ed454a6f523ab
+	source = upstream_2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0002-Enable-infinality-subpixel-hinting.patch?h=packages/freetype2&id=df0c9a0527d8d4d1f128191c0d3ed454a6f523ab
+	source = upstream_3.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0003-Enable-long-PCF-family-names.patch?h=packages/freetype2&id=df0c9a0527d8d4d1f128191c0d3ed454a6f523ab
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2
+	sha1sums = 4d111cc93d9a7aca79b4a75ccd069df08aa2ad26
+	sha1sums = 46fd67e6a594f6c2c473b9321ba64913984ba42f
+	sha1sums = 4bf0c0749db09878b918cc404300f0d3e9091607
+	sha1sums = af76172be8135e74391b7ad1b82c2124ae0ad86c
+	sha1sums = f6abf03e0e3189a0de883981c57d3861b5d314f5
 
 pkgname = freetype2-ultimate5
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fef2aac4453..fd88f409406b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,10 +9,10 @@
 # * https://github.com/bohoomil/fontconfig-ultimate/blob/master/freetype/03-infinality-2.6.3-2016.04.16.patch#L2092
 # * https://www.reddit.com/r/archlinux/comments/5qkvqb/best_way_to_approximate_infinalitys_ultimate5
 
-__arch_pkg_commit="72c442c80be19348b3dad3285ad2646a1d91d3f2"
+__arch_pkg_commit="df0c9a0527d8d4d1f128191c0d3ed454a6f523ab"
 
 pkgname=freetype2-ultimate5
-pkgver=2.9.1
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="FreeType patched for effect similar to Infinality's ultimate5 preset."
 url="https://www.freetype.org/"
@@ -35,11 +35,11 @@ source=(
 	https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2
 )
 sha1sums=(
-	"97253086dd201b7e368e8ee897a0c977b0908c4e"
-	"d9eb22e5c962923089b0c9fc5491cf28a19bd982"
-	"d13503902e0404cf3558db76b477f23f9910d06e"
-	"fc49742fb6c19fe0677e3552bb7c00aac8530265"
-	"220c82062171c513e4017c523d196933c9de4a7d"
+	"4d111cc93d9a7aca79b4a75ccd069df08aa2ad26"
+	"46fd67e6a594f6c2c473b9321ba64913984ba42f"
+	"4bf0c0749db09878b918cc404300f0d3e9091607"
+	"af76172be8135e74391b7ad1b82c2124ae0ad86c"
+	"f6abf03e0e3189a0de883981c57d3861b5d314f5"
 )
 
 prepare()
@@ -52,7 +52,7 @@ prepare()
 	done
 
 	# Apply this patch.
-	patch -p 0 -i "$srcdir/like-ultimate5.patch"
+	patch -p 1 -i "$srcdir/like-ultimate5.patch"
 }
 
 build()
diff --git a/like-ultimate5.patch b/like-ultimate5.patch
index 0af17ceb7be8..b43b905a2c74 100644
--- a/like-ultimate5.patch
+++ b/like-ultimate5.patch
@@ -1,29 +1,29 @@
-diff --color -U 7 -r -Z -B include/freetype/config/ftoption.h include/freetype/config/ftoption.h
---- include/freetype/config/ftoption.h	2018-01-03 19:00:18.000000000 +0100
-+++ include/freetype/config/ftoption.h	2018-01-12 21:03:10.576887258 +0100
-@@ -114,15 +114,15 @@
-   /*                                                                       */
-   /* Note that this feature is covered by several Microsoft patents        */
-   /* and should not be activated in any default build of the library.      */
-   /* When this macro is not defined, FreeType offers alternative LCD       */
-   /* rendering technology that produces excellent output without LCD       */
-   /* filtering.                                                            */
-   /*                                                                       */
+diff -U 7 -r -Z -B orig/include/freetype/config/ftoption.h mod/include/freetype/config/ftoption.h
+--- orig/include/freetype/config/ftoption.h	2019-02-23 10:09:06.000000000 +0100
++++ mod/include/freetype/config/ftoption.h	2019-03-15 23:15:20.990994130 +0100
+@@ -122,15 +122,15 @@
+    * explicitly set up LCD filtering.
+    *
+    * Note that this feature is covered by several Microsoft patents and
+    * should not be activated in any default build of the library.  When this
+    * macro is not defined, FreeType offers alternative LCD rendering
+    * technology that produces excellent output without LCD filtering.
+    */
 -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+ #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
-   /*************************************************************************/
-   /*                                                                       */
-   /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
-   /* by FreeType to speed up some computations.  However, this will create */
-   /* some problems when compiling the library in strict ANSI mode.         */
-diff --color -U 7 -r -Z -B src/base/ftlcdfil.c src/base/ftlcdfil.c
---- src/base/ftlcdfil.c	2018-01-03 19:00:18.000000000 +0100
-+++ src/base/ftlcdfil.c	2018-01-12 20:58:45.183540775 +0100
-@@ -293,15 +293,15 @@
-
-
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /**************************************************************************
+    *
+    * Many compilers provide a non-ANSI 64-bit data type that can be used by
+    * FreeType to speed up some computations.  However, this will create some
+    * problems when compiling the library in strict ANSI mode.
+diff -U 7 -r -Z -B orig/src/base/ftlcdfil.c mod/src/base/ftlcdfil.c
+--- orig/src/base/ftlcdfil.c	2019-02-23 10:06:07.000000000 +0100
++++ mod/src/base/ftlcdfil.c	2019-03-15 23:16:20.003565521 +0100
+@@ -307,15 +307,15 @@
+   /* documentation in ftlcdfil.h */
+ 
    FT_EXPORT_DEF( FT_Error )
    FT_Library_SetLcdFilter( FT_Library    library,
                             FT_LcdFilter  filter )
@@ -33,8 +33,8 @@ diff --color -U 7 -r -Z -B src/base/ftlcdfil.c src/base/ftlcdfil.c
 +                   { 0x1f, 0x47, 0x6B, 0x47, 0x1f };
      static const FT_LcdFiveTapFilter  light_weights =
                     { 0x00, 0x55, 0x56, 0x55, 0x00 };
-
-
+ 
+ 
      if ( !library )
        return FT_THROW( Invalid_Library_Handle );
-
+