32-bit only due to Wine bug 43679

2 files changed, 23 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56ba3a137e44..dfe6a412e998 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pdf-xchange
 	pkgdesc = Feature-rich PDF editor/viewer. Create, view, edit and annotate plus much more.
 	pkgver = 6.0.322.7
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.tracker-software.com/product/pdf-xchange-editor
 	arch = i686
 	arch = x86_64
@@ -11,10 +11,8 @@ pkgbase = pdf-xchange
 	makedepends = gendesk
 	depends = wine
 	depends = hicolor-icon-theme
-	source_i686 = http://www.tracker-software.com/downloads/EditorV6.x86.msi
-	sha256sums_i686 = 1794b4e7a5ef58f17bf027ca20f8271452fa4d5dc564cf51b054a33e3b112e52
-	source_x86_64 = http://www.tracker-software.com/downloads/EditorV6.x64.msi
-	sha256sums_x86_64 = 4c572ae3a0d17d6f079fe4195066744c7d1cc1800b430bc00db530dcdf47a2ea
+	source = http://www.tracker-software.com/downloads/EditorV6.x86.msi
+	sha256sums = 1794b4e7a5ef58f17bf027ca20f8271452fa4d5dc564cf51b054a33e3b112e52
 
 pkgname = pdf-xchange
 
diff --git a/PKGBUILD b/PKGBUILD
index 2712b5f5f201..81393c246484 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: swearchnick <swearchnick[at]gmail[dot]com>
 pkgname="pdf-xchange"
 pkgver="6.0.322.7"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Feature-rich PDF editor/viewer. Create, view, edit and annotate plus much more."
 license=('Custom')
 arch=('i686' 'x86_64')
@@ -10,29 +10,17 @@ makedepends=('p7zip' 'icoutils' 'gendesk')
 url="http://www.tracker-software.com/product/pdf-xchange-editor"
 _downloadsource="http://www.tracker-software.com/downloads"
 _x86file="EditorV6.x86.msi"
-_x64file="EditorV6.x64.msi"
 _installdir="/usr/lib"
 
