<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[131382] trunk/dports/graphics/xpdf</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131382">131382</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-01-10 09:48:35 -0800 (Sat, 10 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xpdf: update to 3.04 (#46352)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsxpdfPortfile">trunk/dports/graphics/xpdf/Portfile</a></li>
<li><a href="#trunkdportsgraphicsxpdffilespatchxpdfNameToUnicodeTablehdiff">trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff</a></li>
<li><a href="#trunkdportsgraphicsxpdffilespatchxpdfUnicodeMapTableshdiff">trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsxpdffilesxpdf304salvageyoureyepatch">trunk/dports/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsxpdffilesxpdf302salvageyoureyepatch">trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsxpdfPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/xpdf/Portfile (131381 => 131382)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,9 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name xpdf
</span><span class="cx"> conflicts pdf2json
</span><del>-set base_version 3.02
-version ${base_version}pl5
-revision 1
</del><ins>+version 3.04
</ins><span class="cx"> description Xpdf is a viewer for PDF files.
</span><span class="cx"> long_description \
</span><span class="cx"> Xpdf is a viewer for Portable Document Format \
</span><span class="lines">@@ -34,32 +32,9 @@
</span><span class="cx"> ftp://ftp.chg.ru/pub/TeX/CTAN/support/xpdf/ \
</span><span class="cx"> ftp://ftp.foolabs.com/pub/xpdf/
</span><span class="cx">
</span><del>-distname ${name}-${base_version}
-
</del><span class="cx"> checksums ${distfiles} \
</span><del>- 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
</del><ins>+ rmd160 fb29aad21054d5d3b349aec4806262feeca1bd8e \
+ sha256 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5
</ins><span class="cx">
</span><span class="cx"> depends_lib \
</span><span class="cx"> port:xorg-libXp port:xpm port:xorg-libXt port:freetype \
</span><span class="lines">@@ -68,13 +43,7 @@
</span><span class="cx"> depends_run path:share/ghostscript/fonts:ghostscript
</span><span class="cx">
</span><span class="cx"> patch.post_args -p1
</span><del>-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 \
</del><ins>+patchfiles patch-xpdf-NameToUnicodeTable.h.diff \
</ins><span class="cx"> patch-xpdf-UnicodeMapTables.h.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -117,15 +86,16 @@
</span><span class="cx"> --with-Xm-includes=${prefix}/include
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant drm description {Obey access restrictions in PDF files} {
- patchfiles-delete xpdf-${version}-salvage-your-eye.patch
</del><ins>+variant drm description {Obey access restrictions in PDF files} {}
+if {![variant_isset drm]} {
+ patchfiles-append ${distname}-salvage-your-eye.patch
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant no_mangle_names description {do not mangle the CLI tool names, conflicts with poppler} {
</span><span class="cx"> conflicts-append poppler
</span><span class="cx"> }
</span><span class="cx">
</span><del>-## make t1lib support a variant, see https://trac.macports.org/ticket/29629)
</del><ins>+# t1lib support should not be on by default; see https://trac.macports.org/ticket/29629
</ins><span class="cx"> variant t1lib description {Include t1lib support (moved to variant due to security issue)} {
</span><span class="cx"> depends_lib-append port:t1lib
</span><span class="cx"> configure.args-append --with-t1-library=${prefix}/lib \
</span><span class="lines">@@ -135,7 +105,7 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> if {! [variant_isset no_mangle_names]} {
</span><span class="cx"> ## rename the CLI tools to xpdf-${TOOL_NAME} to avoid conflicts with poppler
</span><del>- foreach binFile { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
</del><ins>+ foreach binFile { pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
</ins><span class="cx"> move ${destroot}${prefix}/bin/${binFile} ${destroot}${prefix}/bin/${name}-${binFile}
</span><span class="cx"> move ${destroot}${prefix}/share/man/man1/${binFile}.1 ${destroot}${prefix}/share/man/man1/${name}-${binFile}.1
</span><span class="cx"> }
</span><span class="lines">@@ -143,7 +113,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> notes "
</span><del>-xpdf 3.02pl5 revision 1 (aka 'xpdf @3.02pl5_1') without +t1lib is xpdf 3.02pl6.
</del><span class="cx"> Xpdf language support packages are also available at
</span><span class="cx"> http://www.foolabs.com/xpdf/download.html
</span><span class="cx"> and are available in MacPorts as xpdf-LANG_NAME.
</span></span></pre></div>
<a id="trunkdportsgraphicsxpdffilespatchxpdfNameToUnicodeTablehdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff (131381 => 131382)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> {0x007c, "|"},
</span><span class="cx"> {0x007d, "}"},
</span><span class="cx"> {0x007e, "~"},
</span></span></pre></div>
<a id="trunkdportsgraphicsxpdffilespatchxpdfUnicodeMapTableshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff (131381 => 131382)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- 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
</del><ins>+--- 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
</ins><span class="cx"> @@ -25,6 +25,7 @@
</span><span class="cx"> { 0x0178, 0x0178, 0x59, 1 },
</span><span class="cx"> { 0x017d, 0x017d, 0x5a, 1 },
</span><span class="lines">@@ -8,18 +8,7 @@
</span><span class="cx"> { 0x02c6, 0x02c6, 0x5e, 1 },
</span><span class="cx"> { 0x02da, 0x02da, 0xb0, 1 },
</span><span class="cx"> { 0x02dc, 0x02dc, 0x7e, 1 },
</span><del>-@@ -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 @@
</del><ins>+@@ -146,6 +147,7 @@
</ins><span class="cx"> { 0x0160, 0x0160, 0x53, 1 },
</span><span class="cx"> { 0x0178, 0x0178, 0x59, 1 },
</span><span class="cx"> { 0x017d, 0x017d, 0x5a, 1 },
</span><span class="lines">@@ -27,14 +16,3 @@
</span><span class="cx"> { 0x2013, 0x2013, 0x2d, 1 },
</span><span class="cx"> { 0x2014, 0x2014, 0x2d2d, 2 },
</span><span class="cx"> { 0x2018, 0x2018, 0x60, 1 },
</span><del>-@@ -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))
-
</del></span></pre></div>
<a id="trunkdportsgraphicsxpdffilesxpdf302salvageyoureyepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch (131381 => 131382)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>---- 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) {
</del></span></pre></div>
<a id="trunkdportsgraphicsxpdffilesxpdf304salvageyoureyepatchfromrev131363trunkdportsgraphicsxpdffilesxpdf302salvageyoureyepatch"></a>
<div class="copfile"><h4>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) (0 => 131382)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+--- 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) {
</ins></span></pre>
</div>
</div>
</body>
</html>