Skip to content

Commit f6e08f9

Browse files
i0ntempestmascguy
authored andcommitted
poppler: use python 3.13 and boost 1.81
Fix building with clang 19 Closes: trac.macports.org/ticket/72175
1 parent 0d59d52 commit f6e08f9

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

graphics/poppler/Portfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name poppler
99
conflicts poppler-devel xpdf-tools
1010
set my_name poppler
1111
version 24.04.0
12-
revision 1
12+
revision 2
1313
epoch 1
1414

1515
categories graphics
@@ -29,7 +29,7 @@ checksums rmd160 1c25ab2f8e09af54c8211bedfe59d34c47537c70 \
2929
sha256 1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7 \
3030
size 1904936
3131

32-
set py_ver 3.12
32+
set py_ver 3.13
3333
set py_ver_nodot [string map {. {}} ${py_ver}]
3434

3535
depends_build-append \
@@ -85,6 +85,9 @@ patchfiles-append patch-glib_CMakeFiles.txt-fix-include-ordering.diff
8585
# fix library paths in generated typelib file
8686
patchfiles-append patch-glib_CMakeFiles.txt-fix-lib-location.diff
8787

88+
# fix building with llvm/clang 19
89+
patchfiles-append patch-char_traits.diff
90+
8891
if {${configure.compiler} eq "macports-gcc-7"} {
8992
patchfiles-append \
9093
patch-poppler-gcc7-noexcept.diff
@@ -114,7 +117,7 @@ if {[variant_isset debug]} {
114117
variant boost description "Use Boost when building the Splash graphics backend" {
115118
PortGroup boost 1.0
116119

117-
boost.version 1.76
120+
boost.version 1.81
118121
configure.args-replace \
119122
-DENABLE_BOOST=OFF \
120123
-DENABLE_BOOST=ON
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
2+
index 782e07585f1bad69aafe8cc3ee40e7df03ed5ffa..e11849bef78437162ddbf2b3d0dad21328a19f09 100644
3+
--- cpp/poppler-global.h
4+
+++ cpp/poppler-global.h
5+
@@ -98,7 +98,7 @@ typedef unsigned int /* time_t */ time_type;
6+
# pragma warning(push)
7+
# pragma warning(disable : 4251) /* class 'A' needs to have dll interface for to be used by clients of class 'B'. */
8+
#endif
9+
-class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short>
10+
+class POPPLER_CPP_EXPORT ustring : public std::basic_string<char16_t>
11+
{
12+
public:
13+
ustring();

0 commit comments

Comments
 (0)