Sync with repos version; libreoffice 7 works fine.

4 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b71121295297..69c14eb6e7a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libreoffice-uglyfix-freetype2
 	pkgdesc = Special private freetype library to prevent autohinting in LibreOffice
-	pkgver = 2.9
+	pkgver = 2.10.2
 	pkgrel = 1
 	url = http://www.freetype.org/
 	arch = i686
@@ -12,13 +12,13 @@ pkgbase = libreoffice-uglyfix-freetype2
 	depends = harfbuzz
 	depends = libreoffice
 	options = !docs
-	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 = http://download.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz.sig
 	source = lo-freetype.patch
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
-	sha384sums = ef34e1189b3fcd1b539c32a19ebbec0aedb9906a74ce27646727652b26c9d6b1f159778a01f3dcc4d7814d473fd29f6f
-	sha384sums = SKIP
-	sha384sums = d8f6ea143758ce404501ce06d8294ee907c98438a103d61c70cbe697aafdb732549557ecece04066b37f8eb1750fea5e
+	b2sums = 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa
+	b2sums = SKIP
+	b2sums = 031a8f422cdd2b9ae994e7ff9b32594aae28e11996e4d18b64f2a395be19310be1339fea5342be5127b7acb410072b2cf4abd9ef5121fc13f2ed8173f2e4f36d
 
 pkgname = libreoffice-uglyfix-freetype2
 
diff --git a/.gitignore b/.gitignore
index 5843d8ef21c7..fb50cebaa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,11 @@
 pkg/
 src/
 *.sig
-*.gz
-*.bz2
-*.xz
-*.lzo
-*.xz4
 *.tgz
 *.tbz
 *.txz
 *.tar
+*.tar.*
 *.jar
 *.zip
+*.rej
diff --git a/PKGBUILD b/PKGBUILD
index 0d2b1c6e2cce..99aab19e6296 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: P. A. López-Valencia <https://aur.archlinux.org/users/vorbote/>
 
 pkgname=libreoffice-uglyfix-freetype2
-pkgver=2.9
+pkgver=2.10.2
 pkgrel=1
 pkgdesc="Special private freetype library to prevent autohinting in LibreOffice"
 arch=(i686 x86_64)
@@ -9,11 +9,11 @@ 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}
+source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.xz{,.sig}
         lo-freetype.patch)
-sha384sums=('ef34e1189b3fcd1b539c32a19ebbec0aedb9906a74ce27646727652b26c9d6b1f159778a01f3dcc4d7814d473fd29f6f'
-            'SKIP'
-            'd8f6ea143758ce404501ce06d8294ee907c98438a103d61c70cbe697aafdb732549557ecece04066b37f8eb1750fea5e')
+b2sums=('866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa'
+        'SKIP'
+        '031a8f422cdd2b9ae994e7ff9b32594aae28e11996e4d18b64f2a395be19310be1339fea5342be5127b7acb410072b2cf4abd9ef5121fc13f2ed8173f2e4f36d')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 prepare() {
diff --git a/lo-freetype.patch b/lo-freetype.patch
index b32eeed2316e..5d0adcb3fe22 100644
--- a/lo-freetype.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	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 @@
+--- a/include/freetype/freetype.h	2020-05-08 04:01:46.000000000 -0500
++++ b/include/freetype/freetype.h	2020-09-05 11:10:10.006543813 -0500
+@@ -3037,7 +3037,7 @@
  #define FT_LOAD_RENDER                       ( 1L << 2 )
  #define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
  #define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
@@ -10,12 +10,12 @@ 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 )
-@@ -3019,7 +3019,7 @@
+@@ -3045,7 +3045,7 @@
  #define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
  #define FT_LOAD_MONOCHROME                   ( 1L << 12 )
  #define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
 -#define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
 +#define FT_LOAD_FORCE_AUTOHINT               ( 1L << 15 )
-   /* Bits 16-19 are used by `FT_LOAD_TARGET_' */
+   /* Bits 16-19 are used by `FT_LOAD_TARGET_` */
  #define FT_LOAD_COLOR                        ( 1L << 20 )
  #define FT_LOAD_COMPUTE_METRICS              ( 1L << 21 )