[arch-commits] Commit in xpdf/trunk (PKGBUILD xpdf-4.00-xpdfrc.patch)

[Levente Polyak]

    Date: Tuesday, January 2, 2018 @ 19:58:07
  Author: anthraxx
Revision: 277818

upgpkg: xpdf 4.00-2 (fixing fonts and depends)

FS#50297
FS#52284
FS#56922

Added:
  xpdf/trunk/xpdf-4.00-xpdfrc.patch
Modified:
  xpdf/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   21 +++++++++++++--------
 xpdf-4.00-xpdfrc.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-02 18:28:01 UTC (rev 277817)
+++ PKGBUILD	2018-01-02 19:58:07 UTC (rev 277818)
@@ -7,21 +7,23 @@
 
 pkgname=xpdf
 pkgver=4.00
-pkgrel=1
+pkgrel=2
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='https://www.xpdfreader.com/'
 arch=('x86_64')
 license=('GPL3')
 backup=('etc/xpdfrc')
-depends=('openmotif' 'gsfonts' 'libxt' 'libpaper' 'xdg-utils' 'qt5-base' 'libpng' 'libxpm')
+depends=('gsfonts' 'xdg-utils' 'qt5-base' 'libxt' 'libpaper' 'freetype2'
+         'libcups' 'libjpeg-turbo' 'libtiff' 'libpng' 'zlib')
 optdepends=('poppler: tools that used to be included in xpdf'
             'desktop-file-utils: for desktop environments')
 makedepends=('cmake' 'qt5-tools')
