moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xpdf: update to 4.01.01.

Browse source
This commit is contained in:
asie 2019-06-22 08:48:30 +02:00 • committed by Enno Boland
parent 582c992be1
commit 71877d67ea
2 changed files with 65 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

171
srcpkgs/xpdf/patches/permissions.patch
View file

@ -1,47 +1,15 @@
diff -u -Naur xpdf-3.03-old/xpdf/PDFCore.cc xpdf-3.03-new/xpdf/PDFCore.cc diff -u -Naur xpdf-4.01.01/xpdf/pdfimages.cc xpdf-4.01.01-new/xpdf/pdfimages.cc
--- xpdf-3.03-old/xpdf/PDFCore.cc 2011-08-15 23:08:53.000000000 +0200 --- xpdf-4.01.01/xpdf/pdfimages.cc 2019-03-14 22:01:02.000000000 +0100
+++ xpdf-3.03-new/xpdf/PDFCore.cc 2011-08-20 13:47:13.508475137 +0200 +++ xpdf-4.01.01-new/xpdf/pdfimages.cc 2019-06-22 08:20:28.728639349 +0200
@@ -4,6 +4,8 @@ @@ -126,6 +126,7 @@
// goto err1;
// 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 +#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 // check for copy permission
+#ifdef ENFORCE_PERMISSIONS
if (!doc->okToCopy()) { if (!doc->okToCopy()) {
error(errNotAllowed, -1, error(errNotAllowed, -1,
"Copying of images from this document is not allowed."); @@ -133,6 +134,7 @@
exitCode = 3; exitCode = 3;
goto err1; goto err1;
} }
@ -49,19 +17,29 @@ diff -u -Naur xpdf-3.03-old/xpdf/pdfimages.cc xpdf-3.03-new/xpdf/pdfimages.cc
// get page range // get page range
if (firstPage < 1) if (firstPage < 1)
diff -u -Naur xpdf-3.03-old/xpdf/pdftops.cc xpdf-3.03-new/xpdf/pdftops.cc diff -u -Naur xpdf-4.01.01/xpdf/pdftohtml.cc xpdf-4.01.01-new/xpdf/pdftohtml.cc
--- xpdf-3.03-old/xpdf/pdftops.cc 2011-08-15 23:08:53.000000000 +0200 --- xpdf-4.01.01/xpdf/pdftohtml.cc 2019-03-14 22:01:02.000000000 +0100
+++ xpdf-3.03-new/xpdf/pdftops.cc 2011-08-20 13:51:03.830253411 +0200 +++ xpdf-4.01.01-new/xpdf/pdftohtml.cc 2019-06-22 08:20:37.809638762 +0200
@@ -4,6 +4,8 @@ @@ -138,6 +138,7 @@
// goto err1;
// Copyright 1996-2003 Glyph & Cog, LLC }
//
+// Modified for Debian by Hamish Moffatt, 22 May 2002.
+//
//========================================================================
#include <aconf.h> +#ifdef ENFORCE_PERMISSIONS
@@ -278,12 +280,14 @@ // check for copy permission
if (!doc->okToCopy()) {
error(errNotAllowed, -1,
@@ -145,6 +146,7 @@
exitCode = 3;
goto err1;
}
+#endif
// get page range
if (firstPage < 1) {
diff -u -Naur xpdf-4.01.01/xpdf/pdftops.cc xpdf-4.01.01-new/xpdf/pdftops.cc
--- xpdf-4.01.01/xpdf/pdftops.cc 2019-03-14 22:01:02.000000000 +0100
+++ xpdf-4.01.01-new/xpdf/pdftops.cc 2019-06-22 08:21:06.118636934 +0200
@@ -318,12 +318,14 @@
goto err1; goto err1;
} }
@ -76,19 +54,10 @@ diff -u -Naur xpdf-3.03-old/xpdf/pdftops.cc xpdf-3.03-new/xpdf/pdftops.cc
// construct PostScript file name // construct PostScript file name
if (argc == 3) { if (argc == 3) {
diff -u -Naur xpdf-3.03-old/xpdf/pdftotext.cc xpdf-3.03-new/xpdf/pdftotext.cc diff -u -Naur xpdf-4.01.01/xpdf/pdftotext.cc xpdf-4.01.01-new/xpdf/pdftotext.cc
--- xpdf-3.03-old/xpdf/pdftotext.cc 2011-08-15 23:08:53.000000000 +0200 --- xpdf-4.01.01/xpdf/pdftotext.cc 2019-03-14 22:01:02.000000000 +0100
+++ xpdf-3.03-new/xpdf/pdftotext.cc 2011-08-20 13:51:24.367184150 +0200 +++ xpdf-4.01.01-new/xpdf/pdftotext.cc 2019-06-22 08:20:10.134640549 +0200
@@ -4,6 +4,8 @@ @@ -197,6 +197,7 @@
//
// Copyright 1997-2003 Glyph & Cog, LLC
//
+// Modified for Debian by Hamish Moffatt, 22 May 2002.
+//
//========================================================================
#include <aconf.h>
@@ -168,6 +170,7 @@
goto err2; goto err2;
} }
@ -96,7 +65,7 @@ diff -u -Naur xpdf-3.03-old/xpdf/pdftotext.cc xpdf-3.03-new/xpdf/pdftotext.cc
// check for copy permission // check for copy permission
if (!doc->okToCopy()) { if (!doc->okToCopy()) {
error(errNotAllowed, -1, error(errNotAllowed, -1,
@@ -175,6 +178,7 @@ @@ -204,6 +205,7 @@
exitCode = 3; exitCode = 3;
goto err2; goto err2;
} }
@ -104,70 +73,30 @@ diff -u -Naur xpdf-3.03-old/xpdf/pdftotext.cc xpdf-3.03-new/xpdf/pdftotext.cc
// construct text file name // construct text file name
if (argc == 3) { if (argc == 3) {
diff -u -Naur xpdf-3.03-old/xpdf/XPDFCore.cc xpdf-3.03-new/xpdf/XPDFCore.cc diff -u -Naur xpdf-4.01.01/xpdf-qt/QtPDFCore.cc xpdf-4.01.01-new/xpdf-qt/QtPDFCore.cc
--- xpdf-3.03-old/xpdf/XPDFCore.cc 2011-08-15 23:08:53.000000000 +0200 --- xpdf-4.01.01/xpdf-qt/QtPDFCore.cc 2019-03-14 22:01:02.000000000 +0100
+++ xpdf-3.03-new/xpdf/XPDFCore.cc 2011-08-20 13:48:54.902483779 +0200 +++ xpdf-4.01.01-new/xpdf-qt/QtPDFCore.cc 2019-06-22 08:21:56.460633683 +0200
@@ -4,6 +4,8 @@ @@ -447,9 +447,11 @@
// QChar c;
// Copyright 2002-2003 Glyph & Cog, LLC int i;
//
+// 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 +#ifdef ENFORCE_PERMISSIONS
if (doc->okToCopy()) { if (!doc->okToCopy()) {
copySelection(); return "";
} else {
error(errNotAllowed, -1,
"Copying of text from this document is not allowed.");
} }
+#else
+ copySelection();
+#endif +#endif
if (!(s = getSelectedText())) {
return "";
} }
#endif @@ -476,9 +478,11 @@
if (!toClipboard && !QApplication::clipboard()->supportsSelection()) {
return;
} }
@@ -408,9 +414,11 @@
int pg;
double ulx, uly, lrx, lry;
+#ifdef ENFORCE_PERMISSIONS +#ifdef ENFORCE_PERMISSIONS
if (!doc->okToCopy()) { if (!doc->okToCopy()) {
return; return;
} }
+#endif +#endif
if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) { if (hasSelection()) {
//~ for multithreading: need a mutex here QApplication::clipboard()->setText(getSelectedTextQString(),
if (currentSelection) { toClipboard ? QClipboard::Clipboard
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);

23
srcpkgs/xpdf/template
View file

@ -1,29 +1,30 @@
# Template file for 'xpdf' # Template file for 'xpdf'
pkgname=xpdf pkgname=xpdf
version=3.04 version=4.01.01
revision=2 revision=1
build_style=gnu-configure build_style=cmake
configure_args="--enable-multithreaded configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
--with-freetype2-library=${XBPS_CROSS_BASE}/usr/lib
--with-freetype2-includes=${XBPS_CROSS_BASE}/usr/include/freetype2
--x-includes=${XBPS_CROSS_BASE}/usr/include"
conf_files="/etc/xpdfrc" conf_files="/etc/xpdfrc"
makedepends="lesstif-devel libpaper-devel libXt-devel libXpm-devel libXp-devel freetype-devel" makedepends="freetype-devel qt5-devel libpaper-devel zlib-devel libpng-devel cups-devel"
depends="gsfonts" depends="gsfonts"
short_desc="Viewer for Portable Document Format (PDF) files" short_desc="Viewer for Portable Document Format (PDF) files"
maintainer="Leah Neukirchen <leah@vuxu.org>" maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later" license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="http://www.foolabs.com/xpdf/" homepage="http://www.foolabs.com/xpdf/"
distfiles="https://xpdfreader-dl.s3.amazonaws.com/old/xpdf-$version.tar.gz" distfiles="https://xpdfreader-dl.s3.amazonaws.com/xpdf-$version.tar.gz"
checksum=11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5 checksum=ba550c7d3e4f73b1833cfcdcd9dbe39849dd0cd459b6774c4ecdfeca993204a4
patch_args="-Np1" patch_args="-Np1"
post_extract() { post_extract() {
sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc 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
} }
post_install() { post_install() {
vdoc CHANGES
vdoc README
# copy sample xpdfrc
vmkdir etc
vinstall doc/sample-xpdfrc 644 etc xpdfrc
# already in poppler-utils # already in poppler-utils
rm $DESTDIR/usr/bin/pdf* rm $DESTDIR/usr/bin/pdf*
rm $DESTDIR/usr/share/man/man1/pdf* rm $DESTDIR/usr/share/man/man1/pdf*