<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03aaf05d2beb883168e9f439a6a41329825589bc">https://github.com/macports/macports-ports/commit/03aaf05d2beb883168e9f439a6a41329825589bc</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 03aaf05d2be poppler: update to 22.02.0
</span>03aaf05d2be is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03aaf05d2beb883168e9f439a6a41329825589bc
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Feb 9 10:21:35 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> poppler: update to 22.02.0
</span>---
graphics/poppler/Portfile | 32 +++++++++++-----------
graphics/poppler/files/patch-check-boost.diff | 28 +++++++++++++------
.../patch-cmake_modules_PopplerMacros.cmake.diff | 4 +--
...h-glib_CMakeFiles.txt-fix-include-ordering.diff | 6 ++--
graphics/poppler/files/patch-trac-57167.diff | 12 --------
5 files changed, 40 insertions(+), 42 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 df127e9438f..79fd775f3a4 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;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
PortGroup gobject_introspection 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
name poppler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 22.02.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 83955e916df329edc3ccbc394778ca80ccacaa2a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1660164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 85761216e56c4bf1008041af65a3c922fb2c8580 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e390c8b806f6c9f0e35c8462033e0a738bb2460ebd660bdb8b6dca01556193e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1807024
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,16 +56,14 @@ configure.cppflags-delete -I${prefix}/include
</span> configure.ldflags-append -liconv
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 1999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2001
</span> compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix Boost checking to be optional
</span> patchfiles-append patch-check-boost.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/57167
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-trac-57167.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# match clang, not streual
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# match clang, not strequal
</span> patchfiles-append patch-cmake_modules_PopplerMacros.cmake.diff
# fix header include path ordering for gobject-introspection call to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,8 +78,10 @@ configure.args-append \
</span> -DBUILD_QT5_TESTS=OFF \
-DBUILD_QT6_TESTS=OFF \
-DBUILD_CPP_TESTS=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_MANUAL_TESTS=OFF \
</span> -DWITH_NSS3=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_BOOST_HEADERS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUN_GPERF_IF_PRESENT=OFF
</span>
# Poppler cmake doesn't understand build type "MacPorts"; use release unless +debug is set
if {[variant_isset debug]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,9 +92,9 @@ if {[variant_isset debug]} {
</span>
variant boost description "Use Boost when building the Splash graphics backend" {
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DUSE_BOOST_HEADERS=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_BOOST_HEADERS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost.version 1.76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_BOOST=ON
</span> }
default_variants-append +boost
<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 324421fe078..148bff7cf06 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,11 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2020-10-01 21:44:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-10-08 14:15:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -178,7 +178,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(HAVE_SPLASH ${ENABLE_SPLASH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,11 +201,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for Cairo rendering backend
</span> macro_optional_find_package(Cairo ${CAIRO_VERSION})
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if(ENABLE_SPLASH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(ENABLE_SPLASH AND USE_BOOST_HEADERS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Boost 1.58.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Boost 1.58.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(USE_BOOST_HEADERS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(ENABLE_BOOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "-- Boost recommended for Splash. Use ENABLE_BOOST=OFF to skip.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_BOOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Boost 1.58.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(USE_BOOST_HEADERS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "-- Boost enabled for Splash but not found.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CAIRO_FOUND)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-cmake_modules_PopplerMacros.cmake.diff b/graphics/poppler/files/patch-cmake_modules_PopplerMacros.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a6c6fb632d..3a5a0898629 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/files/patch-cmake_modules_PopplerMacros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/files/patch-cmake_modules_PopplerMacros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> --- cmake/modules/PopplerMacros.cmake.orig
+++ cmake/modules/PopplerMacros.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,7 +128,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(GCC_HAS_AS_NEEDED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_compiler_flags_changed 1)
</span> endif (CMAKE_COMPILER_IS_GNUCXX)
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
<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 6628f2227bb..8caf77a7fa7 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,14 +1,14 @@
</span> --- glib/CMakeLists.txt.orig
+++ glib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,6 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,6 +119,7 @@
</span> # General gir: Reset object-list for introspection & load tool args
set(INTROSPECTION_GIRS)
set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
+ list(APPEND INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
<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:#e0ffe0;'>+ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
</span>
# Poppler: Assign package to gir & export keys
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,9 +134,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,9 +131,27 @@
</span>
# Format list of include directories as compiler flags
get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-trac-57167.diff b/graphics/poppler/files/patch-trac-57167.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90356c02fea..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/files/patch-trac-57167.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2020-07-02 13:32:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-07-08 22:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--project(poppler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+project(poppler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(PopplerDefaults)
</span></pre><pre style='margin:0'>
</pre>