-source=(https://www.xpdfreader.com/dl/${pkgname}-${pkgver}.tar.gz{,.sig}
+source=(https://xpdfreader-dl.s3.amazonaws.com/${pkgname}-${pkgver}.tar.gz{,.sig}
         xpdf-4.00-64bit.patch
         xpdf-4.00-man-path-fix.patch
         xpdf-4.00-permissions.patch
         xpdf-4.00-libpaperfix.patch
+        xpdf-4.00-xpdfrc.patch
         xpdf.desktop)
 sha512sums=('32fb928aeb053be29c7342dda8caac8a7a3720e8f39507df29ad5a070e1423cc0960da4d7b36046d0be27b842b108e984363c0285839a0fd371a119948af0cac'
             'SKIP'
@@ -29,6 +31,7 @@
             '77d533e0cb2ed5e232a0497891eb6ec634659305a1c19d7c3a8f7efee1d18ba9e03b1ee009a9834497f8d7721694d4bd65e897ee4c9499544194bf6b240052a0'
             'f17c1c19c29518a3538a202c19fb60efc7721a42065d32c841f9ed929e571d9373c8558fdae251c1ef3781857cf51483244276179862998f94c9c1fd8bd63695'
             'aa101da42a3f4d8a559f8387143909c863de80dd6c4d2454a9a6cecef41a889f6e5d88225c22ec2c271c05eb77a412a0e0d66b94554b9ff5ccfe97953f1c1c4e'
+            'c5ce8ef29d9b338fe3623fa52904d4fee5d76a34145614d05abe168108579608f3d16d0d03d34865e43980eb1b2a814f07aa3dbcfc0da06de34bd9b0738eef67'
             'd6163eb220bd567226c6006bef30c6db1eac1263ae161392db9766dca1ce78014cc555dd9d27febd2b924150053fa01b47c06777b1e760864459574c7614bfc4')
 validpgpkeys=('A56006CA75CF8B13FA2F120DF4825F5397271342') # -Xpdf- <xpdf at xpdfreader.com>
 
@@ -36,12 +39,12 @@
   cd ${pkgname}-${pkgver}
   mkdir -p build
   cp doc/sample-xpdfrc xpdfrc
-  patch -p1 < "${srcdir}/xpdf-4.00-64bit.patch"
-  patch -p1 < "${srcdir}/xpdf-4.00-man-path-fix.patch"
-  patch -p1 < "${srcdir}/xpdf-4.00-permissions.patch"
-  patch -p1 < "${srcdir}/xpdf-4.00-libpaperfix.patch"
+  patch -Np1 < ../xpdf-4.00-64bit.patch
+  patch -Np1 < ../xpdf-4.00-man-path-fix.patch
+  patch -Np1 < ../xpdf-4.00-permissions.patch
+  patch -Np1 < ../xpdf-4.00-libpaperfix.patch
+  patch -Np1 < ../xpdf-4.00-xpdfrc.patch
   sed 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' -i xpdf/GlobalParams.cc
-  sed 's:/usr/local/share/:/usr/share/:g' -i xpdfrc
 }
 
 build() {
@@ -49,6 +52,8 @@
   cmake .. \
   -DMULTITHREADED=ON \
   -DOPI_SUPPORT=ON \
+  -DXPDFWIDGET_PRINTING=ON \
+  -DSYSTEM_XPDFRC=/etc/xpdfrc \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Release
   make

Added: xpdf-4.00-xpdfrc.patch
===================================================================
--- xpdf-4.00-xpdfrc.patch	                        (rev 0)
+++ xpdf-4.00-xpdfrc.patch	2018-01-02 19:58:07 UTC (rev 277818)
@@ -0,0 +1,37 @@
+--- a/xpdfrc	2018-01-02 12:28:46.521609323 +0100
++++ b/xpdfrc	2018-01-02 11:18:14.342938091 +0100
+@@ -29,20 +29,20 @@
+ # installed in a "standard" location, xpdf will find them
+ # automatically.)
+ 
+-#fontFile Times-Roman		/usr/local/share/ghostscript/fonts/n021003l.pfb
+-#fontFile Times-Italic		/usr/local/share/ghostscript/fonts/n021023l.pfb
+-#fontFile Times-Bold		/usr/local/share/ghostscript/fonts/n021004l.pfb
+-#fontFile Times-BoldItalic	/usr/local/share/ghostscript/fonts/n021024l.pfb
+-#fontFile Helvetica		/usr/local/share/ghostscript/fonts/n019003l.pfb
+-#fontFile Helvetica-Oblique	/usr/local/share/ghostscript/fonts/n019023l.pfb
+-#fontFile Helvetica-Bold		/usr/local/share/ghostscript/fonts/n019004l.pfb
+-#fontFile Helvetica-BoldOblique	/usr/local/share/ghostscript/fonts/n019024l.pfb
+-#fontFile Courier		/usr/local/share/ghostscript/fonts/n022003l.pfb
+-#fontFile Courier-Oblique	/usr/local/share/ghostscript/fonts/n022023l.pfb
+-#fontFile Courier-Bold		/usr/local/share/ghostscript/fonts/n022004l.pfb
+-#fontFile Courier-BoldOblique	/usr/local/share/ghostscript/fonts/n022024l.pfb
+-#fontFile Symbol			/usr/local/share/ghostscript/fonts/s050000l.pfb
+-#fontFile ZapfDingbats		/usr/local/share/ghostscript/fonts/d050000l.pfb
++fontFile Times-Roman           /usr/share/fonts/gsfonts/NimbusRoman-Regular.otf
++fontFile Times-Italic          /usr/share/fonts/gsfonts/NimbusRoman-Italic.otf
++fontFile Times-Bold            /usr/share/fonts/gsfonts/NimbusRoman-Bold.otf
++fontFile Times-BoldItalic      /usr/share/fonts/gsfonts/NimbusRoman-BoldItalic.otf
++fontFile Helvetica             /usr/share/fonts/gsfonts/NimbusSans-Regular.otf
++fontFile Helvetica-Oblique     /usr/share/fonts/gsfonts/NimbusSans-Oblique.otf
++fontFile Helvetica-Bold        /usr/share/fonts/gsfonts/NimbusSans-Bold.otf
++fontFile Helvetica-BoldOblique /usr/share/fonts/gsfonts/NimbusSans-BoldOblique.otf
++fontFile Courier               /usr/share/fonts/gsfonts/NimbusMonoPS-Regular.otf
++fontFile Courier-Oblique       /usr/share/fonts/gsfonts/NimbusMonoPS-Italic.otf
++fontFile Courier-Bold          /usr/share/fonts/gsfonts/NimbusMonoPS-Bold.otf
++fontFile Courier-BoldOblique   /usr/share/fonts/gsfonts/NimbusMonoPS-BoldItalic.otf
++fontFile Symbol                /usr/share/fonts/gsfonts/StandardSymbolsPS.otf
++fontFile ZapfDingbats          /usr/share/fonts/gsfonts/Z003-MediumItalic.otf
+ 
+ # If you need to display PDF files that refer to non-embedded fonts,
+ # you should add one or more fontDir options to point to the