<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92ce573717c4dd734a21582a729a34b37699cd2d">https://github.com/macports/macports-ports/commit/92ce573717c4dd734a21582a729a34b37699cd2d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 92ce573717c4dd734a21582a729a34b37699cd2d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Apr 15 13:36:57 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    poppler: update to 24.04.0; add patch from poppler-devel
</span>---
 graphics/poppler/Portfile                                   | 13 +++++++++----
 .../files/patch-glib_CMakeFiles.txt-fix-lib-location.diff   | 11 +++++++++++
 2 files changed, 20 insertions(+), 4 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 c8f15e9675a..f14efd3a6b9 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;'>@@ -8,7 +8,7 @@ PortGroup           legacysupport 1.1
</span> name                poppler
 conflicts           poppler-devel xpdf-tools
 set my_name         poppler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             24.03.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             24.04.0
</span> revision            0
 
 categories          graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,14 +24,15 @@ distname            ${my_name}-${version}
</span> dist_subdir         ${my_name}
 use_xz              yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  aaf078ac231d2694e8d8714b8acbded0a64aa7ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1902068
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  1c25ab2f8e09af54c8211bedfe59d34c47537c70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1904936
</span> 
 set py_ver          3.12
 set py_ver_nodot    [string map {. {}} ${py_ver}]
 
 depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:gettext \
</span>                     port:pkgconfig \
                     port:python${py_ver_nodot}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +43,7 @@ depends_lib-append \
</span>                     port:expat \
                     port:fontconfig \
                     port:freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:gettext-runtime \
</span>                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gpgme \
                     port:lcms2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +81,9 @@ patchfiles-append   patch-cmake_modules_PopplerMacros.cmake.diff
</span> # be source / build first, then system, as best can be determined
 patchfiles-append   patch-glib_CMakeFiles.txt-fix-include-ordering.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix library paths in generated typelib file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-glib_CMakeFiles.txt-fix-lib-location.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${configure.compiler} eq "macports-gcc-7"} {
     patchfiles-append \
                     patch-poppler-gcc7-noexcept.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-lib-location.diff b/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-lib-location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4241b21c8bd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/files/patch-glib_CMakeFiles.txt-fix-lib-location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/CMakeLists.txt.orig       2023-11-04 19:56:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/CMakeLists.txt    2023-11-04 19:58:09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,6 +123,8 @@
</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 ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  list(APPEND INTROSPECTION_COMPILER_ARGS "--shared-library=${CMAKE_INSTALL_NAME_DIR}/libpoppler-glib.${POPPLER_GLIB_SOVERSION}" "--shared-library=${CMAKE_INSTALL_NAME_DIR}/libpoppler.${POPPLER_SOVERSION_NUMBER}")
</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;'>+   set(Poppler_0_18_gir "poppler-glib")
</span></pre><pre style='margin:0'>

</pre>