PKGBUILD overhaul

2 files changed, 7 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2df0ebfdb4e..fcf701472aab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = acroread
 	pkgdesc = Adobe Reader is a PDF file viewer
 	pkgver = 9.5.5
-	pkgrel = 8
+	pkgrel = 9
 	url = http://www.adobe.com/products/reader/
 	install = acroread.install
 	arch = i686
@@ -14,7 +14,6 @@ pkgbase = acroread
 	depends = lib32-mesa
 	depends = lib32-libidn
 	depends = lib32-glu
-	depends = pangox-compat
 	optdepends = acroread-fonts: CJK and extended font packs
 	optdepends = lib32-libcanberra: XDG sound support
 	optdepends = lib32-gtk-engine-murrine: fix ugly buttons and scrollbars
@@ -27,21 +26,10 @@ pkgbase = acroread
 	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
-	depends = gtk2
-	depends = libxml2
-	depends = libxt
-	depends = mesa
-	depends = pangox-compat
-	depends = libidn
 
diff --git a/PKGBUILD b/PKGBUILD
index 0e6b021090d9..fa27992a741c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Tom Kwok <contact@tomkwok.com>
+# Maintainer: Tucker Boniface <tucker@boniface.tech>
+# Contributor: Tom Kwok <contact@tomkwok.com>
 # Contributor: Jose Valecillos <valecillosjg at gmail dot com>
 # Contributor: Guido <qqqqqqqqq9 at web dot de>
 # Contributor: Limao Luo <luolimao+AUR at gmail com>
@@ -7,7 +8,7 @@
 
 pkgname=acroread
 pkgver=9.5.5
-pkgrel=8
+pkgrel=9
 pkgdesc="Adobe Reader is a PDF file viewer"
 arch=('i686' 'x86_64')
 url="http://www.adobe.com/products/reader/"
@@ -16,26 +17,17 @@ optdepends=('acroread-fonts: CJK and extended font packs'
             'libcanberra: XDG sound support'
             'gtk-engine-murrine: fix ugly buttons and scrollbars'
             )
-if [[ $CARCH == "x86_64" ]]; then
-   depends=('desktop-file-utils' lib32-{gtk2,libxml2,libxt,mesa,libidn,glu} 'pangox-compat') &&
-   optdepends=('acroread-fonts: CJK and extended font packs'
+depends=('desktop-file-utils' lib32-{gtk2,libxml2,libxt,mesa,libidn,glu})
+optdepends=('acroread-fonts: CJK and extended font packs'
             'lib32-libcanberra: XDG sound support'
-            'lib32-gtk-engine-murrine: fix ugly buttons and scrollbars'
-            )
-fi
-# optdepends=("${optdepends[@]/lib32-/}")
+            'lib32-gtk-engine-murrine: fix ugly buttons and scrollbars')
 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
         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'
-            '34c720a6d06edda4d7420c3d249739f1e8b92e66deb4ef52b33cd02c7fa9c78d'
-            'c931f063b3decc04cd8e567c94f927d236dcba52946e47abf1e6f14e3599cfc1')
 sha512sums=('178ca8a3abf630195eaebd6a76a7e5ac19165708acd52b99acab2de3d0bdb57fdf81d666edae41a947fa5a3fc14442c86fa855860d5d3d0d3e1db0386c583b96'
             'f9c18ca0dc0687de353afeb90925439a557a14604e6361ff2b229ec29257ff051ea9eac6a90671b38a745473b5c87135377d035520f441ceaabf2510d690675b'
             'd47b60567907c624929086b6dfa529227ae43342fd892bfbcba4c3f07efd4c6625b6756aec41ea0332ee0f4aa9fdba5c952cbbb639b41ae03c6fe41fb0206d33'
@@ -46,9 +38,7 @@ prepare() {
     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() {
     cd AdobeReader/
     bsdtar -xf COMMON.TAR
     bsdtar -xf ILINXR.TAR
@@ -60,13 +50,6 @@ Adobe/Reader9/Browser/intellinux/nppdf.so
 }
 
 package() {
-    if [[ $CARCH == "x86_64" ]]
-    then
-        depends=('desktop-file-utils' 'gtk2' 'libxml2' 'libxt' 'mesa' 'pangox-compat' 'libidn' 'lib32-libcurl-compat')
-    elif [[ $CARCH == "i686" ]]
-    then
-        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"
@@ -85,10 +68,6 @@ 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 Icon Resources..."
     install -Dm644 Resource/Icons/64x64/AdobeReader9.png "$pkgdir"/usr/share/pixmaps/$pkgname.png