[131382] trunk/dports/graphics/xpdf
ryandesign at macports.org
ryandesign at macports.org
Sat Jan 10 09:48:35 PST 2015
Revision: 131382
https://trac.macports.org/changeset/131382
Author: ryandesign at macports.org
Date: 2015-01-10 09:48:35 -0800 (Sat, 10 Jan 2015)
Log Message:
-----------
xpdf: update to 3.04 (#46352)
Modified Paths:
--------------
trunk/dports/graphics/xpdf/Portfile
trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff
trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff
Added Paths:
-----------
trunk/dports/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch
Removed Paths:
-------------
trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch
Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile 2015-01-10 17:19:35 UTC (rev 131381)
+++ trunk/dports/graphics/xpdf/Portfile 2015-01-10 17:48:35 UTC (rev 131382)
@@ -4,9 +4,7 @@
name xpdf
conflicts pdf2json
-set base_version 3.02
-version ${base_version}pl5
-revision 1
+version 3.04
description Xpdf is a viewer for PDF files.
long_description \
Xpdf is a viewer for Portable Document Format \
@@ -34,32 +32,9 @@
ftp://ftp.chg.ru/pub/TeX/CTAN/support/xpdf/ \
ftp://ftp.foolabs.com/pub/xpdf/
-distname ${name}-${base_version}
-
checksums ${distfiles} \
- md5 599dc4cc65a07ee868cf92a667a913d2 \
- sha1 f9940698840c8a8045677e8be68ab8580903e20a \
- rmd160 e900cb8670b8c430beaa45895fb474411cb1958d \
- ${distname}pl1.patch \
- md5 877118786dfe27d1b7aa5a6759cc6e45 \
- sha1 cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d \
- rmd160 5c310f96760f72e9c1062b00c57c2ed035ac6757 \
- ${distname}pl2.patch \
- md5 3a5cb165ae66781e0b21e6219ae06795 \
- sha1 d082ebe0d36cad0c04603950216f5c52de1c2593 \
- rmd160 0024e3d203d69e073a458570cec5679e260ad204 \
- ${distname}pl3.patch \
- md5 581963ede0fb5715e1a69f01b5b8ce63 \
- sha1 23f496804802a3da530f1d0bab894bae3e938fc2 \
- rmd160 859ec3131d3c4526a6075ee639c5eb704194211b \
- ${distname}pl4.patch \
- md5 70b752716798dd341a4bf890df5f6fdc \
- sha1 1aa3087a1c7882884ae7d3a502240a55acca65fd \
- rmd160 428065e8c9639b6799705b216be603f52efb8a22 \
- ${distname}pl5.patch \
- md5 504902ca5e9d66c67eed03636ec6b163 \
- sha1 0acd49e73bba47fa1ec7b479eb8f1398a33eabbc \
- rmd160 f502a7c5311e935f3e4a5fd5b770b44e68c09a7a
+ rmd160 fb29aad21054d5d3b349aec4806262feeca1bd8e \
+ sha256 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5
depends_lib \
port:xorg-libXp port:xpm port:xorg-libXt port:freetype \
@@ -68,13 +43,7 @@
depends_run path:share/ghostscript/fonts:ghostscript
patch.post_args -p1
-patchfiles ${distname}pl1.patch \
- ${distname}pl2.patch \
- ${distname}pl3.patch \
- ${distname}pl4.patch \
- ${distname}pl5.patch \
- ${distname}-salvage-your-eye.patch \
- patch-xpdf-NameToUnicodeTable.h.diff \
+patchfiles patch-xpdf-NameToUnicodeTable.h.diff \
patch-xpdf-UnicodeMapTables.h.diff
post-patch {
@@ -117,15 +86,16 @@
--with-Xm-includes=${prefix}/include
}
-variant drm description {Obey access restrictions in PDF files} {
- patchfiles-delete xpdf-${version}-salvage-your-eye.patch
+variant drm description {Obey access restrictions in PDF files} {}
+if {![variant_isset drm]} {
+ patchfiles-append ${distname}-salvage-your-eye.patch
}
variant no_mangle_names description {do not mangle the CLI tool names, conflicts with poppler} {
conflicts-append poppler
}
-## make t1lib support a variant, see https://trac.macports.org/ticket/29629)
+# t1lib support should not be on by default; see https://trac.macports.org/ticket/29629
variant t1lib description {Include t1lib support (moved to variant due to security issue)} {
depends_lib-append port:t1lib
configure.args-append --with-t1-library=${prefix}/lib \
@@ -135,7 +105,7 @@
post-destroot {
if {! [variant_isset no_mangle_names]} {
## rename the CLI tools to xpdf-${TOOL_NAME} to avoid conflicts with poppler
- foreach binFile { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
+ foreach binFile { pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
move ${destroot}${prefix}/bin/${binFile} ${destroot}${prefix}/bin/${name}-${binFile}
move ${destroot}${prefix}/share/man/man1/${binFile}.1 ${destroot}${prefix}/share/man/man1/${name}-${binFile}.1
}
@@ -143,7 +113,6 @@
}
notes "
-xpdf 3.02pl5 revision 1 (aka 'xpdf @3.02pl5_1') without +t1lib is xpdf 3.02pl6.
Xpdf language support packages are also available at
http://www.foolabs.com/xpdf/download.html
and are available in MacPorts as xpdf-LANG_NAME.
Modified: trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff
===================================================================
--- trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff 2015-01-10 17:19:35 UTC (rev 131381)
+++ trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff 2015-01-10 17:48:35 UTC (rev 131382)
@@ -1,6 +1,6 @@
---- a/xpdf/NameToUnicodeTable.h.orig 2007-02-27 14:05:52.000000000 -0800
-+++ b/xpdf/NameToUnicodeTable.h 2009-01-15 18:08:24.000000000 -0800
-@@ -1093,5 +1093,8 @@
+--- a/xpdf/NameToUnicodeTable.h.orig 2014-05-28 13:50:50.000000000 -0500
++++ b/xpdf/NameToUnicodeTable.h 2015-01-10 11:37:29.000000000 -0600
+@@ -4252,5 +4252,8 @@
{0x007c, "|"},
{0x007d, "}"},
{0x007e, "~"},
Modified: trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff
===================================================================
--- trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff 2015-01-10 17:19:35 UTC (rev 131381)
+++ trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff 2015-01-10 17:48:35 UTC (rev 131382)
@@ -1,5 +1,5 @@
---- a/xpdf/UnicodeMapTables.h.orig 2007-02-27 14:05:52.000000000 -0800
-+++ b/xpdf/UnicodeMapTables.h 2009-01-16 10:26:16.000000000 -0800
+--- a/xpdf/UnicodeMapTables.h.orig 2014-05-28 13:50:50.000000000 -0500
++++ b/xpdf/UnicodeMapTables.h 2015-01-10 11:38:23.000000000 -0600
@@ -25,6 +25,7 @@
{ 0x0178, 0x0178, 0x59, 1 },
{ 0x017d, 0x017d, 0x5a, 1 },
@@ -8,18 +8,7 @@
{ 0x02c6, 0x02c6, 0x5e, 1 },
{ 0x02da, 0x02da, 0xb0, 1 },
{ 0x02dc, 0x02dc, 0x7e, 1 },
-@@ -64,7 +65,9 @@
- { 0xfb01, 0xfb01, 0x6669, 2 },
- { 0xfb02, 0xfb02, 0x666c, 2 },
- { 0xfb03, 0xfb03, 0x666669, 3 },
-- { 0xfb04, 0xfb04, 0x66666c, 3 }
-+ { 0xfb04, 0xfb04, 0x66666c, 3 },
-+ { 0xfb05, 0xfb05, 0x7374, 2 },
-+ { 0xfb06, 0xfb06, 0x7374, 2 }
- };
- #define latin1UnicodeMapLen (sizeof(latin1UnicodeMapRanges) / sizeof(UnicodeMapRange))
-
-@@ -144,6 +147,7 @@
+@@ -146,6 +147,7 @@
{ 0x0160, 0x0160, 0x53, 1 },
{ 0x0178, 0x0178, 0x59, 1 },
{ 0x017d, 0x017d, 0x5a, 1 },
@@ -27,14 +16,3 @@
{ 0x2013, 0x2013, 0x2d, 1 },
{ 0x2014, 0x2014, 0x2d2d, 2 },
{ 0x2018, 0x2018, 0x60, 1 },
-@@ -197,7 +201,9 @@
- { 0xfb01, 0xfb01, 0x6669, 2 },
- { 0xfb02, 0xfb02, 0x666c, 2 },
- { 0xfb03, 0xfb03, 0x666669, 3 },
-- { 0xfb04, 0xfb04, 0x66666c, 3 }
-+ { 0xfb04, 0xfb04, 0x66666c, 3 },
-+ { 0xfb05, 0xfb05, 0x7374, 2 },
-+ { 0xfb06, 0xfb06, 0x7374, 2 }
- };
- #define ascii7UnicodeMapLen (sizeof(ascii7UnicodeMapRanges) / sizeof(UnicodeMapRange))
-
Deleted: trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch
===================================================================
--- trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch 2015-01-10 17:19:35 UTC (rev 131381)
+++ trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch 2015-01-10 17:48:35 UTC (rev 131382)
@@ -1,38 +0,0 @@
---- a/xpdf/SecurityHandler.cc.orig 2007-02-27 23:05:52.000000000 +0100
-+++ b/xpdf/SecurityHandler.cc 2007-06-05 12:23:37.000000000 +0200
-@@ -373,9 +373,6 @@
- return gFalse;
- }
- permFlags = (*xsh->authorize)(xsh->handlerData, docData, authData);
-- if (!(permFlags & xpdfPermissionOpen)) {
-- return gFalse;
-- }
- if (!(*xsh->getKey)(xsh->handlerData, docData, &key, &length, &encVersion)) {
- return gFalse;
- }
---- a/xpdf/XRef.cc.orig 2007-02-27 23:05:52.000000000 +0100
-+++ b/xpdf/XRef.cc 2007-06-05 12:26:31.000000000 +0200
-@@ -782,19 +782,19 @@
- }
-
- GBool XRef::okToPrint(GBool ignoreOwnerPW) {
-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
-+ return gTrue;
- }
-
- GBool XRef::okToChange(GBool ignoreOwnerPW) {
-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
-+ return gTrue;
- }
-
- GBool XRef::okToCopy(GBool ignoreOwnerPW) {
-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
-+ return gTrue;
- }
-
- GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
-+ return gTrue;
- }
-
- Object *XRef::fetch(int num, int gen, Object *obj) {
Copied: trunk/dports/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch (from rev 131363, trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch)
===================================================================
--- trunk/dports/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch (rev 0)
+++ trunk/dports/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch 2015-01-10 17:48:35 UTC (rev 131382)
@@ -0,0 +1,38 @@
+--- a/xpdf/SecurityHandler.cc.orig 2014-05-28 13:50:50.000000000 -0500
++++ b/xpdf/SecurityHandler.cc 2015-01-10 11:36:21.000000000 -0600
+@@ -421,9 +421,6 @@
+ return gFalse;
+ }
+ permFlags = (*xsh->authorize)(xsh->handlerData, docData, authData);
+- if (!(permFlags & xpdfPermissionOpen)) {
+- return gFalse;
+- }
+ if (!(*xsh->getKey)(xsh->handlerData, docData, &key, &length, &encVersion)) {
+ return gFalse;
+ }
+--- a/xpdf/XRef.cc.orig 2014-05-28 13:50:50.000000000 -0500
++++ b/xpdf/XRef.cc 2015-01-10 11:36:21.000000000 -0600
+@@ -958,19 +958,19 @@
+ }
+
+ GBool XRef::okToPrint(GBool ignoreOwnerPW) {
+- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
++ return gTrue;
+ }
+
+ GBool XRef::okToChange(GBool ignoreOwnerPW) {
+- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
++ return gTrue;
+ }
+
+ GBool XRef::okToCopy(GBool ignoreOwnerPW) {
+- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
++ return gTrue;
+ }
+
+ GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
+- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
++ return gTrue;
+ }
+
+ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150110/cd4b3910/attachment.html>
More information about the macports-changes
mailing list