- source_x86_64+=($_downloadsource/$_x64file)
- sha256sums_x86_64+=('4c572ae3a0d17d6f079fe4195066744c7d1cc1800b430bc00db530dcdf47a2ea')
-
- source_i686+=($_downloadsource/$_x86file)
- sha256sums_i686+=('1794b4e7a5ef58f17bf027ca20f8271452fa4d5dc564cf51b054a33e3b112e52')
+  source=($_downloadsource/$_x86file)
+  sha256sums+=('1794b4e7a5ef58f17bf027ca20f8271452fa4d5dc564cf51b054a33e3b112e52')
 
 prepare()
 {
-
- if [ "$CARCH" == "x86_64" ]; then
-	7z x "$srcdir/$_x64file" -o"$srcdir"
-	7z x "$srcdir/et_x64.cab" -o"$srcdir"
-	7z x "$srcdir/e_x64.cab" -o"$srcdir"
-			
- fi
- if [ "$CARCH" == "i686" ]; then	
-	7z x "$srcdir/$_x86file" -o"$srcdir"
-	7z x "$srcdir/et_bin.cab" -o"$srcdir"
-        7z x "$srcdir/e_bin.cab" -o"$srcdir"
- fi
+	
+ 7z x "$srcdir/$_x86file" -o"$srcdir"
+ 7z x "$srcdir/et_bin.cab" -o"$srcdir"
+ 7z x "$srcdir/e_bin.cab" -o"$srcdir"
 
  7z x "$srcdir/et_res.cab" -o"$srcdir"
  7z x "$srcdir/e_res.cab" -o"$srcdir"
@@ -221,39 +209,20 @@ package()
 
  install -Dm644 "$srcdir/FID_Stamps_DynamicDate" "$pkgdir${_installdir}/$pkgname/Stamps/ENU/DynamicDate.pdf"
 
- if [ "$CARCH" == "x86_64" ]; then
-	install -Dm644 "$srcdir/FID_KeybHook64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/FowpKbd64.dll"
-	install -Dm644 "$srcdir/FID_ReadOutLoud64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/ReadOutLoud.pvp"
-	install -Dm644 "$srcdir/FID_Optimizer64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/PDFOptimizer.pvp"
-	install -Dm644 "$srcdir/FID_SpellChecker64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/SpellChecker.pvp"
-	install -Dm644 "$srcdir/FID_GD64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/GoogleDrive.pvp"
-	install -Dm644 "$srcdir/FID_Bookmarks64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/Bookmarks.pvp"
-	install -Dm644 "$srcdir/FID_DB64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/DropBox.pvp"
-	install -Dm644 "$srcdir/FID_SP64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/SharePoint.pvp"
-	install -Dm644 "$srcdir/FID_FileOpenSH64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/FileOpenSH.pvp"
-	install -Dm644 "$srcdir/FID_OffConv64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/ConvertPDF.pvp"
-	install -Dm644 "$srcdir/FID_PDFA64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/PDFAPlugin.pvp"
-	install -Dm644 "$srcdir/FID_OCR64" "$pkgdir${_installdir}/$pkgname/Plugins.x64/OCRPlugin.pvp"
-
-	install -Dm644 "$srcdir/FID_ViewerDLL64" "$pkgdir${_installdir}/$pkgname/PDFXEditCore.x64.dll"
- fi
-
- if [ "$CARCH" == "i686" ]; then
-	install -Dm644 "$srcdir/FID_KeybHook32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/FowpKbd.dll"
-	install -Dm644 "$srcdir/FID_ReadOutLoud32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/ReadOutLoud.pvp"
-	install -Dm644 "$srcdir/FID_Optimizer32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/PDFOptimizer.pvp"
-	install -Dm644 "$srcdir/FID_SpellChecker32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/SpellChecker.pvp"
-	install -Dm644 "$srcdir/FID_GD32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/GoogleDrive.pvp"
-	install -Dm644 "$srcdir/FID_Bookmarks32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/Bookmarks.pvp"
-	install -Dm644 "$srcdir/FID_DB32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/DropBox.pvp"
-	install -Dm644 "$srcdir/FID_SP32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/SharePoint.pvp"
-	install -Dm644 "$srcdir/FID_FileOpenSH32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/FileOpenSH.pvp"
-	install -Dm644 "$srcdir/FID_OffConv32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/ConvertPDF.pvp"
-	install -Dm644 "$srcdir/FID_PDFA32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/PDFAPlugin.pvp"
-	install -Dm644 "$srcdir/FID_OCR32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/OCRPlugin.pvp"
+ install -Dm644 "$srcdir/FID_KeybHook32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/FowpKbd.dll"
+ install -Dm644 "$srcdir/FID_ReadOutLoud32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/ReadOutLoud.pvp"
+ install -Dm644 "$srcdir/FID_Optimizer32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/PDFOptimizer.pvp"
+ install -Dm644 "$srcdir/FID_SpellChecker32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/SpellChecker.pvp"
+ install -Dm644 "$srcdir/FID_GD32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/GoogleDrive.pvp"
+ install -Dm644 "$srcdir/FID_Bookmarks32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/Bookmarks.pvp"
+ install -Dm644 "$srcdir/FID_DB32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/DropBox.pvp"
+ install -Dm644 "$srcdir/FID_SP32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/SharePoint.pvp"
+ install -Dm644 "$srcdir/FID_FileOpenSH32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/FileOpenSH.pvp"
+ install -Dm644 "$srcdir/FID_OffConv32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/ConvertPDF.pvp"
+ install -Dm644 "$srcdir/FID_PDFA32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/PDFAPlugin.pvp"
+ install -Dm644 "$srcdir/FID_OCR32" "$pkgdir${_installdir}/$pkgname/Plugins.x86/OCRPlugin.pvp"
 
-	install -Dm644 "$srcdir/FID_ViewerDLL32" "$pkgdir${_installdir}/$pkgname/PDFXEditCore.x86.dll"
- fi
+ install -Dm644 "$srcdir/FID_ViewerDLL32" "$pkgdir${_installdir}/$pkgname/PDFXEditCore.x86.dll"
  
  install -Dm755 "$srcdir/FID_EditorEXE" "$pkgdir${_installdir}/$pkgname/PDFXEdit.exe" 
  install -Dm644 "$srcdir/FID_Resource" "$pkgdir${_installdir}/$pkgname/Resources.dat"