[arch-commits] Commit in xpdf/trunk (6 files)

Levente Polyak anthraxx at archlinux.org
Fri Sep 1 20:19:13 UTC 2017


    Date: Friday, September 1, 2017 @ 20:19:13
  Author: anthraxx
Revision: 255257

upgpkg: xpdf 4.00-1 (release + openmotif rebuild/switch)

Added:
  xpdf/trunk/xpdf-4.00-64bit.patch
  xpdf/trunk/xpdf-4.00-libpaperfix.patch
  xpdf/trunk/xpdf-4.00-man-path-fix.patch
  xpdf/trunk/xpdf-4.00-permissions.patch
Modified:
  xpdf/trunk/PKGBUILD
Deleted:
  xpdf/trunk/02-permissions.patch

------------------------------+
 02-permissions.patch         |  172 -----------------------------------------
 PKGBUILD                     |   67 +++++++++------
 xpdf-4.00-64bit.patch        |   69 ++++++++++++++++
 xpdf-4.00-libpaperfix.patch  |  105 +++++++++++++++++++++++++
 xpdf-4.00-man-path-fix.patch |   96 ++++++++++++++++++++++
 xpdf-4.00-permissions.patch  |  132 +++++++++++++++++++++++++++++++
 6 files changed, 441 insertions(+), 200 deletions(-)

