Redo patching. Go for a minimal change.

7 files changed, 18 insertions, 167 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf929ee50052..b71121295297 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libreoffice-uglyfix-freetype2
-	pkgdesc = TrueType font rendering library
-	pkgver = 2.8.1
+	pkgdesc = Special private freetype library to prevent autohinting in LibreOffice
+	pkgver = 2.9
 	pkgrel = 1
 	url = http://www.freetype.org/
 	arch = i686
@@ -12,19 +12,13 @@ pkgbase = libreoffice-uglyfix-freetype2
 	depends = harfbuzz
 	depends = libreoffice
 	options = !docs
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.bz2.sig
-	source = libreoffice-uglyfix-noautohint.patch
-	source = 0001-Enable-table-validation-modules.patch
-	source = 0003-Enable-infinality-subpixel-hinting.patch
-	source = 0004-Enable-long-PCF-family-names.patch
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2.sig
+	source = lo-freetype.patch
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
-	sha384sums = ce6bb0163feee05388c34fbe1379c6bc86802385b147864bc610cdf397b5e84578a7f6e774b02e2615514b57aa44f4b8
+	sha384sums = ef34e1189b3fcd1b539c32a19ebbec0aedb9906a74ce27646727652b26c9d6b1f159778a01f3dcc4d7814d473fd29f6f
 	sha384sums = SKIP
-	sha384sums = 51cd38441d7f4e92172b376324d959261bb41a427fd01df01badcbe13cdabf67d17101548b309640d3cc3c47c18ac5aa
-	sha384sums = 2b047946d7da45ad8cac5b7f4929bbaefe742867cc33620af36bedd26ed20e0a53b97e7a740ad7bed2502f8ea2067da9
-	sha384sums = 950be33ca918e769291cac1d5349739737281089d0ff812d329dbe8ca92fad07245b6d74629012a43249a40b92e68f8f
-	sha384sums = 7e2a34397eaafadcf247cb3380d61ee73d4658680fc14f5c4067e4c981d97f3799bbfacd79b22a8827b157fcadc558a3
+	sha384sums = d8f6ea143758ce404501ce06d8294ee907c98438a103d61c70cbe697aafdb732549557ecece04066b37f8eb1750fea5e
 
 pkgname = libreoffice-uglyfix-freetype2
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
deleted file mode 100644
index 5508d421e0c6..000000000000
--- a/0001-Enable-table-validation-modules.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/4] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index 517111efeb642459..64b2a34d510ce8f7 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,30 +120,30 @@ AUX_MODULES += cache
- # 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).
- #
- # 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.
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
--- 
-2.13.0
-
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
deleted file mode 100644
index dfb57966e2ff..000000000000
--- a/0002-Enable-subpixel-rendering.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 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
-
----
- 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
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
-   /* This is done to allow FreeType clients to run unmodified, forcing     */
-   /* them to display normal gray-level anti-aliased glyphs.                */
-   /*                                                                       */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- 
- 
-   /*************************************************************************/
--- 
-2.9.3
-
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
deleted file mode 100644
index b8f74de22e97..000000000000
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/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 1126716626b570df..ebb44acdbbef9a47 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -684,8 +684,8 @@ FT_BEGIN_HEADER
-   /* [1] http://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 )
- 
- 
-   /*************************************************************************/
--- 
-2.13.0
-
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
deleted file mode 100644
index 675423a7c472..000000000000
--- a/0004-Enable-long-PCF-family-names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 62da6a0f7f5cb77859a793863c386c452411e2a6 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/4] 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 ebb44acdbbef9a47..0b39b417162707e4 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -865,7 +865,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.             */
-   /*                                                                       */
--/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
-+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
- 
- 
-   /*************************************************************************/
--- 
-2.13.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 2c0f4112184d..0d2b1c6e2cce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,24 @@
 # Maintainer: P. A. López-Valencia <https://aur.archlinux.org/users/vorbote/>
 
 pkgname=libreoffice-uglyfix-freetype2
-pkgver=2.8.1
+pkgver=2.9
 pkgrel=1
