<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/387eefbd93d62a73f29ffb83ca85c3e4af705d03">https://github.com/macports/macports-ports/commit/387eefbd93d62a73f29ffb83ca85c3e4af705d03</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 387eefbd93d xpdf: update to 4.05
</span>387eefbd93d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 387eefbd93d62a73f29ffb83ca85c3e4af705d03
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Wed May 22 20:28:59 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> xpdf: update to 4.05
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65336
</span>---
graphics/xpdf/Portfile | 106 ++++++---------------
.../files/patch-xpdf-NameToUnicodeTable.h.diff | 11 ---
.../xpdf/files/patch-xpdf-UnicodeMapTables.h.diff | 18 ----
.../xpdf/files/xpdf-3.04-salvage-your-eye.patch | 38 --------
4 files changed, 29 insertions(+), 144 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xpdf/Portfile b/graphics/xpdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fc510f1e59..6392c461040 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xpdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/xpdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,110 +1,62 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name xpdf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> description Xpdf is a viewer for PDF files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Xpdf is a viewer for Portable Document Format \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PDF) files. These are also sometimes also called \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Acrobat files, from the name of Adobes PDF software.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Xpdf is a viewer for Portable Document Format (PDF) files. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ These are also sometimes also called Acrobat files, from \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the name of Adobes PDF software.
</span>
maintainers nomaintainer
categories graphics print
license {GPL-2 GPL-3}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.foolabs.com/xpdf/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.funet.fi/pub/TeX/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ctan.unsw.edu.au/tex-archive/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.tex.ac.uk/tex-archive/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.kddlabs.co.jp/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.meiji.ac.jp/pub/TeX/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ctan.tug.org/tex-archive/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.dante.de/tex-archive/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://gd.tuwien.ac.at/publishing/tex/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.ntnu.no/pub/tex/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://www.dnsbalance.ring.gr.jp/pub/text/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.t.ring.gr.jp/archives/text/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.chg.ru/pub/TeX/CTAN/support/xpdf/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.foolabs.com/pub/xpdf/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.xpdfreader.com
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fb29aad21054d5d3b349aec4806262feeca1bd8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 825519
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://dl.xpdfreader.com
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:xorg-libXp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xpm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpaper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib:libXm:openmotif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0c2d6533dd117aab8df935b89c3225531c5468c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 92707ed5acb6584fbd73f34091fda91365654ded1f31ba72f0970022cf2a5cea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 986596
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run path:share/fonts/urw-fonts:urw-fonts
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args-replace -p0 -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-xpdf-NameToUnicodeTable.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-xpdf-UnicodeMapTables.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt6 conflicts qt5 description {Use Qt 6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt6 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local/share/ghostscript/fonts|/usr/local/share/fonts/urw-fonts|g;s|/usr/local|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/sample-xpdfrc ${worksrcpath}/xpdf/GlobalParams.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt6.find_method module_path
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-appdef-dir=${prefix}/etc/X11/app-defaults \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xp-library=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xp-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xt-library=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xt-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xm-library=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xm-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libpaper-library=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libpaper-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-freetype2-library=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-freetype2-includes=${prefix}/include/freetype2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-wordlist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-opi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/freetype2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 conflicts qt6 description {Use Qt 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant a4 description {Use A4 as the default paper size instead of Letter} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-a4-paper
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant drm description {Obey access restrictions in PDF files} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset drm]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append ${distname}-salvage-your-eye.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://doc.qt.io/qt-6/macos.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 21 || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # icons are missing when using Qt6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default_variants-append +qt6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_mangle_names description {do not mangle the CLI tool names, conflicts with poppler} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt6]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt5
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# t1lib support should not be on by default; see https://trac.macports.org/ticket/29629
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant t1lib description {Include t1lib support (moved to variant due to security issue)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:t1lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-t1-library=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-t1-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_mangle_names description {do not mangle the CLI tool names, conflicts with poppler} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append poppler
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {! [variant_isset no_mangle_names]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## rename the CLI tools to xpdf-${TOOL_NAME} to avoid conflicts with poppler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach binFile { pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset no_mangle_names]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rename the CLI tools to xpdf-${TOOL_NAME} to avoid conflicts with poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach binFile { pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext pdftohtml } {
</span> 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
}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Xpdf language support packages are also available at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.foolabs.com/xpdf/download.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and are available in MacPorts as xpdf-LANG_NAME.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff b/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b0be2f87e42..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/xpdf/NameToUnicodeTable.h.orig 2014-05-28 13:50:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/xpdf/NameToUnicodeTable.h 2015-01-10 11:37:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4252,5 +4252,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {0x007c, "|"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {0x007d, "}"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {0x007e, "~"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {0xfb05, "st"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {0xfb06, "st"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {0x1d6b, "ue"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0, NULL }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff b/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 299a9b7d8a2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/xpdf/UnicodeMapTables.h.orig 2014-05-28 13:50:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/xpdf/UnicodeMapTables.h 2015-01-10 11:38:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x0178, 0x0178, 0x59, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x017d, 0x017d, 0x5a, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x017e, 0x017e, 0x7a, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { 0x1d6b, 0x1d6b, 0x7565, 2 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x02c6, 0x02c6, 0x5e, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x02da, 0x02da, 0xb0, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x02dc, 0x02dc, 0x7e, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +147,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x0160, 0x0160, 0x53, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x0178, 0x0178, 0x59, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x017d, 0x017d, 0x5a, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { 0x1d6b, 0x1d6b, 0x7565, 2 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x2013, 0x2013, 0x2d, 1 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x2014, 0x2014, 0x2d2d, 2 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 0x2018, 0x2018, 0x60, 1 },
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch b/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0abcc4501d5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xpdf/files/xpdf-3.04-salvage-your-eye.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/xpdf/SecurityHandler.cc.orig 2014-05-28 13:50:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/xpdf/SecurityHandler.cc 2015-01-10 11:36:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -421,9 +421,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gFalse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- permFlags = (*xsh->authorize)(xsh->handlerData, docData, authData);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(permFlags & xpdfPermissionOpen)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gFalse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(*xsh->getKey)(xsh->handlerData, docData, &key, &length, &encVersion)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gFalse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/xpdf/XRef.cc.orig 2014-05-28 13:50:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/xpdf/XRef.cc 2015-01-10 11:36:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -958,19 +958,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool XRef::okToPrint(GBool ignoreOwnerPW) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return gTrue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool XRef::okToChange(GBool ignoreOwnerPW) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return gTrue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool XRef::okToCopy(GBool ignoreOwnerPW) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return gTrue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return gTrue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
</span></pre><pre style='margin:0'>
</pre>