<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/400bb58db38a2985eedb656f785373fb0becb9c6">https://github.com/macports/macports-ports/commit/400bb58db38a2985eedb656f785373fb0becb9c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 400bb58db38a2985eedb656f785373fb0becb9c6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Nov 1 20:24:07 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    poppler: update to 20.11.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    + Remove integrated patchfiles (patch-bug106417.diff, patch-327a7ce0.diff)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    + Integrate residual of patch-bug106417.diff into patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    + update patches to apply cleanly
</span>---
 graphics/poppler/Portfile                          | 16 ++----
 graphics/poppler/files/patch-327a7ce0.diff         | 57 ----------------------
 graphics/poppler/files/patch-bug106417.diff        | 10 ----
 graphics/poppler/files/patch-check-boost.diff      |  2 +-
 ...h-glib_CMakeFiles.txt-fix-include-ordering.diff | 15 ++++--
 5 files changed, 17 insertions(+), 83 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/Portfile b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6356650d35..35a385f0d8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup           cmake 1.1
</span> PortGroup           legacysupport 1.0
 
 name                poppler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             20.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             20.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> 
 conflicts           xpdf-tools
 license             GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ master_sites        ${homepage} \
</span> 
 use_xz              yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  b4d8fa452a61648f3531d96e2ffc136d224d5bdd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1644528
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  fc3b21544423fd5e8eaf80de63dd42c9348138a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1648432
</span> 
 depends_build-append \
                     port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,15 +62,9 @@ compiler.thread_local_storage yes
</span> 
 patchfiles-append   patch-check-boost.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.freedesktop.org/show_bug.cgi?id=106417
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-bug106417.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://trac.macports.org/ticket/57167
 patchfiles-append   patch-trac-57167.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# upstream fix; remove at next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-327a7ce0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # match clang, not streual
 patchfiles-append   patch-cmake_modules_PopplerMacros.cmake.diff
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-327a7ce0.diff b/graphics/poppler/files/patch-327a7ce0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5cb9313e693..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/files/patch-327a7ce0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,57 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,30 +126,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GObject Introspection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   include(GObjectIntrospectionMacros)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # General gir: Reset object-list for introspection & load tool args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(INTROSPECTION_GIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR} --warn-all")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  list(APPEND INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Poppler: Assign package to gir & export keys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(Poppler_0_18_gir "poppler-glib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(Poppler_0_18_gir_INCLUDES GObject-2.0 Gio-2.0 cairo-1.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(Poppler_0_18_gir_EXPORT_PACKAGES "poppler-glib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Then load library and header lists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(Poppler_0_18_gir_LIBS "poppler-glib" "poppler")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(Poppler_0_18_gir_INCLUDES "GObject-2.0" "Gio-2.0" "cairo-1.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Format list of include directories as compiler flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   _list_prefix(_includes _tmp_includes "-I")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # And set flags for gir compiler and scanner
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(Poppler_0_18_gir_LIBS poppler-glib poppler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  list(APPEND _abs_introspection_files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(Poppler_0_18_gir_FILES ${_abs_introspection_files})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(Poppler_0_18_gir_SCANNERFLAGS --c-include poppler.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(Poppler_0_18_gir_EXPORT_PACKAGES poppler-glib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(Poppler_0_18_gir_SCANNERFLAGS "--c-include=poppler.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Load temporary source-file lists, including a few generated at build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(orig_introspect_srcs ${poppler_glib_SRCS} ${poppler_glib_public_headers})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(gen_introspect_srcs "poppler-enums.c" "poppler-enums.h" "poppler-features.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Prefix the files with their correct directories for full paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  _list_prefix(_orig_introspect_paths orig_introspect_srcs "${CMAKE_CURRENT_SOURCE_DIR}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  _list_prefix(_gen_introspect_paths gen_introspect_srcs "${CMAKE_CURRENT_BINARY_DIR}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Now load them to the final file list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(Poppler_0_18_gir_FILES ${_orig_introspect_paths} ${_gen_introspect_paths})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  # Finally, load the list of objects for introspection & invoke macro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   list(APPEND INTROSPECTION_GIRS Poppler-0.18.gir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   gir_add_introspections(INTROSPECTION_GIRS)
</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;color:#808080;'>diff --git a/graphics/poppler/files/patch-bug106417.diff b/graphics/poppler/files/patch-bug106417.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eb9a07dad0d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/files/patch-bug106417.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/CMakeLists.txt.orig       2020-04-27 14:26:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/CMakeLists.txt    2020-04-29 14:42:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,6 +128,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   include(GObjectIntrospectionMacros)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(INTROSPECTION_GIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR} --warn-all")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-check-boost.diff b/graphics/poppler/files/patch-check-boost.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f31a9199936..2ff6d0324a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/files/patch-check-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/files/patch-check-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig   2020-10-01 21:44:58.000000000 +0200
 +++ CMakeLists.txt     2020-10-08 14:15:20.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,7 +291,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +311,7 @@
</span>    include_directories(SYSTEM ${LCMS2_INCLUDE_DIR})
  endif()
  
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff b/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e6350cf9ffa..6628f2227bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,19 @@
</span> --- glib/CMakeLists.txt.orig
 +++ glib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,9 +142,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # General gir: Reset object-list for introspection & load tool args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(INTROSPECTION_GIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  list(APPEND INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Poppler: Assign package to gir & export keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,9 +134,27 @@
</span>  
    # Format list of include directories as compiler flags
    get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--  _list_prefix(_includes _tmp_includes "-I")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  _list_prefix(_tmp2_includes _tmp_includes "-I")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  _gir_list_prefix(_includes _tmp_includes "-I")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  _gir_list_prefix(_tmp2_includes _tmp_includes "-I")
</span> +  # reorder includes to be interal to build or source first, then
 +  # external, as best we can determine which is which
 +  set(_includes "")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +32,6 @@
</span> +    endif()
 +  endforeach()
 +  list(APPEND _includes ${_includes_last})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span>    # And set flags for gir compiler and scanner
 -  set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
 +  set(Poppler_0_18_gir_CFLAGS -v ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
</pre><pre style='margin:0'>

</pre>