Redo patching. Go for a minimal change.

1 files changed, 7 insertions, 24 deletions

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"
 }