<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3fe420d00de8538ee065f6f5be45f14c885658c2">https://github.com/macports/macports-ports/commit/3fe420d00de8538ee065f6f5be45f14c885658c2</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 3fe420d pdf2djvu: update to 0.9.12
</span>3fe420d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3fe420d00de8538ee065f6f5be45f14c885658c2
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Mon Jan 7 20:19:37 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> pdf2djvu: update to 0.9.12
</span>---
graphics/pdf2djvu/Portfile | 15 +--
graphics/pdf2djvu/files/patch-poppler-0.72.diff | 130 ------------------------
2 files changed, 5 insertions(+), 140 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/Portfile b/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bb82b3..4045b95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup jwilk pdf2djvu 0.9.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jwilk pdf2djvu 0.9.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics textproc
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ homepage http://jwilk.net/software/pdf2djvu
</span> github.tarball_from releases
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ed4ed89c8d207672da8a47ffa36c0638007e43db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6deb3d0f109875a5621b8d232e15e5496e56794a095b1e6dd8b1624d4bbd4cc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 291356
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 32ed0becaa8edb75d91e6763e2dc9d106327384d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 03fa9d9aa1b8086b562e2461ed74e5f9f008f16bfc1459ba62fa3738b37d8e83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 295088
</span>
depends_build port:pkgconfig \
port:gsed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,6 @@ depends_lib port:djvulibre \
</span>
patchfiles patch-i18n.hh.diff \
patch-sys-uuid.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# backport upstream patch for poppler 0.72 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# can be removed upon release of pdf2djvu 0.9.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/jwilk/pdf2djvu/commit/82699eee6b071c1f80682987d6842f4b61d024be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-poppler-0.72.diff
</span>
#Openmp is anyway not detected with llvm-gcc or clang, and breaks compilation with
#gcc42 on SL (ticket #38184)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/files/patch-poppler-0.72.diff b/graphics/pdf2djvu/files/patch-poppler-0.72.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 87c09b8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/files/patch-poppler-0.72.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,130 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 82699eee6b071c1f80682987d6842f4b61d024be Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jakub Wilk <jwilk@jwilk.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 12 Nov 2018 10:41:41 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Use GooString::c_str() as alternative to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooString::getCString().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-unicode.cc: In function ‘std::__cxx11::string pdf::string_as_utf8(const String*)’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-unicode.cc:56:35: error: ‘const String {aka const class GooString}’ has no member named ‘getCString’; did you mean ‘GooString’?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.cc: In member function ‘const string pdf::Document::get_xmp()’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.cc:229:34: error: ‘const class GooString’ has no member named ‘getCString’; did you mean ‘GooString’?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.cc: In constructor ‘pdf::Metadata::Metadata(pdf::Document&)’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.cc:396:45: error: ‘const class GooString’ has no member named ‘getCString’; did you mean ‘GooString’?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc: In member function ‘virtual void MutedRenderer::draw_link(pdf::link::Link*, const string&)’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc:459:68: error: ‘const class GooString’ has no member named ‘getCString’; did you mean ‘GooString’?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc: In function ‘int xmain(int, char* const*)’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc:1399:41: error: ‘const class GooString’ has no member named ‘getCString’; did you mean ‘GooString’?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with Poppler > 0.71.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.cc | 19 +++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.hh | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-unicode.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 28 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pdf-backend.cc b/pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52c9716..76c85d6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,7 +226,7 @@ const std::string pdf::Document::get_xmp()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mstring.reset(this->readMetadata());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mstring.get() == nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *cstring = mstring->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *cstring = pdf::get_c_string(*mstring);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strncmp(cstring, "<?xpacket begin=", 16) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cstring += 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,7 +393,7 @@ pdf::Metadata::Metadata(pdf::Document &document)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char tzs = 0; int tzh = 0, tzm = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!pdf::dict_lookup(info_dict, field.first, &object)->isString())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *input = object.getString()->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *input = pdf::get_c_string(object.getString());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (input[0] == 'D' && input[1] == ':')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- input += 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int year = scan_date_digits(input, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -619,4 +619,19 @@ namespace pdf
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<typename S> static auto get_c_string_impl(const S &str) -> decltype(str.c_str())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return str.c_str();
</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;'>-+template<typename S> static auto get_c_string_impl(const S &str) -> decltype(str.getCString())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return str.getCString();
</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;'>-+const char * pdf::get_c_string(const pdf::String &str)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return get_c_string_impl<pdf::String>(str);
</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;'>- // vim:ts=2 sts=2 sw=2 et
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pdf-backend.hh b/pdf-backend.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d4c8419..8683f53 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdf-backend.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdf-backend.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -433,6 +433,14 @@ namespace pdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double get_path_area(pdf::splash::Path &path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char * get_c_string(const pdf::String &str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ inline const char * get_c_string(const pdf::String *str)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return get_c_string(*str);
</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;'>-+
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pdf-unicode.cc b/pdf-unicode.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a0eaaf8..19d8c40 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdf-unicode.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdf-unicode.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@ std::string pdf::string_as_utf8(const pdf::String *string)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * for description of both UTF-16 and UTF-8.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const static uint32_t replacement_character = 0xFFFD;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *cstring = string->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *cstring = pdf::get_c_string(string);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if POPPLER_VERSION < 3500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t clength = const_cast<pdf::String *>(string)->getLength();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b07f287..669eba5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdf2djvu.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdf2djvu.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -456,7 +456,7 @@ class MutedRenderer: public pdf::Renderer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (link_action->getKind())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case actionURI:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- uri += dynamic_cast<pdf::link::URI*>(link_action)->getURI()->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uri += pdf::get_c_string(dynamic_cast<pdf::link::URI*>(link_action)->getURI());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case actionGoTo:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1396,7 +1396,7 @@ static int xmain(int argc, char * const argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma omp critical
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug(0)--;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- debug(1) << doc->getFileName()->getCString() << ":" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ debug(1) << pdf::get_c_string(doc->getFileName()) << ":" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug(0)++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out1.reset(new MainRenderer(paper_color, config.monochrome));
</span></pre><pre style='margin:0'>
</pre>