Skip to content

Commit 8e5e177

Browse files
committed
[libzim] Remove SORTPP_PASS to fix modern Windows SDKs.
Related: openzim/libzim#1017 Related: microsoft#48366
1 parent 3af1d1e commit 8e5e177

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

ports/libzim/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vcpkg_from_github(
88
cross-builds.diff
99
dllexport.diff
1010
subdirs.diff
11+
remove-sortpp-pass.diff # https://github.com/openzim/libzim/pull/1017
1112
)
1213

1314
set(EXTRA_OPTIONS "")
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/meson.build b/meson.build
2+
index adca804..1b2970b 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -61,7 +61,6 @@ public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found())
6+
7+
if build_machine.system() == 'windows'
8+
win_deps = declare_dependency(
9+
- compile_args: ['-DSORTPP_PASS'],
10+
link_args: ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-lshlwapi']
11+
)
12+
else

ports/libzim/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "libzim",
33
"version": "9.4.0",
4+
"port-version": 1,
45
"description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.",
56
"homepage": "https://github.com/openzim/libzim",
67
"license": "GPL-2.0-or-later",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5886,7 +5886,7 @@
58865886
},
58875887
"libzim": {
58885888
"baseline": "9.4.0",
5889-
"port-version": 0
5889+
"port-version": 1
58905890
},
58915891
"libzip": {
58925892
"baseline": "1.11.4",

versions/l-/libzim.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "d335c691779ee94ea8c9e7e145a4eb4439304c16",
5+
"version": "9.4.0",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "c327e69f6f675cfa31d833aa26ae0c96366366b3",
510
"version": "9.4.0",

0 commit comments

Comments
 (0)