<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/ff329d8366f3d14b7926826cbd7fe7a670e6a281">https://github.com/macports/macports-ports/commit/ff329d8366f3d14b7926826cbd7fe7a670e6a281</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 ff329d8 pdf2djvu: upgrade to 0.9.13
</span>ff329d8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ff329d8366f3d14b7926826cbd7fe7a670e6a281
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Fri Jun 14 23:09:33 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> pdf2djvu: upgrade to 0.9.13
</span>---
graphics/pdf2djvu/Portfile | 14 ++---
graphics/pdf2djvu/files/patch-find-page.diff | 79 -------------------------
graphics/pdf2djvu/files/patch-poppler-0.76.diff | 38 ------------
3 files changed, 6 insertions(+), 125 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 ba68381..10fc0d5 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.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jwilk pdf2djvu 0.9.13
</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 32ed0becaa8edb75d91e6763e2dc9d106327384d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 03fa9d9aa1b8086b562e2461ed74e5f9f008f16bfc1459ba62fa3738b37d8e83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 295088
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2a8b473ca93eafc3b7f35daf4824410e91af6edf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0ab16d83129625c86df7c121eddf286458f63cb81ae791e5a76df10a3ab4c63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 296420
</span>
depends_build port:pkgconfig \
port:gsed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,7 @@ depends_lib port:djvulibre \
</span> port:libxslt
patchfiles patch-i18n.hh.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sys-uuid.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-find-page.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-poppler-0.76.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sys-uuid.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-find-page.diff b/graphics/pdf2djvu/files/patch-find-page.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2ebdbbe..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/files/patch-find-page.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8b0348b3d5f33494d7e637411633fbea511a78d7 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, 1 Apr 2019 08:49:02 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Catalog::findPage(int, int).
</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;'>- pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.cc | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf-backend.hh | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf2djvu.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 18 insertions(+), 1 deletion(-)
</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 f1d7662..a1b9b63 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;'>-@@ -631,4 +631,19 @@ 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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return catalog->findPage(pgref.num, pgref.gen);
</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 C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return catalog->findPage(pgref);
</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;'>-+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return find_page_impl<pdf::Catalog>(catalog, pgref);
</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 d7872c3..d88c956 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdf-backend.hh.orig 2019-01-02 07:46:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdf-backend.hh 2019-04-30 23:26:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,6 +82,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ::Catalog Catalog;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ::GooString String;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ::Goffset Offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef ::Ref Ref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* type definitions — annotations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * ==============================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -435,6 +436,8 @@
</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;'>-+ int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
</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/pdf2djvu.cc b/pdf2djvu.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d9e1532..21f2d50 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdf2djvu.cc.orig 2019-01-02 07:46:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdf2djvu.cc 2019-04-30 23:10:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,8 +86,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int page;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (dest->isPageRef())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Ref pageref = dest->getPageRef();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- page = catalog->findPage(pageref.num, pageref.gen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pdf::Ref pageref = dest->getPageRef();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ page = pdf::find_page(catalog, pageref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- page = dest->getPageNum();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/files/patch-poppler-0.76.diff b/graphics/pdf2djvu/files/patch-poppler-0.76.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ddcd8de..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/files/patch-poppler-0.76.diff
</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;'>-From 8325358a9769e8aa33693fc5ea2ac771dd82716f 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: Tue, 23 Apr 2019 08:23:46 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] pdf-backend: simplify find_page() implementation.
</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;'>- pdf-backend.cc | 16 +++++-----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+), 11 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 f6f5267..a94383e 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;'>-@@ -631,19 +631,13 @@ 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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return catalog->findPage(pgref.num, pgref.gen);
</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 C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return catalog->findPage(pgref);
</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;'>- int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return find_page_impl<pdf::Catalog>(catalog, pgref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_VERSION >= 7600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return catalog->findPage(pgref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return catalog->findPage(pgref.num, pgref.gen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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></pre><pre style='margin:0'>
</pre>