Acrobat Reader is back working with freetype and fontconfig embedded.

2 files changed, 14 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dcf1949b9c6..bc0e8af4c41f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = acroread
 	pkgdesc = Adobe Acrobat Reader is a PDF file viewer
 	pkgver = 9.5.5
-	pkgrel = 19
+	pkgrel = 20
 	url = http://www.adobe.com/products/reader/
 	install = acroread.install
 	arch = i686
@@ -38,7 +38,8 @@ pkgbase = acroread
 	noextract = http://archlinux.arkena.net/archive/packages/l/lib32-cairo/lib32-cairo-1.14.10-1-x86_64.pkg.tar.xz
 	noextract = http://archlinux.arkena.net/archive/packages/l/lib32-libffi/lib32-libffi-3.2.1-2-x86_64.pkg.tar.xz
 	noextract = http://archlinux.arkena.net/archive/packages/l/lib32-libx11/lib32-libx11-1.6.9-1-x86_64.pkg.tar.xz
-	noextract = http://archlinux.arkena.net/archive/packages/l/lib32-freetype2/lib32-freetype2-2.6-1-x86_64.pkg.tar.xz
+	noextract = http://archlinux.arkena.net/archive/packages/l/lib32-freetype2/lib32-freetype2-2.9-2-x86_64.pkg.tar.xz
+	noextract = http://archlinux.arkena.net/archive/packages/l/lib32-fontconfig/lib32-fontconfig-2.13.0-1-x86_64.pkg.tar.xz
 	options = !strip
 	source = acroread.desktop
 	source = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.5/enu/AdbeRdr9.5.5-1_i486linux_enu.bin
@@ -56,7 +57,8 @@ pkgbase = acroread
 	source = http://archlinux.arkena.net/archive/packages/l/lib32-cairo/lib32-cairo-1.14.10-1-x86_64.pkg.tar.xz
 	source = http://archlinux.arkena.net/archive/packages/l/lib32-libffi/lib32-libffi-3.2.1-2-x86_64.pkg.tar.xz
 	source = http://archlinux.arkena.net/archive/packages/l/lib32-libx11/lib32-libx11-1.6.9-1-x86_64.pkg.tar.xz
-	source = http://archlinux.arkena.net/archive/packages/l/lib32-freetype2/lib32-freetype2-2.6-1-x86_64.pkg.tar.xz
+	source = http://archlinux.arkena.net/archive/packages/l/lib32-freetype2/lib32-freetype2-2.9-2-x86_64.pkg.tar.xz
+	source = http://archlinux.arkena.net/archive/packages/l/lib32-fontconfig/lib32-fontconfig-2.13.0-1-x86_64.pkg.tar.xz
 	sha512sums = 178ca8a3abf630195eaebd6a76a7e5ac19165708acd52b99acab2de3d0bdb57fdf81d666edae41a947fa5a3fc14442c86fa855860d5d3d0d3e1db0386c583b96
 	sha512sums = f9c18ca0dc0687de353afeb90925439a557a14604e6361ff2b229ec29257ff051ea9eac6a90671b38a745473b5c87135377d035520f441ceaabf2510d690675b
 	sha512sums = 66b2825e289389a959db304e89e08ba8a971d5bc9b9382d86d11d5747abf6868151e6cb5c0c8afa63814deba40cc63d11e8445922267c388e913cb5f1bc4e6b7
@@ -73,6 +75,7 @@ pkgbase = acroread
 	sha512sums = d10ef55002b07c393321d16e977e8f3a3bdb01cb6a408c61733e43c8a970ef3f579c85917329f3eeb1e3d1a365006fcb6c663339517c9f6970867284ef0d16f2
 	sha512sums = 03ef1684265e938f72f62dc4b0401a250fabbecfea7d88f25af8d42f532d287772e0d3ba806b690217204393bde090f5ced46a1e674b8bea30bed3c656f60f85
 	sha512sums = d27adb892bf1b44b527bdb08f6c65363b80b0123af254156c35178b9d3021add80d375f9e21a5f778db5b63869eaa935907d0719c33904b7a0f9641f67fe00ec
-	sha512sums = 89fa576f193007f62a8e0de9bd4b887396221120a2434ff78c07ac5e167c69d4cb773e1ee49dddd203e4d33c59bc89d573a3f1665137e38d0bf841148fa68cac
+	sha512sums = 07cfeba0679aa60717a170934b5c6c4dd742ddf04fff87f07707216520e9b53bc97c96cb969026d59861f484d2b6f82d1b3403281315e7cc842fc652533cc18d
+	sha512sums = df032ac28bf91537a1d19217f905ad38b05406ea0a37e56afa0dc007f5d29e1b3cfe16d0befb9355ee20ccf0654ea2a27914a98bb8580302dafeac4cadc45851
 
 pkgname = acroread
