old harfbuzz and glib DLed from archive and bundled

2 files changed, 32 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4b479993aff..f2df0ebfdb4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = acroread
 	pkgdesc = Adobe Reader is a PDF file viewer
 	pkgver = 9.5.5
-	pkgrel = 7
+	pkgrel = 8
 	url = http://www.adobe.com/products/reader/
 	install = acroread.install
 	arch = i686
@@ -20,13 +20,21 @@ pkgbase = acroread
 	optdepends = lib32-gtk-engine-murrine: fix ugly buttons and scrollbars
 	noextract = acroread.desktop
 	noextract = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.5/enu/AdbeRdr9.5.5-1_i486linux_enu.bin
+	noextract = https://archive.archlinux.org/packages/l/lib32-glib2/lib32-glib2-2.56.0%2B7%2Bg66948ae23-1-x86_64.pkg.tar.xz
+	noextract = https://archive.archlinux.org/packages/l/lib32-harfbuzz/lib32-harfbuzz-1.7.6-2-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
+	source = https://archive.archlinux.org/packages/l/lib32-glib2/lib32-glib2-2.56.0%2B7%2Bg66948ae23-1-x86_64.pkg.tar.xz
+	source = https://archive.archlinux.org/packages/l/lib32-harfbuzz/lib32-harfbuzz-1.7.6-2-x86_64.pkg.tar.xz
 	sha256sums = 4bf5f17edd24569e93d5229d9b35ca00a8b222ae46ba2a2042a4a3c121b27298
 	sha256sums = f3d060c1ab475a649dec6316c0b5a4a7e1055f9681ec2f35b4f77a070dfb3ea2
+	sha256sums = 34c720a6d06edda4d7420c3d249739f1e8b92e66deb4ef52b33cd02c7fa9c78d
+	sha256sums = c931f063b3decc04cd8e567c94f927d236dcba52946e47abf1e6f14e3599cfc1
 	sha512sums = 178ca8a3abf630195eaebd6a76a7e5ac19165708acd52b99acab2de3d0bdb57fdf81d666edae41a947fa5a3fc14442c86fa855860d5d3d0d3e1db0386c583b96
 	sha512sums = f9c18ca0dc0687de353afeb90925439a557a14604e6361ff2b229ec29257ff051ea9eac6a90671b38a745473b5c87135377d035520f441ceaabf2510d690675b
+	sha512sums = d47b60567907c624929086b6dfa529227ae43342fd892bfbcba4c3f07efd4c6625b6756aec41ea0332ee0f4aa9fdba5c952cbbb639b41ae03c6fe41fb0206d33
+	sha512sums = b9b5a088224cdd04f418eda17e64996fbd09410173c9951ec99aa7827015a3366bb67e641e3a78cd819aba382f7bb0e1a5ebeb2745caaebfb0ae3e78b988a206
 
 pkgname = acroread
 	depends = desktop-file-utils
diff --git a/PKGBUILD b/PKGBUILD
index 140158fb5f27..0e6b021090d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,11 @@
 # Contributor: Guido <qqqqqqqqq9 at web dot de>
 # Contributor: Limao Luo <luolimao+AUR at gmail com>
 # Contributor: Alexander Fehr <pizzapunk at gmail dot com>
+# Olivier Esser: Add needed old versions of lib32-glib2 and lib32-harfbuzz <olivier dot esser at gmail dot com>
 
 pkgname=acroread
 pkgver=9.5.5
-pkgrel=7
+pkgrel=8
 pkgdesc="Adobe Reader is a PDF file viewer"
 arch=('i686' 'x86_64')
 url="http://www.adobe.com/products/reader/"
