summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuflone2015-11-01 19:07:46 +0100
committerMuflone2015-11-01 19:07:46 +0100
commit2e4db3841447342e502cff33f9b222966ff39906 (patch)
treedbb5329c2372300fdca52ba4f3e3834554798c93
parent02b0cb14082b6633462e3f20028c4e2d1b2c80cd (diff)
downloadaur-2e4db3841447342e502cff33f9b222966ff39906.tar.gz
Updated package foxitreader 1:1.0.0.0909-1
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD93
-rw-r--r--desktop-file.patch14
-rw-r--r--foxitreader-i686.sh2
-rw-r--r--foxitreader-x86_64.sh6
-rw-r--r--foxitreader.patch46
6 files changed, 113 insertions, 74 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2bf2ea0ad2d..8fda5c7a213 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,25 @@
pkgbase = foxitreader
pkgdesc = A small, fast PDF viewer
- pkgver = 1.1.0.20090810
- pkgrel = 2
+ pkgver = 1.0.0.0909
+ pkgrel = 1
+ epoch = 1
url = http://www.foxitsoftware.com/Secure_PDF_Reader/
install = foxitreader.install
arch = i686
arch = x86_64
license = custom:EULA
+ makedepends = qt-installer-framework
+ makedepends = qt5-tools
+ makedepends = p7zip
depends = desktop-file-utils
- source = http://cdn04.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.1/enu/FoxitReader-1.1.0.tar.bz2
- source = http://cdn04.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.1/enu/FoxitReader_1.1.0_i386.deb
source = https://www.foxitsoftware.com/products/pdf-reader/eula.html
- source = foxitreader-i686.sh
- source = foxitreader-x86_64.sh
- source = desktop-file.patch
- sha256sums = 02f1ad5ad2fd516754254f349c94b8e81b57b9eb2a0315f30debdc5d7fb8dbf4
- sha256sums = 248eab45cbb8816989d46dc3c3f150273720c69645fbbbc3c06b93983ac50653
+ source = foxitreader.patch
sha256sums = a5be3dc1cf27536de2c0fb5a0d640db349be32f48547b3cc56dcb5791fb278be
- sha256sums = cd70582074710360cb667d91dd677b4f074f308bc13517a879d2735a08266d96
- sha256sums = 13856414068d9e374eed86a5a99c665b8450f7d07dd27fd9106b73d20fdd5e87
- sha256sums = 39a709be8a1c708850834a1b215fadb11331d86404d5422e19c49248afcc6a33
- depends_i686 = gtk2
- depends_x86_64 = lib32-gtk2
+ sha256sums = 95dfbe05398dffbbfd31302f15e1707545512a4abb4b78d0ce843e19759d8586
+ source_i686 = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.0/en_us/FoxitReader1.00.0909_Server_x86_enu_Setup.run.tar.gz
+ sha256sums_i686 = b3a50f96f7310d2f319b321252a1423cf5b537789127e0cfd75358f23a8d9c73
+ source_x86_64 = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/1.0/en_us/FoxitReader1.00.0909_Server_x64_enu_Setup.run.tar.gz
+ sha256sums_x86_64 = 1f4a6b97456049c7f2d4103a3828a52109a9e1a85e502099373632908579c67c
pkgname = foxitreader
diff --git a/PKGBUILD b/PKGBUILD
index 19d7ceb2d39..e3bb5fa53b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,58 +2,75 @@
# Contributor: TDY <tdy@archlinux.info>
pkgname=foxitreader
-pkgver=1.1.0.20090810
-pkgrel=2
+epoch=1
+pkgver=1.0.0.0909
+_pkgver=1.00.0909
+_pkgrev=186903
+pkgrel=1
pkgdesc="A small, fast PDF viewer"
arch=('i686' 'x86_64')
url="http://www.foxitsoftware.com/Secure_PDF_Reader/"
license=('custom:EULA')
+makedepends=('qt-installer-framework' 'qt5-tools' 'p7zip')
depends=('desktop-file-utils')
-depends_i686=('gtk2')
-depends_x86_64=('lib32-gtk2')
install="${pkgname}.install"
-source=("http://cdn04.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/${pkgver%.*.*}/enu/FoxitReader-${pkgver%.*}.tar.bz2"
- "http://cdn04.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/${pkgver%.*.*}/enu/FoxitReader_${pkgver%.*}_i386.deb"
- "https://www.foxitsoftware.com/products/pdf-reader/eula.html"
- "${pkgname}-i686.sh"
- "${pkgname}-x86_64.sh"
- "desktop-file.patch")
-sha256sums=('02f1ad5ad2fd516754254f349c94b8e81b57b9eb2a0315f30debdc5d7fb8dbf4'
- '248eab45cbb8816989d46dc3c3f150273720c69645fbbbc3c06b93983ac50653'
- 'a5be3dc1cf27536de2c0fb5a0d640db349be32f48547b3cc56dcb5791fb278be'
- 'cd70582074710360cb667d91dd677b4f074f308bc13517a879d2735a08266d96'
- '13856414068d9e374eed86a5a99c665b8450f7d07dd27fd9106b73d20fdd5e87'
- '39a709be8a1c708850834a1b215fadb11331d86404d5422e19c49248afcc6a33')
+source=("https://www.foxitsoftware.com/products/pdf-reader/eula.html"
+ "${pkgname}.patch")
+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=('b3a50f96f7310d2f319b321252a1423cf5b537789127e0cfd75358f23a8d9c73')
+sha256sums_x86_64=('1f4a6b97456049c7f2d4103a3828a52109a9e1a85e502099373632908579c67c')
-prepare() {
- bsdtar -x -f data.tar.gz
- patch -p1 -i "desktop-file.patch"
+build() {
+ # Clean installer dir
+ if [ -d "${pkgname}-installer" ]
+ then
+ rm -rf "${pkgname}-installer"
+ fi
+ # Decompress .run installer
+ if [ "${CARCH}" = 'x86_64' ]
+ then
+ _file_run="FoxitReader.enu.setup.${pkgver}(r${_pkgrev}).run"
+ else
+ _file_run="FoxitReader.enu.setup.x86.${pkgver}(r${_pkgrev}).run"
+ fi
+ devtool --dump "${pkgname}-installer" "${_file_run}"
}
package() {
- # Install license file
- install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" eula.html
- # Install launcher script
- install -m 755 -d "${pkgdir}/usr/bin"
- install -m 755 "${pkgname}-$CARCH.sh" "${pkgdir}/usr/bin/${pkgname}"
+ cd "${pkgname}-installer/metadata/Install FxoitReader"
+ # Decompress files
+ install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
+ for file in *.7z
+ do
+ 7z x -o"${pkgdir}/usr/lib/${pkgname}" ${file} > /dev/null
+ done
+
+ # 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"
+ # These files won't exist in every installer
+ [ -e "Foxit Reader Startup.Log" ] && rm "Foxit Reader Startup.Log"
# Install icon and desktop files
install -m 755 -d "${pkgdir}/usr/share/pixmaps"
- install -m 644 "usr/share/pixmaps/fx-icon.png" \
+ install -m 644 "images/FoxitReader-64x64.png" \
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
install -m 755 -d "${pkgdir}/usr/share/applications"
- install -m 755 "usr/share/applications/Foxit-Reader.desktop" \
+ install -m 755 "FoxitReader.desktop" \
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
- # Install application files
- cd "${pkgver%.*.*}-release"
- install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
- install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" FoxitReader
- install -m 644 -t "${pkgdir}/usr/lib/${pkgname}" fum.fhd fpdfcjk.bin
- # Install localization files
- for _lng in po/*; do
- install -m 755 -d "${pkgdir}/usr/share/locale/${_lng#*/}/LC_MESSAGES"
- install -m 644 -t "${pkgdir}/usr/share/locale/${_lng#*/}/LC_MESSAGES" \
- "${_lng}/FoxitReader.mo"
- done
+ # Install license file
+ install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/eula.html"
+ # 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"
}
diff --git a/desktop-file.patch b/desktop-file.patch
deleted file mode 100644
index da605aa10a7..00000000000
--- a/desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/usr/share/applications/Foxit-Reader.desktop.orig 2015-05-17 02:01:09.630191333 +0200
-+++ src/usr/share/applications/Foxit-Reader.desktop 2015-05-17 02:01:53.756857680 +0200
-@@ -5,9 +5,9 @@
- Type=Application
- GenericName=Foxit PDF Reader
- Comment=Read PDF Document
--Exec=FoxitReader %F
-+Exec=foxitreader %F
- StartupNotify=true
--Icon=/usr/share/pixmaps/fx-icon.png
-+Icon=foxitreader
- Terminal=false
- Categories=GNOME;GTK;Application;Office;Viewer;
- MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;
diff --git a/foxitreader-i686.sh b/foxitreader-i686.sh
deleted file mode 100644
index 6008a5a8bb7..00000000000
--- a/foxitreader-i686.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /usr/lib/foxitreader/FoxitReader "$@"
diff --git a/foxitreader-x86_64.sh b/foxitreader-x86_64.sh
deleted file mode 100644
index 0b9ded8d381..00000000000
--- a/foxitreader-x86_64.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-export GTK_PATH=/usr/lib32/gtk-2.0
-export GDK_PIXBUF_MODULE=/usr/lib32/config/gdk/gdk-pixbuf.loaders
-export PANGO_RC_FILE=/usr/lib32/config/pango/pangorc
-export LD_LIBRARY_PATH="/usr/lib32:$LD_LIBRARY_PATH"
-exec /usr/lib/foxitreader/FoxitReader "$@"
diff --git a/foxitreader.patch b/foxitreader.patch
new file mode 100644
index 00000000000..8e194051dac
--- /dev/null
+++ b/foxitreader.patch
@@ -0,0 +1,46 @@
+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 @@
+ [Desktop Entry]
+ Name=Foxit Reader
+-Comment=View pdf documents
+-Keywords=pdf;octet-stream;
++Comment=View PDF documents
+ 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
++Icon=foxitreader
++Exec=foxitreader %F
+ Categories=GNOME;Viewer;Graphics;2DGraphics;VectorGraphics;
+ MimeType=application/pdf;application/octet-stream;