Skip to content

Commit 709b32e

Browse files
andiwandandiwand
authored
Cherry-pick changes from #452 (#456)
* cherry pick changes from #452 * update lock * try another lzo package * try another uchardet package
1 parent 8da89d3 commit 709b32e

File tree

8 files changed

+34
-52
lines changed

8 files changed

+34
-52
lines changed

‎.github/workflows/build_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
- name: conan remote
5454
run: |
5555
conan remote remove "*"
56-
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
5756
conan remote add conancenter https://center2.conan.io
57+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
5858
- name: conan config
5959
run: conan config install .github/config/conan
6060
- name: conan install

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
- name: conan remote
3030
run: |
3131
conan remote remove "*"
32-
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3332
conan remote add conancenter https://center2.conan.io
33+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3434
- name: conan config
3535
run: conan config install .github/config/conan
3636
- name: conan install

‎.github/workflows/tidy.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ jobs:
2828
run: pip install --upgrade pip conan
2929

3030
- name: conan remote
31-
run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
31+
run: |
32+
conan remote remove "*"
33+
conan remote add conancenter https://center2.conan.io
34+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3235
- name: conan config
3336
run: conan config install .github/config/conan
3437
- name: conan install

‎conan.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@
44
"zstd/1.5.7#fde461c0d847a22f16d3066774f61b11%1744114235.235",
55
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
66
"xz_utils/5.4.5#b885d1d79c9d30cff3803f7f551dbe66%1724318972.064",
7-
"wvware/1.2.9-odr#feeef48fa83e803330bbd3c706718618%1754432357.893",
7+
"wvware/1.2.9-odr#c822f203f7a2dec7b34e4100eabac388%1764497609.565",
88
"vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
9-
"util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1748076007.711",
9+
"util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1729761467.688",
1010
"utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1722968964.685",
11-
"uchardet/0.0.8#a9026ce72d955751db2dbda62c83c430%1703972855.616",
11+
"uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
1212
"pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
13-
"poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1754427610.1551769",
14-
"poppler/24.08.0-odr#2929132c6c3c67155c6c8f050c923916%1754427612.566178",
13+
"poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1764497608.501",
14+
"poppler/24.08.0-odr#2929132c6c3c67155c6c8f050c923916%1764497607.478",
1515
"pixman/0.43.4#0dcdf859941e32fcc7bfb73ea1946a7f%1718828937.421",
16-
"pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#01227c46d8bced149c1e2dd031406e57%1754427609.135946",
16+
"pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#99dd5c7844a56c308fa8221dc8c8c2b2%1764497606.474",
1717
"pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
1818
"openlibm/0.8.3#61d8454cf655e95e0d3d3359bde58ac7%1754339136.456942",
1919
"openjpeg/2.5.2#6f7b733e151d1bbf5ed05cbabb846828%1709653017.024",
2020
"nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
2121
"miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
22-
"lzo/2.10#5725914235423c771cb1c6b607109b45%1685099992.798",
22+
"lzo/2.10#f00b10acc508cea70645727d970a23e1%1759909644.842",
2323
"libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
24-
"libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1748075177.52",
24+
"libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
2525
"libpng/1.6.48#dd0fc04a42b9a23bce065545a81d4847%1746141949.748",
2626
"libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09",
2727
"libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087",
2828
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
29-
"libgsf/1.14.52#9b22c41267004c80ba5cde5d01e23a24%1754427609.682325",
29+
"libgsf/1.14.52#9b22c41267004c80ba5cde5d01e23a24%1764497589.738",
3030
"libgettext/0.22#35d2811b2dd27a98f69e4daa86ca2000%1714393058.647",
3131
"libffi/3.4.8#06926dca35bcf8e321fcc24def952cde%1748531860.405",
3232
"libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
3333
"lcms/2.16#fb083506ff40fd950c9e5c39df8bed54%1703969656.459",
3434
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
35-
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1754427608.367101",
35+
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1764497588.731",
3636
"giflib/5.2.2#3923fc0f7ffec2f0bdbdee9b548f9248%1731663927.701",
3737
"freetype/2.13.2#5d2563803c8558d4ef47271a82c73d20%1728736671.752",
38-
"fontforge/20240423-git#525c82a5e57385c14b647b966e86ea58%1754432335.33",
39-
"fontconfig/2.15.0-odr#2febbef44ca469204c8ff38cfd21db59%1754427609.845061",
38+
"fontforge/20240423-git#525c82a5e57385c14b647b966e86ea58%1764497587.707",
39+
"fontconfig/2.15.0-odr#2febbef44ca469204c8ff38cfd21db59%1764497586.969",
4040
"expat/2.6.3#39b80d3109fbe578fddfe4951f0b1d57%1725469045.298",
4141
"cryptopp/8.9.0#fe3de584c28c0ecc938a1671e3f1bd72%1731421245.374",
4242
"cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106",
43-
"cairo/1.18.0-odr#c1d0ad14a91ad6d161e756d54277ac13%1754427609.450017",
43+
"cairo/1.18.0-odr#c1d0ad14a91ad6d161e756d54277ac13%1764497585.932",
4444
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
4545
"brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041",
4646
"boost/1.86.0#cd839a2082585255010f9e82eea94c7f%1728027203.247",
47-
"argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1754427608.210625"
47+
"argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1764497584.637"
4848
],
4949
"build_requires": [
5050
"zstd/1.5.7#fde461c0d847a22f16d3066774f61b11%1744114235.235",
@@ -71,7 +71,7 @@
7171
"gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37",
7272
"gperf/3.1#1d622ad9717e9348ed3685c9994ad0b9%1709324989.76",
7373
"gnu-config/cci.20210814#dc430d754f465e8c74463019672fb97b%1701248168.479",
74-
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1754427608.367101",
74+
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1764497588.731",
7575
"gettext/0.22.5#a1f31cc77dee0345699745ef39686dd0%1750252839.982",
7676
"flex/2.6.4#e35bc44b3fcbcd661e0af0dc5b5b1ad4%1674818991.113",
7777
"cmake/3.31.8#dd6e07c418afc4b30cb1c21584dccc49%1750223587.75",

‎scripts/conan_install‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
conan install . --output-folder=cmake-build-relwithdebinfo --build=missing -s build_type=RelWithDebInfo -s "&:build_type=RelWithDebInfo"
4+
conan install . --output-folder=cmake-build-debug --build=missing -s build_type=RelWithDebInfo -s "&:build_type=Debug"
5+
conan install . --output-folder=cmake-build-release --build=missing -s build_type=RelWithDebInfo -s "&:build_type=Release"

‎scripts/conan_lock‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
conan lock create .
4+
5+
for profile in .github/config/conan/profiles/*; do
6+
conan lock create . --profile:build "${profile}" --profile:host "${profile}"
7+
done

‎scripts/resource_to_cpp.py‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎scripts/setup‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
scripts/git_hooks/git-hooks --install
55

66
# setup conan
7-
scripts/conan
7+
scripts/conan_install

0 commit comments

Comments
 (0)