Skip to content

Commit 3a71ab9

Browse files
committed
Add C++ standard c++latest for MSVC, and C standard C17.
1 parent 24e3dbe commit 3a71ab9

2 files changed

Lines changed: 34 additions & 23 deletions

File tree

ci_config.json

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,30 +1311,40 @@
13111311
"pkgconf:tests=disabled"
13121312
]
13131313
},
1314-
"poppler": {
1314+
"poppler": {
13151315
"_comment": [
1316-
"- fontconfig warns on v1 wraps; fixed in next release"
1317-
],
1318-
"alpine_packages": [
1319-
"cairo-dev",
1320-
"glib-dev",
1321-
"nss-dev",
1322-
"qt5-qtbase-dev",
1323-
"qt6-qtbase-dev"
1324-
],
1325-
"debian_packages": [
1326-
"libcairo2-dev",
1327-
"libglib2.0-dev",
1328-
"libgpgmepp-dev",
1329-
"libnss3-dev",
1330-
"qtbase5-dev",
1331-
"qt6-base-dev"
1332-
],
1333-
"build_options": [
1334-
"poppler:gobject_introspection=disabled"
1335-
],
1316+
"- fontconfig warns on v1 wraps; fixed in next release",
1317+
"- alpine stable doesn't know gpgmepp-dev, yet"
1318+
],
1319+
"alpine_packages": [
1320+
"cairo-dev",
1321+
"glib-dev",
1322+
"nss-dev",
1323+
"qt5-qtbase-dev",
1324+
"qt6-qtbase-dev"
1325+
],
1326+
"debian_packages": [
1327+
"libcairo2-dev",
1328+
"libglib2.0-dev",
1329+
"libgpgmepp-dev",
1330+
"libnss3-dev",
1331+
"qtbase5-dev",
1332+
"qt6-base-dev"
1333+
],
1334+
"brew_packages": [
1335+
"qt@5",
1336+
"qt@6"
1337+
],
1338+
"msys_packages": [
1339+
"glib2-devel",
1340+
"qt5-base",
1341+
"qt6-base"
1342+
],
1343+
"build_options": [
1344+
"poppler:gobject_introspection=disabled"
1345+
],
13361346
"fatal_warnings": false
1337-
},
1347+
},
13381348
"protobuf": {
13391349
"_comment": "Getting patched version elsewhere until abseil-cpp/issues/1510 is fixed, because cannot patch wrapdb version",
13401350
"msys_packages": [

subprojects/packagefiles/poppler/meson.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ project(
1717
license: 'GPL-2.0',
1818
meson_version: '>=1.3.0',
1919
default_options: {
20-
'cpp_std': 'c++23',
20+
'cpp_std': ['c++23', 'c++latest'],
21+
'c_std': 'c17',
2122
},
2223
)
2324

0 commit comments

Comments
 (0)