[arch-commits] Commit in xpdf/repos (8 files)
Levente Polyak
anthraxx at archlinux.org
Thu May 5 23:18:52 UTC 2016
Date: Friday, May 6, 2016 @ 01:18:52
Author: anthraxx
Revision: 173884
archrelease: copy trunk to community-i686, community-x86_64
Added:
xpdf/repos/community-i686/
xpdf/repos/community-i686/02-permissions.patch
(from rev 173883, xpdf/trunk/02-permissions.patch)
xpdf/repos/community-i686/PKGBUILD
(from rev 173883, xpdf/trunk/PKGBUILD)
xpdf/repos/community-i686/xpdf.desktop
(from rev 173883, xpdf/trunk/xpdf.desktop)
xpdf/repos/community-x86_64/
xpdf/repos/community-x86_64/02-permissions.patch
(from rev 173883, xpdf/trunk/02-permissions.patch)
xpdf/repos/community-x86_64/PKGBUILD
(from rev 173883, xpdf/trunk/PKGBUILD)
xpdf/repos/community-x86_64/xpdf.desktop
(from rev 173883, xpdf/trunk/xpdf.desktop)
---------------------------------------+
community-i686/02-permissions.patch | 172 ++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 62 +++++++++++
community-i686/xpdf.desktop | 9 +
community-x86_64/02-permissions.patch | 172 ++++++++++++++++++++++++++++++++
community-x86_64/PKGBUILD | 62 +++++++++++
community-x86_64/xpdf.desktop | 9 +
6 files changed, 486 insertions(+)
Copied: xpdf/repos/community-i686/02-permissions.patch (from rev 173883, xpdf/trunk/02-permissions.patch)
===================================================================
--- community-i686/02-permissions.patch (rev 0)
+++ community-i686/02-permissions.patch 2016-05-05 23:18:52 UTC (rev 173884)
@@ -0,0 +1,172 @@
+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);
+
Copied: xpdf/repos/community-i686/PKGBUILD (from rev 173883, xpdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-05 23:18:52 UTC (rev 173884)
@@ -0,0 +1,62 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Mark Pustjens <pustjens at dds.nl>
+
+pkgname=xpdf
+pkgver=3.04
+pkgrel=5
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+backup=('etc/xpdfrc')
+depends=('lesstif' 'gsfonts' 'libxt' 'libpaper')
+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
+ xpdf.desktop)
+sha512sums=('3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf'
+ 'SKIP'
+ 'a5d9358b02e48a49db8d07ecbad67d03aef2614e9bbee7207074a55deb9358a97289b52b04bb6e78f5c99be3d4858abf35c1a42c2e91dfa86c7f382d631dc93c'
+ 'd6163eb220bd567226c6006bef30c6db1eac1263ae161392db9766dca1ce78014cc555dd9d27febd2b924150053fa01b47c06777b1e760864459574c7614bfc4')
+validpgpkeys=('22CCDF00E35F018434DCD4C5429CCA86671B682D') # Derek B. Noonburg <derekn at foolabs.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
+}
+
+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
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm 644 "${srcdir}/xpdf.desktop" -t "${pkgdir}/usr/share/applications"
+ install -Dm 644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+
+ # stuff provided by poppler
+ for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+ rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
+ done
+}
Copied: xpdf/repos/community-i686/xpdf.desktop (from rev 173883, xpdf/trunk/xpdf.desktop)
===================================================================
--- community-i686/xpdf.desktop (rev 0)
+++ community-i686/xpdf.desktop 2016-05-05 23:18:52 UTC (rev 173884)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Xpdf
+Comment=Views Adobe PDF (acrobat) files
+Exec=xpdf %f
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
Copied: xpdf/repos/community-x86_64/02-permissions.patch (from rev 173883, xpdf/trunk/02-permissions.patch)
===================================================================
--- community-x86_64/02-permissions.patch (rev 0)
+++ community-x86_64/02-permissions.patch 2016-05-05 23:18:52 UTC (rev 173884)
@@ -0,0 +1,172 @@
+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);
+
Copied: xpdf/repos/community-x86_64/PKGBUILD (from rev 173883, xpdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-05-05 23:18:52 UTC (rev 173884)
@@ -0,0 +1,62 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Mark Pustjens <pustjens at dds.nl>
+
+pkgname=xpdf
+pkgver=3.04
+pkgrel=5
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+backup=('etc/xpdfrc')
+depends=('lesstif' 'gsfonts' 'libxt' 'libpaper')
+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
+ xpdf.desktop)
+sha512sums=('3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf'
+ 'SKIP'
+ 'a5d9358b02e48a49db8d07ecbad67d03aef2614e9bbee7207074a55deb9358a97289b52b04bb6e78f5c99be3d4858abf35c1a42c2e91dfa86c7f382d631dc93c'
+ 'd6163eb220bd567226c6006bef30c6db1eac1263ae161392db9766dca1ce78014cc555dd9d27febd2b924150053fa01b47c06777b1e760864459574c7614bfc4')
+validpgpkeys=('22CCDF00E35F018434DCD4C5429CCA86671B682D') # Derek B. Noonburg <derekn at foolabs.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
+}
+
+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
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm 644 "${srcdir}/xpdf.desktop" -t "${pkgdir}/usr/share/applications"
+ install -Dm 644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+
+ # stuff provided by poppler
+ for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+ rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
+ done
+}
Copied: xpdf/repos/community-x86_64/xpdf.desktop (from rev 173883, xpdf/trunk/xpdf.desktop)
===================================================================
--- community-x86_64/xpdf.desktop (rev 0)
+++ community-x86_64/xpdf.desktop 2016-05-05 23:18:52 UTC (rev 173884)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Xpdf
+Comment=Views Adobe PDF (acrobat) files
+Exec=xpdf %f
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
More information about the arch-commits
mailing list