From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH] main/freetype: upgrade to 2.10.0
Date: Sun, 17 Mar 2019 12:18:49 +0000
Message-Id: <20190317121849.3697-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Refresh patches, to suit new version.
---
 ...0001-Enable-table-validation-modules.patch | 31 ++++++-------------
 main/freetype/APKBUILD                        | 10 +++---
 main/freetype/subpixel.patch                  | 27 ++++++++--------
 3 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/main/freetype/0001-Enable-table-validation-modules.patch b/main/freetype/0001-Enable-table-validation-modules.patch
index 3e9451fa8b..968475e391 100644
--- a/main/freetype/0001-Enable-table-validation-modules.patch
+++ b/main/freetype/0001-Enable-table-validation-modules.patch
@@ -1,34 +1,21 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 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
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index f30049c38cc45159..7b8e50fe1b34584a 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+diff -Naur a/modules.cfg b/modules.cfg
+--- a/modules.cfg	2019-02-23 09:06:07.000000000 +0000
++++ b/modules.cfg	2019-03-15 17:13:56.465952994 +0000
+@@ -111,7 +111,7 @@
+ 
+ # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
  #
- # No FT_CONFIG_OPTION_PIC support.
 -# AUX_MODULES += gxvalid
 +AUX_MODULES += gxvalid
  
  # Support for streams compressed with gzip (files with suffix .gz).
  #
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
- # OpenType table validation.  Needs ftotval.c below.
+@@ -130,7 +130,7 @@
+ 
+ # OpenType table validation.  Needs `ftotval.c' below.
  #
- # No FT_CONFIG_OPTION_PIC support.
 -# AUX_MODULES += otvalid
 +AUX_MODULES += otvalid
  
  # Auxiliary PostScript driver component to share common code.
  #
--- 
-2.9.3
-
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index c4363e5414..7e55119ea8 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=freetype
-pkgver=2.9.1
-pkgrel=2
+pkgver=2.10.0
+pkgrel=0
 pkgdesc="TrueType font rendering library"
 url="https://www.freetype.org/"
 arch="all"
@@ -54,6 +54,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708  freetype-2.9.1.tar.bz2
-41a84be2631b53072a76b78c582575aa48b650ee7b00017d018381002bc25df10cf33da4954c95ef50db39f1fa566678e3b4ae9bfee1dfd705423fb53e53e494  0001-Enable-table-validation-modules.patch
-6206ecbf733e47beeacd8dcec747be46ee74beffe9955ba11d61ccd81a7da6fe4bef81e15f2da8a57ded6245dc41b865f1297f120c2e332f643a43e18db99394  subpixel.patch"
+sha512sums="dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e  freetype-2.10.0.tar.bz2
+580fe59acddfd41966e387bdb6a88336b8bc119cc3d60d8689be20c96fb0dd07c5138ea31f6cb9c854f497ecb41c3adc49eb3ec16a34b2e010e8294851770763  0001-Enable-table-validation-modules.patch
+72883fa203fd2552a7b1b8c39b4aaa68d407c62c289236031cd0fa1c8cdc6ad38e90d3b53f8ee682064986d09c9455961f4941c80566b150d15d5539a716c190  subpixel.patch"
diff --git a/main/freetype/subpixel.patch b/main/freetype/subpixel.patch
index 60f7caca69..eb1300a0e0 100644
--- a/main/freetype/subpixel.patch
+++ b/main/freetype/subpixel.patch
@@ -1,22 +1,21 @@
---- a/include/freetype/config/ftoption.h.orig
-+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,7 @@
-   /* This is done to allow FreeType clients to run unmodified, forcing     */
-   /* them to display normal gray-level anti-aliased glyphs.                */
-   /*                                                                       */
+diff -Naur a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+--- a/include/freetype/config/ftoption.h	2019-02-23 09:09:06.000000000 +0000
++++ b/include/freetype/config/ftoption.h	2019-03-17 11:42:04.315011932 +0000
+@@ -126,7 +126,7 @@
+    * 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
  
  
-   /*************************************************************************/
-@@ -675,8 +675,8 @@
-   /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
-   /*                                                                       */
+   /**************************************************************************
+@@ -658,7 +658,7 @@
+    * 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 )
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  3
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
  
  
-   /*************************************************************************/
-- 
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---