@@ -26,15 +27,25 @@ fi
 options=(!strip)
 install=$pkgname.install
 source=($pkgname.desktop
-    http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/$pkgver/enu/AdbeRdr$pkgver-1_i486linux_enu.bin)
+        http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/$pkgver/enu/AdbeRdr$pkgver-1_i486linux_enu.bin
+        https://archive.archlinux.org/packages/l/lib32-glib2/lib32-glib2-2.56.0%2B7%2Bg66948ae23-1-x86_64.pkg.tar.xz
+        https://archive.archlinux.org/packages/l/lib32-harfbuzz/lib32-harfbuzz-1.7.6-2-x86_64.pkg.tar.xz)
+
 noextract=("${source[@]%%::*}")
 sha256sums=('4bf5f17edd24569e93d5229d9b35ca00a8b222ae46ba2a2042a4a3c121b27298'
-            'f3d060c1ab475a649dec6316c0b5a4a7e1055f9681ec2f35b4f77a070dfb3ea2')
+            'f3d060c1ab475a649dec6316c0b5a4a7e1055f9681ec2f35b4f77a070dfb3ea2'
+            '34c720a6d06edda4d7420c3d249739f1e8b92e66deb4ef52b33cd02c7fa9c78d'
+            'c931f063b3decc04cd8e567c94f927d236dcba52946e47abf1e6f14e3599cfc1')
 sha512sums=('178ca8a3abf630195eaebd6a76a7e5ac19165708acd52b99acab2de3d0bdb57fdf81d666edae41a947fa5a3fc14442c86fa855860d5d3d0d3e1db0386c583b96'
-            'f9c18ca0dc0687de353afeb90925439a557a14604e6361ff2b229ec29257ff051ea9eac6a90671b38a745473b5c87135377d035520f441ceaabf2510d690675b')
+            'f9c18ca0dc0687de353afeb90925439a557a14604e6361ff2b229ec29257ff051ea9eac6a90671b38a745473b5c87135377d035520f441ceaabf2510d690675b'
+            'd47b60567907c624929086b6dfa529227ae43342fd892bfbcba4c3f07efd4c6625b6756aec41ea0332ee0f4aa9fdba5c952cbbb639b41ae03c6fe41fb0206d33'
+            'b9b5a088224cdd04f418eda17e64996fbd09410173c9951ec99aa7827015a3366bb67e641e3a78cd819aba382f7bb0e1a5ebeb2745caaebfb0ae3e78b988a206')
 prepare() {
     # Extracting content from bin file
     tail -c+6889 AdbeRdr9.5.5-1_i486linux_enu.bin | xz -qqd | tar x
+    mkdir oldlib
+    tar -C oldlib -axf lib32-glib2-2.56.0%2B7%2Bg66948ae23-1-x86_64.pkg.tar.xz
+    tar -C oldlib -axf lib32-harfbuzz-1.7.6-2-x86_64.pkg.tar.xz
 }
 
 build() {
@@ -57,6 +68,11 @@ package() {
         depends=('desktop-file-utils' 'gtk2' 'libxml2' 'libxt' 'mesa' 'pangox-compat' 'libidn')
     fi
     desktop-file-install $pkgname.desktop --dir "$pkgdir"/usr/share/applications/
+
+    msg2 "Copying old libraries"
+    install -d "$pkgdir/opt/Adobe/Reader9/Reader/intellinux/lib"
+    cp -a oldlib/usr/lib32/* "$pkgdir/opt/Adobe/Reader9/Reader/intellinux/lib"
+
     cd AdobeReader/Adobe/Reader9/
 
     msg2 "Installing Main Files..."
@@ -69,9 +85,9 @@ package() {
     install -Dm644 Resource/Shell/acroread.1.gz "$pkgdir"/usr/share/man/man1/acroread.1.gz
     install -Dm644 Resource/Shell/acroread_tab "$pkgdir"/etc/bash_completion.d/acroread
 
-    msg2 "Installing Browser Plugin..."
-    install -d "$pkgdir"/usr/lib/mozilla/plugins/
-    ln -s /opt/Adobe/Reader9/Browser/intellinux/nppdf.so "$pkgdir"/usr/lib/mozilla/plugins/
+    # msg2 "Installing Browser Plugin..."
+    # install -d "$pkgdir"/usr/lib/mozilla/plugins/
+    # ln -s /opt/Adobe/Reader9/Browser/intellinux/nppdf.so "$pkgdir"/usr/lib/mozilla/plugins/
 
     msg2 "Installing Icon Resources..."
     install -Dm644 Resource/Icons/64x64/AdobeReader9.png "$pkgdir"/usr/share/pixmaps/$pkgname.png