summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD38
-rw-r--r--foxitreader.patch45
3 files changed, 36 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f3914aa7d1f..2cebd1eef328 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Mar 6 02:13:53 UTC 2016
pkgbase = foxitreader
pkgdesc = A fast, secure and complete PDF viewer
- pkgver = 1.0.1.0925
+ pkgver = 1.1.0.0225
pkgrel = 1
epoch = 1
url = http://www.foxitsoftware.com/Secure_PDF_Reader/
@@ -15,11 +17,11 @@ pkgbase = foxitreader
source = https://www.foxitsoftware.com/products/pdf-reader/eula.html
source = foxitreader.patch
sha256sums = a5be3dc1cf27536de2c0fb5a0d640db349be32f48547b3cc56dcb5791fb278be
- sha256sums = 95dfbe05398dffbbfd31302f15e1707545512a4abb4b78d0ce843e19759d8586
- source_i686 = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.0/en_us/FoxitReader1.01.0925_Server_x86_enu_Setup.run.tar.gz
- sha256sums_i686 = a4821aee03c2fdac67fbbfef09eda8ab3deb21f97442048e3e11c035ad747ba2
- source_x86_64 = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.0/en_us/FoxitReader1.01.0925_Server_x64_enu_Setup.run.tar.gz
- sha256sums_x86_64 = 49684040892037154d9f53a611c72f9d0e3b9fe9a5b7a3e079063ca01903138f
+ sha256sums = cd1c29f50086b9d754d925728207343f5a4d3d6bc13cef3679bb6e86244990a4
+ source_i686 = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.1/en_us/FoxitReader1.10.0225_Server_x86_enu_Setup.run.tar.gz
+ sha256sums_i686 = 16984a9b52537dcb57c2304441fca3a906a8bd7271f1f4919fcdc8a5dbdf9fc8
+ source_x86_64 = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.1/en_us/FoxitReader1.10.0225_Server_x64_enu_Setup.run.tar.gz
+ sha256sums_x86_64 = 2967571a4844ab834e03f9d63ee89c3df027ac16c8ae25e6f7affee70654c1cf
pkgname = foxitreader
diff --git a/PKGBUILD b/PKGBUILD
index 27dfc55ccdcd..e44a25208f76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
pkgname=foxitreader
epoch=1
-pkgver=1.0.1.0925
-_pkgver=1.01.0925
-_pkgrev=189237
+pkgver=1.1.0.0225
+_pkgver=1.10.0225
+_pkgrev=205262
pkgrel=1
pkgdesc="A fast, secure and complete PDF viewer"
arch=('i686' 'x86_64')
@@ -19,9 +19,9 @@ source=("https://www.foxitsoftware.com/products/pdf-reader/eula.html"
source_i686=("http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/${pkgver%.*.*}/en_us/FoxitReader${_pkgver}_Server_x86_enu_Setup.run.tar.gz")
source_x86_64=("http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/${pkgver%.*.*}/en_us/FoxitReader${_pkgver}_Server_x64_enu_Setup.run.tar.gz")
sha256sums=('a5be3dc1cf27536de2c0fb5a0d640db349be32f48547b3cc56dcb5791fb278be'
- '95dfbe05398dffbbfd31302f15e1707545512a4abb4b78d0ce843e19759d8586')
-sha256sums_i686=('a4821aee03c2fdac67fbbfef09eda8ab3deb21f97442048e3e11c035ad747ba2')
-sha256sums_x86_64=('49684040892037154d9f53a611c72f9d0e3b9fe9a5b7a3e079063ca01903138f')
+ 'cd1c29f50086b9d754d925728207343f5a4d3d6bc13cef3679bb6e86244990a4')
+sha256sums_i686=('16984a9b52537dcb57c2304441fca3a906a8bd7271f1f4919fcdc8a5dbdf9fc8')
+sha256sums_x86_64=('2967571a4844ab834e03f9d63ee89c3df027ac16c8ae25e6f7affee70654c1cf')
build() {
# Clean installer dir
@@ -32,9 +32,9 @@ build() {
# Decompress .run installer
if [ "${CARCH}" = 'x86_64' ]
then
- _file_run="FoxitReader.enu.setup.x64.${pkgver}(r${_pkgrev}).run"
+ _file_run="FoxitReader.enu.setup.${pkgver}(r${_pkgrev}).x64.run"
else
- _file_run="FoxitReader.enu.setup.x86.${pkgver}(r${_pkgrev}).run"
+ _file_run="FoxitReader.enu.setup.${pkgver}(r${_pkgrev}).x86.run"
fi
devtool --dump "${pkgname}-installer" "${_file_run}"
}
@@ -47,14 +47,19 @@ package() {
do
7z x -o"${pkgdir}/usr/lib/${pkgname}" ${file} > /dev/null
done
-
+ # Apply final patches
+ cd "${pkgdir}"
+ patch -p1 -i "${srcdir}/${pkgname}.patch"
# Remove useless files
cd "${pkgdir}/usr/lib/${pkgname}"
- rm "lib/.directory" "Activation.desktop" "Activation.sh" "installUpdate" \
- "maintenancetool.sh" "Uninstall.desktop" "Update.desktop" "updater" \
- "updater.sh" "manual/en_us/FoxitReader1.0_QuickGuide_OSX.pdf"
- # These files won't exist in every installer
- [ -e "Foxit Reader Startup.Log" ] && rm "Foxit Reader Startup.Log"
+ rm "lib/.directory" "Activation" "Activation.desktop" "Activation.sh" \
+ "countinstalltion" "countinstalltion.sh" \
+ "FoxitReader.sh" "installUpdate" "ldlibrarypath.sh" \
+ "maintenancetool.sh" "Uninstall.desktop" \
+ "Update.desktop" "updater" "updater.sh" \
+ "manual/en_us/FoxitReader1.0_QuickGuide_Linux.pdf" \
+ "manual/en_us/FoxitReader1.0_QuickGuide_OSX.pdf" \
+ "manual/en_us/FoxitReader1.1_QuickGuide_OSX.pdf"
# Install icon and desktop files
install -m 755 -d "${pkgdir}/usr/share/pixmaps"
install -m 644 "images/FoxitReader.png" \
@@ -68,9 +73,6 @@ package() {
# Install launcher script
cd "${pkgdir}"
install -m 755 -d "${pkgdir}/usr/bin"
- ln -s "/usr/lib/${pkgname}/FoxitReader.sh" "${pkgdir}/usr/bin/${pkgname}"
- # Apply final patches
- cd "${pkgdir}"
- patch -p2 -i "${srcdir}/${pkgname}.patch"
+ ln -s "/usr/lib/${pkgname}/FoxitReader" "${pkgdir}/usr/bin/${pkgname}"
}
diff --git a/foxitreader.patch b/foxitreader.patch
index 8e194051dac8..9228c59b3fbd 100644
--- a/foxitreader.patch
+++ b/foxitreader.patch
@@ -1,46 +1,17 @@
-diff -Naur pkg.orig/foxitreader/usr/lib/foxitreader/FoxitReader.sh pkg.new/foxitreader/usr/lib/foxitreader/FoxitReader.sh
---- pkg.orig/foxitreader/usr/lib/foxitreader/FoxitReader.sh 2015-08-04 19:45:59.000000000 +0200
-+++ pkg.new/foxitreader/usr/lib/foxitreader/FoxitReader.sh 2015-11-01 18:00:56.153638257 +0100
-@@ -1,14 +1,8 @@
- #!/bin/sh
-- appname=`basename $0 | sed s,\.sh$,,`
-- selfpath=$(cd "$(dirname "$0")"; pwd)
-- dirname=`dirname $0`
-- tmp="${dirname#?}"
--
-- if [ "${dirname%$tmp}" != "/" ]; then
-- dirname=$PWD/$dirname
-- fi
-- LD_LIBRARY_PATH=$selfpath/lib:$selfpath/platforms:$selfpath/printsupport:$selfpath/rmssdk:$selfpath/sensors:$selfpath/imageformats:$selfpath/platforminputcontexts:$LD_LIBRARY_PATH
-- export LD_LIBRARY_PATH
-+selfpath="$(dirname $(readlink "$0"))"
-+dirname=$(dirname $(readlink "$0"))
-
-- chmod +x $dirname/$appname
-- $dirname/$appname "$@"
-+LD_LIBRARY_PATH=$selfpath/lib:$selfpath/platforms:$selfpath/printsupport:$selfpath/rmssdk:$selfpath/sensors:$selfpath/imageformats:$selfpath/platforminputcontexts:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH
-+
-+"$dirname/FoxitReader" "$@"
-diff -Naur pkg.orig/foxitreader/usr/share/applications/foxitreader.desktop pkg.new/foxitreader/usr/share/applications/foxitreader.desktop
---- pkg.orig/foxitreader/usr/share/applications/foxitreader.desktop 2015-11-01 18:01:16.606971000 +0100
-+++ pkg.new/foxitreader/usr/share/applications/foxitreader.desktop 2015-11-01 18:11:57.038483005 +0100
-@@ -1,15 +1,10 @@
+diff -Naur foxitreader.orig/usr/lib/foxitreader/FoxitReader.desktop foxitreader/usr/lib/foxitreader/FoxitReader.desktop
+--- foxitreader.orig/usr/lib/foxitreader/FoxitReader.desktop 2016-02-16 15:23:41.000000000 +0100
++++ foxitreader/usr/lib/foxitreader/FoxitReader.desktop 2016-03-06 02:41:40.882259342 +0100
+@@ -1,10 +1,11 @@
[Desktop Entry]
Name=Foxit Reader
-Comment=View pdf documents
--Keywords=pdf;octet-stream;
+Comment=View PDF documents
+ Keywords=pdf;octet-stream;
StartupNotify=true
Terminal=false
Type=Application
--#Icon=FoxitReader
--X-GNOME-DocPath=
--X-GNOME-Bugzilla-Bugzilla=GNOME
--X-GNOME-Bugzilla-Product=FoxitReader
--X-GNOME-Bugzilla-Component=BugBuddyBugs
--X-GNOME-Bugzilla-Version=3.14.1
+ Categories=Application;Office;Viewer;X-Red-Hat-Base;
+ MimeType=application/pdf;application/octet-stream;
+-Icon=FoxitReader
+Icon=foxitreader
+Exec=foxitreader %F
- Categories=GNOME;Viewer;Graphics;2DGraphics;VectorGraphics;
- MimeType=application/pdf;application/octet-stream;