diff --git a/PKGBUILD b/PKGBUILD
index d734eb61ce79..4ba2a7976d33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=acroread
 pkgver=9.5.5
-pkgrel=19
+pkgrel=20
 pkgdesc="Adobe Acrobat Reader is a PDF file viewer"
 arch=('i686' 'x86_64')
 url="http://www.adobe.com/products/reader/"
@@ -39,7 +39,8 @@ source=($pkgname.desktop
 	http://archlinux.arkena.net/archive/packages/l/lib32-cairo/lib32-cairo-1.14.10-1-x86_64.pkg.tar.xz
 	http://archlinux.arkena.net/archive/packages/l/lib32-libffi/lib32-libffi-3.2.1-2-x86_64.pkg.tar.xz
 	http://archlinux.arkena.net/archive/packages/l/lib32-libx11/lib32-libx11-1.6.9-1-x86_64.pkg.tar.xz
-	http://archlinux.arkena.net/archive/packages/l/lib32-freetype2/lib32-freetype2-2.6-1-x86_64.pkg.tar.xz)
+	http://archlinux.arkena.net/archive/packages/l/lib32-freetype2/lib32-freetype2-2.9-2-x86_64.pkg.tar.xz
+	http://archlinux.arkena.net/archive/packages/l/lib32-fontconfig/lib32-fontconfig-2.13.0-1-x86_64.pkg.tar.xz)
 	
 noextract=("${source[@]%%::*}")
 sha512sums=('178ca8a3abf630195eaebd6a76a7e5ac19165708acd52b99acab2de3d0bdb57fdf81d666edae41a947fa5a3fc14442c86fa855860d5d3d0d3e1db0386c583b96'
@@ -58,7 +59,8 @@ sha512sums=('178ca8a3abf630195eaebd6a76a7e5ac19165708acd52b99acab2de3d0bdb57fdf8
 	    'd10ef55002b07c393321d16e977e8f3a3bdb01cb6a408c61733e43c8a970ef3f579c85917329f3eeb1e3d1a365006fcb6c663339517c9f6970867284ef0d16f2'
 	    '03ef1684265e938f72f62dc4b0401a250fabbecfea7d88f25af8d42f532d287772e0d3ba806b690217204393bde090f5ced46a1e674b8bea30bed3c656f60f85'
 	    'd27adb892bf1b44b527bdb08f6c65363b80b0123af254156c35178b9d3021add80d375f9e21a5f778db5b63869eaa935907d0719c33904b7a0f9641f67fe00ec'
-	    '89fa576f193007f62a8e0de9bd4b887396221120a2434ff78c07ac5e167c69d4cb773e1ee49dddd203e4d33c59bc89d573a3f1665137e38d0bf841148fa68cac')
+	    '07cfeba0679aa60717a170934b5c6c4dd742ddf04fff87f07707216520e9b53bc97c96cb969026d59861f484d2b6f82d1b3403281315e7cc842fc652533cc18d'
+	    'df032ac28bf91537a1d19217f905ad38b05406ea0a37e56afa0dc007f5d29e1b3cfe16d0befb9355ee20ccf0654ea2a27914a98bb8580302dafeac4cadc45851')
 prepare() {
     # Extracting content from bin file
     tail -c+6889 AdbeRdr9.5.5-1_i486linux_enu.bin | xz -qqd | tar x
@@ -77,7 +79,8 @@ prepare() {
     tar -C oldlib -axf lib32-cairo-1.14.10-1-x86_64.pkg.tar.xz
     tar -C oldlib -axf lib32-libffi-3.2.1-2-x86_64.pkg.tar.xz
     tar -C oldlib -axf lib32-libx11-1.6.9-1-x86_64.pkg.tar.xz
-    tar -C oldlib -axf lib32-freetype2-2.6-1-x86_64.pkg.tar.xz
+    tar -C oldlib -axf lib32-freetype2-2.9-2-x86_64.pkg.tar.xz
+    tar -C oldlib -axf lib32-fontconfig-2.13.0-1-x86_64.pkg.tar.xz
 
     cd AdobeReader/
     bsdtar -xf COMMON.TAR