From c9e5685f947ed12351b26821372c67ec6d937f8c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 3 Aug 2025 21:45:35 +0200 Subject: [PATCH 1/2] add conan lock --- conan.lock | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 conan.lock diff --git a/conan.lock b/conan.lock new file mode 100644 index 000000000..372ba175d --- /dev/null +++ b/conan.lock @@ -0,0 +1,77 @@ +{ + "version": "0.5", + "requires": [ + "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1750000238.944", + "wvware/1.2.9-odr#6bd4e48d585db93e63d8af1f62aae202%1751998476.120598", + "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1750000219.109", + "util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1750001552.07", + "utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1750000218.416", + "uchardet/0.0.8#a9026ce72d955751db2dbda62c83c430%1750000217.668", + "tmpfile/3.0.6#55320ca8b4f0ce73669da77e247497d5%1751998475.967653", + "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1750000216.958", + "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1751998478.131423", + "poppler/24.08.0-odr#2929132c6c3c67155c6c8f050c923916%1753613717.594275", + "pixman/0.43.4#0dcdf859941e32fcc7bfb73ea1946a7f%1750001639.97", + "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#01227c46d8bced149c1e2dd031406e57%1751998477.185751", + "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1750000236.015", + "openjpeg/2.5.2#6f7b733e151d1bbf5ed05cbabb846828%1750000300.976", + "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1750000211.763", + "miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1750000211.025", + "lzo/2.10#5725914235423c771cb1c6b607109b45%1750001638.618", + "libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1750000648.779", + "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1750000231.957", + "libpng/1.6.48#dd0fc04a42b9a23bce065545a81d4847%1750000297.819", + "libjpeg/9f#8edfe2699565c80c825d0256002504ff%1750000296.672", + "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751481424.612", + "libgsf/1.14.52#9b22c41267004c80ba5cde5d01e23a24%1751998477.691299", + "libgettext/0.22#35d2811b2dd27a98f69e4daa86ca2000%1750000333.394", + "libffi/3.4.8#06926dca35bcf8e321fcc24def952cde%1751053298.477", + "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1750000230.285", + "lcms/2.16#fb083506ff40fd950c9e5c39df8bed54%1750000294.657", + "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1750000208.716", + "glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1751998476.572931", + "giflib/5.2.2#3923fc0f7ffec2f0bdbdee9b548f9248%1750000907.58", + "freetype/2.13.2#5d2563803c8558d4ef47271a82c73d20%1750000292.435", + "fontforge/20240423-git#8ae4b098d2372ee160575ed2aba4aa5c%1751998480.321554", + "fontconfig/2.15.0-odr#2febbef44ca469204c8ff38cfd21db59%1751998477.841393", + "expat/2.7.1#b0b67ba910c5147271b444139ca06953%1750000778.374", + "cryptopp/8.9.0#fe3de584c28c0ecc938a1671e3f1bd72%1750000207.862", + "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1751053293.71", + "cairo/1.18.0-odr#c1d0ad14a91ad6d161e756d54277ac13%1751998477.353945", + "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1750000224.837", + "brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1750000288.894", + "boost/1.86.0#1a9d6c7521c03c76356cfec29a82acb2%1751053276.594", + "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1751998476.420514" + ], + "build_requires": [ + "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1750000238.944", + "pkgconf/2.2.0#6462942a22803086372db44689ba825f%1750000238.024", + "pkgconf/2.1.0#27f44583701117b571307cf5b5fe5605%1750000302.359", + "pkgconf/2.0.3#f996677e96e61e6552d85e83756c328b%1750000237.199", + "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1750000236.015", + "ninja/1.13.0#53ff096207a5599ced46a633271b3cef%1751481429.955", + "meson/1.4.0#2262941cc8fbb0099dd0c196ca2a6c01%1750000234.33", + "meson/1.3.2#26ce8a76a36cc275cdfee1d757bc6561%1750000299.857", + "meson/1.2.2#21b73818ba96d9eea465b310b5bbc993%1750000233.916", + "meson/1.2.1#f2b0c7763308df8e33172744dace8845%1750000298.922", + "m4/1.4.19#b38ced39a01e31fef5435bc634461fd2%1750000233.041", + "libtool/2.4.7#a182d7ce8d4c346a19dbd4a5d532ef68%1750000647.395", + "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1750000231.957", + "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751481424.612", + "libgettext/0.22#35d2811b2dd27a98f69e4daa86ca2000%1750000333.394", + "libffi/3.4.8#06926dca35bcf8e321fcc24def952cde%1751053298.477", + "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1750000230.285", + "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1750000641.043", + "gperf/3.1#1d622ad9717e9348ed3685c9994ad0b9%1750000781.272", + "gnu-config/cci.20210814#69fde734e1a46fd1655b4af46ab40945%1751053297.019", + "glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1751998476.572931", + "gettext/0.22.5#a1f31cc77dee0345699745ef39686dd0%1751053295.554", + "flex/2.6.4#e35bc44b3fcbcd661e0af0dc5b5b1ad4%1750000226.182", + "cmake/3.31.8#dd6e07c418afc4b30cb1c21584dccc49%1751053281.227", + "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1750000224.837", + "automake/1.16.5#058bda3e21c36c9aa8425daf3c1faf50%1750000337.039", + "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1751053275.066" + ], + "python_requires": [], + "config_requires": [] +} \ No newline at end of file From 31b9af7b32c722fe82ea757748b8b29bb3ccd9ef Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 3 Aug 2025 22:02:58 +0200 Subject: [PATCH 2/2] again --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 6a8e22c01..738ec7cf6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -48,7 +48,7 @@ def requirements(self): if self.options.get_safe("with_wvWare", False): self.requires("wvware/1.2.9-odr") self.requires("cpp-httplib/0.16.3") - self.requires("argon2/20190702") + self.requires("argon2/20190702-odr") def build_requirements(self): self.test_requires("gtest/1.14.0")