<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/e84162e8559603dd1acaac512a97c17ad1c47457">https://github.com/macports/macports-ports/commit/e84162e8559603dd1acaac512a97c17ad1c47457</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 e84162e8559 poppler-devel: fix library paths in generated typelib file (#21251)
</span>e84162e8559 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e84162e8559603dd1acaac512a97c17ad1c47457
</span>Author: FlyingSamson <FlyingSamson@tuxcad.de>
AuthorDate: Sat Feb 3 15:03:32 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> poppler-devel: fix library paths in generated typelib file (#21251)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specify explicit paths to dynamic libraries in install prefix in call
</span><span style='display:block; white-space:pre;color:#404040;'> to g-ir-compiler to be included in generated typelib files
</span>---
graphics/poppler-devel/Portfile | 5 ++++-
.../files/patch-glib_CMakeFiles.txt-fix-lib-location.diff | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-devel/Portfile b/graphics/poppler-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a29c7ab1f9..96df94e884f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ name poppler-devel
</span> conflicts poppler xpdf-tools
set my_name poppler
version 24.01.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories graphics
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +76,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-devel/files/patch-glib_CMakeFiles.txt-fix-lib-location.diff b/graphics/poppler-devel/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-devel/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>