Deleted: 02-permissions.patch
===================================================================
--- 02-permissions.patch	2017-09-01 18:39:53 UTC (rev 255256)
+++ 02-permissions.patch	2017-09-01 20:19:13 UTC (rev 255257)
@@ -1,172 +0,0 @@
-diff -u -Naur xpdf-3.03-old/xpdf/PDFCore.cc xpdf-3.03-new/xpdf/PDFCore.cc
---- xpdf-3.03-old/xpdf/PDFCore.cc	2011-08-15 23:08:53.000000000 +0200
-+++ xpdf-3.03-new/xpdf/PDFCore.cc	2011-08-20 13:47:13.508475137 +0200
-@@ -4,6 +4,8 @@
- //
- // Copyright 2004 Glyph & Cog, LLC
- //
-+// Modified for Debian by Hamish Moffatt, 18 August 2005.
-+//
- //========================================================================
- 
- #include <aconf.h>
-@@ -1619,9 +1621,11 @@
-   int x0, y0, x1, y1, t;
-   GString *s;
- 
-+#ifdef ENFORCE_PERMISSIONS
-   if (!doc->okToCopy()) {
-     return NULL;
-   }
-+#endif
-   if ((page = findPage(pg))) {
-     cvtUserToDev(pg, xMin, yMin, &x0, &y0);
-     cvtUserToDev(pg, xMax, yMax, &x1, &y1);
-diff -u -Naur xpdf-3.03-old/xpdf/pdfimages.cc xpdf-3.03-new/xpdf/pdfimages.cc
---- xpdf-3.03-old/xpdf/pdfimages.cc	2011-08-15 23:08:53.000000000 +0200
-+++ xpdf-3.03-new/xpdf/pdfimages.cc	2011-08-20 13:50:39.638162542 +0200
-@@ -4,6 +4,8 @@
- //
- // Copyright 1998-2003 Glyph & Cog, LLC
- //
-+// Modified for Debian by Hamish Moffatt, 22 May 2002.
-+//
- //========================================================================
- 
- #include <aconf.h>
-@@ -119,12 +121,14 @@
-   }
- 
-   // check for copy permission
-+#ifdef ENFORCE_PERMISSIONS
-   if (!doc->okToCopy()) {
-     error(errNotAllowed, -1,
- 	  "Copying of images from this document is not allowed.");
-     exitCode = 3;
-     goto err1;
-   }
-+#endif
- 
-   // get page range
-   if (firstPage < 1)
-diff -u -Naur xpdf-3.03-old/xpdf/pdftops.cc xpdf-3.03-new/xpdf/pdftops.cc
---- xpdf-3.03-old/xpdf/pdftops.cc	2011-08-15 23:08:53.000000000 +0200
-+++ xpdf-3.03-new/xpdf/pdftops.cc	2011-08-20 13:51:03.830253411 +0200
-@@ -4,6 +4,8 @@
- //
- // Copyright 1996-2003 Glyph & Cog, LLC
- //
-+// Modified for Debian by Hamish Moffatt, 22 May 2002.
-+//
- //========================================================================
- 
- #include <aconf.h>
-@@ -278,12 +280,14 @@
-     goto err1;
-   }
- 
-+#ifdef ENFORCE_PERMISSIONS
-   // check for print permission
-   if (!doc->okToPrint()) {
-     error(errNotAllowed, -1, "Printing this document is not allowed.");
-     exitCode = 3;
-     goto err1;
-   }
-+#endif
- 
-   // construct PostScript file name
-   if (argc == 3) {
-diff -u -Naur xpdf-3.03-old/xpdf/pdftotext.cc xpdf-3.03-new/xpdf/pdftotext.cc
---- xpdf-3.03-old/xpdf/pdftotext.cc	2011-08-15 23:08:53.000000000 +0200
-+++ xpdf-3.03-new/xpdf/pdftotext.cc	2011-08-20 13:51:24.367184150 +0200
-@@ -4,6 +4,8 @@
- //
- // Copyright 1997-2003 Glyph & Cog, LLC
- //
-+// Modified for Debian by Hamish Moffatt, 22 May 2002.
-+//
- //========================================================================
- 
- #include <aconf.h>
-@@ -168,6 +170,7 @@
-     goto err2;
-   }
- 
-+#ifdef ENFORCE_PERMISSIONS
-   // check for copy permission
-   if (!doc->okToCopy()) {
-     error(errNotAllowed, -1,
-@@ -175,6 +178,7 @@
-     exitCode = 3;
-     goto err2;
-   }
-+#endif
- 
-   // construct text file name
-   if (argc == 3) {
-diff -u -Naur xpdf-3.03-old/xpdf/XPDFCore.cc xpdf-3.03-new/xpdf/XPDFCore.cc
---- xpdf-3.03-old/xpdf/XPDFCore.cc	2011-08-15 23:08:53.000000000 +0200
-+++ xpdf-3.03-new/xpdf/XPDFCore.cc	2011-08-20 13:48:54.902483779 +0200
-@@ -4,6 +4,8 @@
- //
- // Copyright 2002-2003 Glyph & Cog, LLC
- //
-+// Modified for Debian by Hamish Moffatt, 22 May 2002.
-+//
- //========================================================================
- 
- #include <aconf.h>
-@@ -384,12 +386,16 @@
- #ifndef NO_TEXT_SELECT
-       if (selectULX != selectLRX &&
- 	  selectULY != selectLRY) {
-+#ifdef ENFORCE_PERMISSIONS
- 	if (doc->okToCopy()) {
- 	  copySelection();
- 	} else {
- 	  error(errNotAllowed, -1,
- 		"Copying of text from this document is not allowed.");
- 	}
-+#else
-+        copySelection();
-+#endif
-       }
- #endif
-     }
-@@ -408,9 +414,11 @@
-   int pg;
-   double ulx, uly, lrx, lry;
- 
-+#ifdef ENFORCE_PERMISSIONS
-   if (!doc->okToCopy()) {
-     return;
-   }
-+#endif
-   if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
-     //~ for multithreading: need a mutex here
-     if (currentSelection) {
-diff -u -Naur xpdf-3.03-old/xpdf/XPDFViewer.cc xpdf-3.03-new/xpdf/XPDFViewer.cc
---- xpdf-3.03-old/xpdf/XPDFViewer.cc	2011-08-15 23:08:53.000000000 +0200
-+++ xpdf-3.03-new/xpdf/XPDFViewer.cc	2011-08-20 13:49:52.908140863 +0200
-@@ -4,6 +4,8 @@
- //
- // Copyright 2002-2003 Glyph & Cog, LLC
- //
-+// Modified for Debian by Hamish Moffatt, 22 May 2002.
-+//
- //========================================================================
- 
- #include <aconf.h>
-@@ -3492,10 +3494,12 @@
-   PSOutputDev *psOut;
- 
-   doc = viewer->core->getDoc();
-+#ifdef ENFORCE_PERMISSIONS
-   if (!doc->okToPrint()) {
-     error(errNotAllowed, -1, "Printing this document is not allowed.");
-     return;
-   }
-+#endif
- 
-   viewer->core->setBusyCursor(gTrue);
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-01 18:39:53 UTC (rev 255256)
+++ PKGBUILD	2017-09-01 20:19:13 UTC (rev 255257)
@@ -6,44 +6,51 @@
 # Contributor: Mark Pustjens <pustjens at dds.nl>
 
 pkgname=xpdf
-pkgver=3.04
-pkgrel=5
+pkgver=4.00
+pkgrel=1
 pkgdesc='Viewer for Portable Document Format (PDF) files'
-url='http://www.foolabs.com/xpdf/'
+url='https://www.xpdfreader.com/'
 arch=('i686' 'x86_64')
-license=('GPL2')
+license=('GPL3')
 backup=('etc/xpdfrc')
-depends=('lesstif' 'gsfonts' 'libxt' 'libpaper')
+depends=('openmotif' 'gsfonts' 'libxt' 'libpaper' 'xdg-utils' 'qt5-base' 'libpng' 'libxpm')
 optdepends=('poppler: tools that used to be included in xpdf'
             'desktop-file-utils: for desktop environments')
-source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
-        02-permissions.patch
+makedepends=('cmake' 'qt5-tools')
+source=(https://www.xpdfreader.com/dl/${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.desktop)
-sha512sums=('3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf'
+sha512sums=('32fb928aeb053be29c7342dda8caac8a7a3720e8f39507df29ad5a070e1423cc0960da4d7b36046d0be27b842b108e984363c0285839a0fd371a119948af0cac'
             'SKIP'
-            'a5d9358b02e48a49db8d07ecbad67d03aef2614e9bbee7207074a55deb9358a97289b52b04bb6e78f5c99be3d4858abf35c1a42c2e91dfa86c7f382d631dc93c'
+            '25707095b0825b5d5c0fd63f357dfac57a81ec65b9a6b75155126be04de8ac24cf8048bf55eb9baaf9dd8cf79ed2aa8e19ebcacb79b48a569462d4cc7ad620f3'
+            '77d533e0cb2ed5e232a0497891eb6ec634659305a1c19d7c3a8f7efee1d18ba9e03b1ee009a9834497f8d7721694d4bd65e897ee4c9499544194bf6b240052a0'
+            'f17c1c19c29518a3538a202c19fb60efc7721a42065d32c841f9ed929e571d9373c8558fdae251c1ef3781857cf51483244276179862998f94c9c1fd8bd63695'
+            'aa101da42a3f4d8a559f8387143909c863de80dd6c4d2454a9a6cecef41a889f6e5d88225c22ec2c271c05eb77a412a0e0d66b94554b9ff5ccfe97953f1c1c4e'
             'd6163eb220bd567226c6006bef30c6db1eac1263ae161392db9766dca1ce78014cc555dd9d27febd2b924150053fa01b47c06777b1e760864459574c7614bfc4')
-validpgpkeys=('22CCDF00E35F018434DCD4C5429CCA86671B682D') # Derek B. Noonburg <derekn at foolabs.com>
+validpgpkeys=('A56006CA75CF8B13FA2F120DF4825F5397271342') # -Xpdf- <xpdf at xpdfreader.com>
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 < "${srcdir}/02-permissions.patch"
-  sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
-  sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
+  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"
+  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() {
-  cd ${pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-multithreaded \
-    --with-freetype2-library=/usr/lib \
-    --with-freetype2-includes=/usr/include/freetype2 \
-    --x-includes=/usr/include \
-    --with-Xm-library=/usr/lib \
-    --with-Xm-includes=/usr/include
+  cd ${pkgname}-${pkgver}/build
+  cmake .. \
+  -DMULTITHREADED=ON \
+  -DOPI_SUPPORT=ON \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=Release
   make
 }
 
@@ -50,13 +57,17 @@
 package() {
   cd ${pkgname}-${pkgver}
 
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 
+  install -Dm 644 xpdfrc -t "${pkgdir}/etc"
   install -Dm 644 "${srcdir}/xpdf.desktop" -t "${pkgdir}/usr/share/applications"
-  install -Dm 644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+  install -Dm 644 xpdf-qt/xpdf-icon.svg "${pkgdir}/usr/share/pixmaps/xpdf.svg"
+  install -Dm 644 README CHANGES -t "${pkgdir}/usr/share/doc/${pkgname}"
 
-  # stuff provided by poppler
-  for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+  # remove stuff provided by poppler
+  for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext pdftohtml; do
     rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
   done
 }
+
+# vim: ts=2 sw=2 et:

Added: xpdf-4.00-64bit.patch
===================================================================
--- xpdf-4.00-64bit.patch	                        (rev 0)
+++ xpdf-4.00-64bit.patch	2017-09-01 20:19:13 UTC (rev 255257)
@@ -0,0 +1,69 @@
+diff -up xpdf-4.00/goo/gmem.cc.alloc xpdf-4.00/goo/gmem.cc
+--- xpdf-4.00/goo/gmem.cc.alloc	2017-08-08 19:22:50.000000000 -0400
++++ xpdf-4.00/goo/gmem.cc	2017-08-16 18:01:21.363210992 -0400
+@@ -78,8 +78,8 @@ static int gMaxMemInUse = 0;
+ #endif /* DEBUG_MEM */
+ 
+ #ifdef DEBUG_MEM
+-void *gmalloc(int size, int ignore) GMEM_EXCEP {
+-  int size1;
++void *gmalloc(size_t size, int ignore) GMEM_EXCEP {
++  size_t size1;
+   char *mem;
+   GMemHdr *hdr;
+   void *data;
+@@ -128,7 +128,7 @@ void *gmalloc(int size, int ignore) GMEM
+   return data;
+ }
+ #else
+-void *gmalloc(int size) GMEM_EXCEP {
++void *gmalloc(size_t size) GMEM_EXCEP {
+   void *p;
+ 
+   if (size < 0) {
+@@ -144,11 +144,11 @@ void *gmalloc(int size) GMEM_EXCEP {
+ }
+ #endif
+ 
+-void *grealloc(void *p, int size) GMEM_EXCEP {
++void *grealloc(void *p, size_t size) GMEM_EXCEP {
+ #ifdef DEBUG_MEM
+   GMemHdr *hdr;
+   void *q;
+-  int oldSize;
++  size_t oldSize;
+ 
+   if (size < 0) {
+     gMemError("Invalid memory allocation size");
+@@ -224,7 +224,7 @@ void *greallocn(void *p, int nObjs, int
+ 
+ void gfree(void *p) {
+ #ifdef DEBUG_MEM
+-  int size;
++  size_t size;
+   GMemHdr *hdr;
+   unsigned long *trl, *clr;
+ 
+diff -up xpdf-4.00/goo/gmem.h.alloc xpdf-4.00/goo/gmem.h
+--- xpdf-4.00/goo/gmem.h.alloc	2017-08-16 17:59:32.770952926 -0400
++++ xpdf-4.00/goo/gmem.h	2017-08-16 18:02:14.289874604 -0400
+@@ -37,16 +37,16 @@ extern "C" {
+  * returns NULL.
+  */
+ #ifdef DEBUG_MEM
+-extern void *gmalloc(int size, int ignore = 0) GMEM_EXCEP;
++extern void *gmalloc(size_t size, int ignore = 0) GMEM_EXCEP;
+ #else
+-extern void *gmalloc(int size) GMEM_EXCEP;
++extern void *gmalloc(size_t size) GMEM_EXCEP;
+ #endif
+ 
+ /*
+  * Same as realloc, but prints error message and exits if realloc()
+  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
+  */
+-extern void *grealloc(void *p, int size) GMEM_EXCEP;
++extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
+ 
+ /*
+  * These are similar to gmalloc and grealloc, but take an object count

Added: xpdf-4.00-libpaperfix.patch
===================================================================
--- xpdf-4.00-libpaperfix.patch	                        (rev 0)
+++ xpdf-4.00-libpaperfix.patch	2017-09-01 20:19:13 UTC (rev 255257)
@@ -0,0 +1,105 @@
+diff -up xpdf-4.00/xpdf/CMakeLists.txt.paperfix xpdf-4.00/xpdf/CMakeLists.txt
+--- xpdf-4.00/xpdf/CMakeLists.txt.paperfix	2017-08-08 19:22:50.000000000 -0400
++++ xpdf-4.00/xpdf/CMakeLists.txt	2017-08-16 19:40:19.103263736 -0400
+@@ -108,7 +108,7 @@ if (HAVE_SPLASH)
+   target_link_libraries(pdftops goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY}
+-                        ${LCMS_LIBRARY})
++                        ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ else ()
+   add_executable(pdftops
+     $<TARGET_OBJECTS:xpdf_objs>
+@@ -116,7 +116,7 @@ else ()
+     PSOutputDev.cc
+     pdftops.cc
+   )
+-  target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY})
++  target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ endif ()
+ install(TARGETS pdftops RUNTIME DESTINATION bin)
+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1)
+@@ -128,7 +128,7 @@ add_executable(pdftotext
+   TextOutputDev.cc
+   pdftotext.cc
+ )
+-target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY})
++target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdftotext RUNTIME DESTINATION bin)
+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1)
+ 
+@@ -145,7 +145,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
+   target_link_libraries(pdftohtml goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY}
+-                        ${LCMS_LIBRARY} ${PNG_LIBRARIES})
++                        ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
+   install(TARGETS pdftohtml RUNTIME DESTINATION bin)
+   install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1)
+ endif ()
+@@ -156,7 +156,7 @@ add_executable(pdfinfo
+   $<TARGET_OBJECTS:xpdf_objs>
+   pdfinfo.cc
+ )
+-target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY})
++target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdfinfo RUNTIME DESTINATION bin)
+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1)
+ 
+@@ -166,7 +166,7 @@ add_executable(pdffonts
+   $<TARGET_OBJECTS:xpdf_objs>
+   pdffonts.cc
+ )
+-target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY})
++target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdffonts RUNTIME DESTINATION bin)
+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1)
+ 
+@@ -176,7 +176,7 @@ add_executable(pdfdetach
+   $<TARGET_OBJECTS:xpdf_objs>
+   pdfdetach.cc
+ )
+-target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY})
++target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdfdetach RUNTIME DESTINATION bin)
+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1)
+ 
+@@ -191,7 +191,7 @@ if (HAVE_SPLASH)
+   target_link_libraries(pdftoppm goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY}
+-                        ${LCMS_LIBRARY})
++                        ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+   install(TARGETS pdftoppm RUNTIME DESTINATION bin)
+   install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1)
+ endif ()
+@@ -207,7 +207,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
+   target_link_libraries(pdftopng goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY}
+-                        ${LCMS_LIBRARY} ${PNG_LIBRARIES})
++                        ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
+   install(TARGETS pdftopng RUNTIME DESTINATION bin)
+   install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1)
+ endif ()
+@@ -219,7 +219,7 @@ add_executable(pdfimages
+   ImageOutputDev.cc
+   pdfimages.cc
+ )
+-target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY})
++target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdfimages RUNTIME DESTINATION bin)
+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1)
+ 
+diff -up xpdf-4.00/xpdf-qt/CMakeLists.txt.paperfix xpdf-4.00/xpdf-qt/CMakeLists.txt
+--- xpdf-4.00/xpdf-qt/CMakeLists.txt.paperfix	2017-08-16 19:39:23.275757290 -0400
++++ xpdf-4.00/xpdf-qt/CMakeLists.txt	2017-08-16 19:39:47.810100923 -0400
+@@ -83,7 +83,7 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND)
+   target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES}
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY} ${LCMS_LIBRARY}
+-                        ${CMAKE_THREAD_LIBS_INIT})
++                        ${CMAKE_THREAD_LIBS_INIT} ${HAVE_PAPER_H})
+   set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1)
+ 
+   install(TARGETS xpdf RUNTIME DESTINATION bin)

Added: xpdf-4.00-man-path-fix.patch
===================================================================
--- xpdf-4.00-man-path-fix.patch	                        (rev 0)
+++ xpdf-4.00-man-path-fix.patch	2017-09-01 20:19:13 UTC (rev 255257)
@@ -0,0 +1,96 @@
+diff -up xpdf-4.00/xpdf/CMakeLists.txt.manfix xpdf-4.00/xpdf/CMakeLists.txt
+--- xpdf-4.00/xpdf/CMakeLists.txt.manfix	2017-08-16 19:43:23.612344976 -0400
++++ xpdf-4.00/xpdf/CMakeLists.txt	2017-08-16 19:43:46.189746281 -0400
+@@ -119,7 +119,7 @@ else ()
+   target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ endif ()
+ install(TARGETS pdftops RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION share/man/man1)
+ 
+ #--- pdftotext
+ 
+@@ -130,7 +130,7 @@ add_executable(pdftotext
+ )
+ target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdftotext RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION share/man/man1)
+ 
+ #--- pdftohtml
+ 
+@@ -147,7 +147,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
+                         ${DTYPE_LIBRARY}
+                         ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
+   install(TARGETS pdftohtml RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION share/man/man1)
+ endif ()
+ 
+ #--- pdfinfo
+@@ -158,7 +158,7 @@ add_executable(pdfinfo
+ )
+ target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdfinfo RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION share/man/man1)
+ 
+ #--- pdffonts
+ 
+@@ -168,7 +168,7 @@ add_executable(pdffonts
+ )
+ target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdffonts RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION share/man/man1)
+ 
+ #--- pdfdetach
+ 
+@@ -178,7 +178,7 @@ add_executable(pdfdetach
+ )
+ target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdfdetach RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION share/man/man1)
+ 
+ #--- pdftoppm
+ 
+@@ -193,7 +193,7 @@ if (HAVE_SPLASH)
+                         ${DTYPE_LIBRARY}
+                         ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+   install(TARGETS pdftoppm RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION share/man/man1)
+ endif ()
+ 
+ #--- pdftopng
+@@ -209,7 +209,7 @@ if (HAVE_SPLASH AND PNG_FOUND)
+                         ${DTYPE_LIBRARY}
+                         ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${HAVE_PAPER_H})
+   install(TARGETS pdftopng RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION share/man/man1)
+ endif ()
+ 
+ #--- pdfimages
+@@ -221,8 +221,8 @@ add_executable(pdfimages
+ )
+ target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${HAVE_PAPER_H})
+ install(TARGETS pdfimages RUNTIME DESTINATION bin)
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION share/man/man1)
+ 
+ #--- xpdfrc man page
+ 
+-install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION man/man5)
++install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION share/man/man5)
+diff -up xpdf-4.00/xpdf-qt/CMakeLists.txt.manfix xpdf-4.00/xpdf-qt/CMakeLists.txt
+--- xpdf-4.00/xpdf-qt/CMakeLists.txt.manfix	2017-08-16 19:44:45.218180999 -0400
++++ xpdf-4.00/xpdf-qt/CMakeLists.txt	2017-08-16 19:44:50.394043748 -0400
+@@ -87,5 +87,5 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND)
+   set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1)
+ 
+   install(TARGETS xpdf RUNTIME DESTINATION bin)
+-  install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION man/man1)
++  install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION share/man/man1)
+ endif ()

Added: xpdf-4.00-permissions.patch
===================================================================
--- xpdf-4.00-permissions.patch	                        (rev 0)
+++ xpdf-4.00-permissions.patch	2017-09-01 20:19:13 UTC (rev 255257)
@@ -0,0 +1,132 @@
+diff -up xpdf-4.00/xpdf/PDFCore.cc.permissions xpdf-4.00/xpdf/PDFCore.cc
+diff -up xpdf-4.00/xpdf/pdfimages.cc.permissions xpdf-4.00/xpdf/pdfimages.cc
+--- xpdf-4.00/xpdf/pdfimages.cc.permissions	2017-08-08 19:22:50.000000000 -0400
++++ xpdf-4.00/xpdf/pdfimages.cc	2017-08-16 18:08:04.474032500 -0400
+@@ -4,6 +4,8 @@
+ //
+ // Copyright 1998-2003 Glyph & Cog, LLC
+ //
++// Modified for Debian by Hamish Moffatt, 22 May 2002.
++//
+ //========================================================================
+ 
+ #include <aconf.h>
+@@ -126,12 +128,14 @@ int main(int argc, char *argv[]) {
+   }
+ 
+   // check for copy permission
++#ifdef ENFORCE_PERMISSIONS
+   if (!doc->okToCopy()) {
+     error(errNotAllowed, -1,
+ 	  "Copying of images from this document is not allowed.");
+     exitCode = 3;
+     goto err1;
+   }
++#endif
+ 
+   // get page range
+   if (firstPage < 1)
+diff -up xpdf-4.00/xpdf/pdftohtml.cc.permissions xpdf-4.00/xpdf/pdftohtml.cc
+--- xpdf-4.00/xpdf/pdftohtml.cc.permissions	2017-08-16 18:10:36.656189850 -0400
++++ xpdf-4.00/xpdf/pdftohtml.cc	2017-08-16 18:11:06.127445692 -0400
+@@ -137,6 +137,7 @@ int main(int argc, char *argv[]) {
+     goto err1;
+   }
+ 
++#ifdef ENFORCE_PERMISSIONS
+   // check for copy permission
+   if (!doc->okToCopy()) {
+     error(errNotAllowed, -1,
+@@ -144,6 +145,7 @@ int main(int argc, char *argv[]) {
+     exitCode = 3;
+     goto err1;
+   }
++#endif
+ 
+   // get page range
+   if (firstPage < 1) {
+diff -up xpdf-4.00/xpdf/pdftops.cc.permissions xpdf-4.00/xpdf/pdftops.cc
+--- xpdf-4.00/xpdf/pdftops.cc.permissions	2017-08-08 19:22:50.000000000 -0400
++++ xpdf-4.00/xpdf/pdftops.cc	2017-08-16 18:08:04.475032475 -0400
+@@ -4,6 +4,8 @@
+ //
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
++// Modified for Debian by Hamish Moffatt, 22 May 2002.
++//
+ //========================================================================
+ 
+ #include <aconf.h>
+@@ -321,12 +323,14 @@ int main(int argc, char *argv[]) {
+     goto err1;
+   }
+ 
++#ifdef ENFORCE_PERMISSIONS
+   // check for print permission
+   if (!doc->okToPrint()) {
+     error(errNotAllowed, -1, "Printing this document is not allowed.");
+     exitCode = 3;
+     goto err1;
+   }
++#endif
+ 
+   // construct PostScript file name
+   if (argc == 3) {
+diff -up xpdf-4.00/xpdf/pdftotext.cc.permissions xpdf-4.00/xpdf/pdftotext.cc
+--- xpdf-4.00/xpdf/pdftotext.cc.permissions	2017-08-08 19:22:50.000000000 -0400
++++ xpdf-4.00/xpdf/pdftotext.cc	2017-08-16 18:08:04.475032475 -0400
+@@ -4,6 +4,8 @@
+ //
+ // Copyright 1997-2013 Glyph & Cog, LLC
+ //
++// Modified for Debian by Hamish Moffatt, 22 May 2002.
++//
+ //========================================================================
+ 
+ #include <aconf.h>
+@@ -198,6 +200,7 @@ int main(int argc, char *argv[]) {
+     goto err2;
+   }
+ 
++#ifdef ENFORCE_PERMISSIONS
+   // check for copy permission
+   if (!doc->okToCopy()) {
+     error(errNotAllowed, -1,
+@@ -205,6 +208,7 @@ int main(int argc, char *argv[]) {
+     exitCode = 3;
+     goto err2;
+   }
++#endif
+ 
+   // construct text file name
+   if (argc == 3) {
+diff -up xpdf-4.00/xpdf-qt/QtPDFCore.cc.permissions xpdf-4.00/xpdf-qt/QtPDFCore.cc
+--- xpdf-4.00/xpdf-qt/QtPDFCore.cc.permissions	2017-08-16 18:09:45.169489907 -0400
++++ xpdf-4.00/xpdf-qt/QtPDFCore.cc	2017-08-16 18:10:14.375752439 -0400
+@@ -429,9 +429,11 @@ QString QtPDFCore::getSelectedTextQStrin
+   QChar c;
+   int i;
+ 
++#ifdef ENFORCE_PERMISSIONS
+   if (!doc->okToCopy()) {
+     return "";
+   }
++#endif
+   if (!(s = getSelectedText())) {
+     return "";
+   }
+diff -up xpdf-4.00/xpdf-qt/XpdfWidget.cc.permissions xpdf-4.00/xpdf-qt/XpdfWidget.cc
+--- xpdf-4.00/xpdf-qt/XpdfWidget.cc.permissions	2017-08-16 18:12:40.775055809 -0400
++++ xpdf-4.00/xpdf-qt/XpdfWidget.cc	2017-08-16 18:12:45.835928020 -0400
+@@ -1399,7 +1399,11 @@ bool XpdfWidget::okToExtractText() const
+     if (!core->getDoc()) {
+       return false;
+     }
++#ifdef ENFORCE_PERMISSIONS
+     return (bool)core->getDoc()->okToCopy();
++#else
++    return true;
++#endif
+   } catch (GMemException e) {
+     return false;
+   }



More information about the arch-commits mailing list