lib32-freetype2-old-hinting-2.8.1-1

5 files changed, 43 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0f463daf9e2..ec7587c1541e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-freetype2-old-hinting
 	pkgdesc = TrueType font rendering library (including the old hinting engine; 32-bit)
-	pkgver = 2.8
-	pkgrel = 2
+	pkgver = 2.8.1
+	pkgrel = 1
 	url = https://www.freetype.org/
 	arch = x86_64
 	license = GPL
@@ -12,19 +12,17 @@ pkgbase = lib32-freetype2-old-hinting
 	depends = lib32-harfbuzz
 	depends = freetype2
 	provides = libfreetype.so
-	provides = lib32-freetype2=2.8-2
+	provides = lib32-freetype2=2.8.1-1
 	conflicts = lib32-freetype2
-	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.bz2
-	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.bz2.sig
+	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.bz2
+	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.bz2.sig
 	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
-	sha1sums = 42c6b1f733fe13a3eba135f5025b22cb68450f91
+	sha1sums = 417bb3747c4ac95b6f2652024a53fad45581fa1c
 	sha1sums = SKIP
-	sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
-	sha1sums = b1494810ed3aca25cdd8e8cedf634e5adfe6c09e
-	sha1sums = 41d27140fd590945e22e012c9dce62de3d6f11e6
+	sha1sums = c3e91e668936206d3c158bffde0f69788a086a5b
+	sha1sums = 81586014ea44375ddc85dd9dbcabae6e91c34d62
 	sha1sums = 334f229875039794adeb574e27d365bb445fb314
 
 pkgname = lib32-freetype2-old-hinting
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 3e9451fa8b82..5508d421e0c6 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,17 +1,17 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
+From 17dd2751813c3c8b37dac474cc5024473eb9bece 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/3] Enable table validation modules
+Subject: [PATCH 1/4] Enable table validation modules
 
 ---
  modules.cfg | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index f30049c38cc45159..7b8e50fe1b34584a 100644
+index 517111efeb642459..64b2a34d510ce8f7 100644
 --- a/modules.cfg
 +++ b/modules.cfg
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
+@@ -120,30 +120,30 @@ AUX_MODULES += cache
  # TrueType GX/AAT table validation.  Needs ftgxval.c below.
  #
  # No FT_CONFIG_OPTION_PIC support.
@@ -20,7 +20,22 @@ index f30049c38cc45159..7b8e50fe1b34584a 100644
  
  # Support for streams compressed with gzip (files with suffix .gz).
  #
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
+ # See include/freetype/ftgzip.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += gzip
+ 
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += lzw
+ 
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += bzip2
+ 
  # OpenType table validation.  Needs ftotval.c below.
  #
  # No FT_CONFIG_OPTION_PIC support.
@@ -30,5 +45,5 @@ index f30049c38cc45159..7b8e50fe1b34584a 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.9.3
+2.13.0
 
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index dfb57966e2ff..66b41029b3fd 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,14 +1,14 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
+From a8f7f3068a8a5f94adfc77f4ddf03bf08da38f9b 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/3] Enable subpixel rendering
+Subject: [PATCH 2/4] 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 90c123ef93e9ea04..67a361dd41e0b026 100644
+index 1bf6e8f534ff0734..1126716626b570df 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -122,7 +122,7 @@ FT_BEGIN_HEADER
@@ -21,5 +21,5 @@ index 90c123ef93e9ea04..67a361dd41e0b026 100644
  
    /*************************************************************************/
 -- 
-2.9.3
+2.13.0
 
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index bbfa2a2cd8c0..b8f74de22e97 100644
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -1,17 +1,17 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From 239cd8209c8d15a641d4548d386aeae4853b7d23 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/3] Enable infinality subpixel hinting
+Subject: [PATCH 3/4] 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 67a361dd41e0b026..c4812862518b66a6 100644
+index 1126716626b570df..ebb44acdbbef9a47 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
+@@ -684,8 +684,8 @@ FT_BEGIN_HEADER
    /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
    /*                                                                       */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
@@ -23,5 +23,5 @@ index 67a361dd41e0b026..c4812862518b66a6 100644
  
    /*************************************************************************/
 -- 
-2.9.3
+2.13.0
 
diff --git a/PKGBUILD b/PKGBUILD
index f8a62d8cc7c6..6d708fdaeba5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 _pkgbasename=freetype2
 pkgname=lib32-$_pkgbasename-old-hinting
-pkgver=2.8
-pkgrel=2
+pkgver=2.8.1
+pkgrel=1
 pkgdesc="TrueType font rendering library (including the old hinting engine; 32-bit)"
 arch=(x86_64)
 license=('GPL')
@@ -19,14 +19,12 @@ provides=('libfreetype.so' "lib32-$_pkgbasename=$pkgver-$pkgrel")
 conflicts=("lib32-$_pkgbasename")
 source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
         0001-Enable-table-validation-modules.patch
-        0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
         0004-Enable-long-PCF-family-names.patch)
-sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
+sha1sums=('417bb3747c4ac95b6f2652024a53fad45581fa1c'
           'SKIP'
-          'b31882ef5e8447e761acee1c4a44c0630cd4d465'
-          'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
-          '41d27140fd590945e22e012c9dce62de3d6f11e6'
+          'c3e91e668936206d3c158bffde0f69788a086a5b'
+          '81586014ea44375ddc85dd9dbcabae6e91c34d62'
           '334f229875039794adeb574e27d365bb445fb314')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
@@ -36,7 +34,6 @@ prepare() {
 
   cd freetype2
   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