-pkgdesc="TrueType font rendering library"
+pkgdesc="Special private freetype library to prevent autohinting in LibreOffice"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.freetype.org/"
 depends=('zlib' 'bzip2' 'libpng' 'harfbuzz' 'libreoffice')
 options=(!docs)
 source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        libreoffice-uglyfix-noautohint.patch
-        0001-Enable-table-validation-modules.patch
-        0003-Enable-infinality-subpixel-hinting.patch
-        0004-Enable-long-PCF-family-names.patch)
-sha384sums=('ce6bb0163feee05388c34fbe1379c6bc86802385b147864bc610cdf397b5e84578a7f6e774b02e2615514b57aa44f4b8'
+        lo-freetype.patch)
+sha384sums=('ef34e1189b3fcd1b539c32a19ebbec0aedb9906a74ce27646727652b26c9d6b1f159778a01f3dcc4d7814d473fd29f6f'
             'SKIP'
-            '51cd38441d7f4e92172b376324d959261bb41a427fd01df01badcbe13cdabf67d17101548b309640d3cc3c47c18ac5aa'
-            '2b047946d7da45ad8cac5b7f4929bbaefe742867cc33620af36bedd26ed20e0a53b97e7a740ad7bed2502f8ea2067da9'
-            '950be33ca918e769291cac1d5349739737281089d0ff812d329dbe8ca92fad07245b6d74629012a43249a40b92e68f8f'
-            '7e2a34397eaafadcf247cb3380d61ee73d4658680fc14f5c4067e4c981d97f3799bbfacd79b22a8827b157fcadc558a3')
+            'd8f6ea143758ce404501ce06d8294ee907c98438a103d61c70cbe697aafdb732549557ecece04066b37f8eb1750fea5e')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 prepare() {
-  # Rename source dir to allow building the demos
   cd freetype-$pkgver
-
-  patch -Np1 -i ../libreoffice-uglyfix-noautohint.patch
-
-  patch -Np1 -i ../0001-Enable-table-validation-modules.patch
-  patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-  patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+  patch -Np1 -i ../lo-freetype.patch
 }
 
 build() {
@@ -39,13 +27,8 @@ build() {
   make
 }
 
-check() {
-  cd freetype-$pkgver
-  make -k check
-}
-
 package() {
   cd freetype-$pkgver
 
-  install -Dm755 "$srcdir/freetype-$pkgver/objs/.libs/libfreetype.so" "$pkgdir/usr/lib/libreoffice/program/libfreetype.so"
+  install -Dm755 "$srcdir/freetype-$pkgver/objs/.libs/libfreetype.so" "$pkgdir/usr/lib/libreoffice/program/libfreetype.so.6"
 }
diff --git a/libreoffice-uglyfix-noautohint.patch b/lo-freetype.patch
index 29d87d11027b..b32eeed2316e 100644
--- a/libreoffice-uglyfix-noautohint.patch
+++ b/lo-freetype.patch
@@ -1,7 +1,7 @@
 diff -urN a/include/freetype/freetype.h b/include/freetype/freetype.h
---- a/include/freetype/freetype.h	2017-09-16 07:32:52.000000000 -0500
-+++ b/include/freetype/freetype.h	2017-09-29 12:32:37.164910313 -0500
-@@ -2926,7 +2926,7 @@
+--- a/include/freetype/freetype.h	2018-01-08 05:22:36.000000000 -0500
++++ b/include/freetype/freetype.h	2018-01-09 09:49:57.062208924 -0500
+@@ -3011,7 +3011,7 @@
  #define FT_LOAD_RENDER                       ( 1L << 2 )
  #define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
  #define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
@@ -10,7 +10,7 @@ diff -urN a/include/freetype/freetype.h b/include/freetype/freetype.h
  #define FT_LOAD_CROP_BITMAP                  ( 1L << 6 )
  #define FT_LOAD_PEDANTIC                     ( 1L << 7 )
  #define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  ( 1L << 9 )
-@@ -2934,7 +2934,7 @@
+@@ -3019,7 +3019,7 @@
  #define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
  #define FT_LOAD_MONOCHROME                   ( 1L << 12 )
  #define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )