From 6b63e1f1c2901f7f380387c53ead4ac54359195f Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 20:27:10 +0200 Subject: [PATCH 01/12] bump pdf2htmlex --- conan.lock | 15 +++++++++------ conanfile.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conan.lock b/conan.lock index d18c3884..8a283e94 100644 --- a/conan.lock +++ b/conan.lock @@ -12,10 +12,12 @@ "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978", "pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483", "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014", - "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1764497608.501", + "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780325860.873493", + "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780325860.723243", "poppler/24.08.0-odr#5150a6889acc1c8c9176d857c12fa3c8%1766352521.627", "pixman/0.46.2#88b157b4faa6474a6028c2ba2a987924%1752742515.414", "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#fadb1d15d841bf6c75e3bc76bde81777%1766352519.27", + "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780325860.2562702", "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", "openjpeg/2.5.4#372fbc2b4348d45ab0c0a62a8475dc2f%1760446899.685", "nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94", @@ -34,19 +36,20 @@ "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", "lcms/2.17#3feb06eea368c52c82f50107cd7694cd%1753693316.094", "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169", - "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1766352509.109", + "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780325856.10291", "giflib/5.2.2#b445ec67bae61a96ddf0fa5614afde18%1773315754.794", "freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281", + "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780325855.94292", "fontforge/20240423-git#af7f643fc24bfd3661e97e8adf7c5a72%1766352508.159", - "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1766352507.462", + "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780325855.632538", "expat/2.7.5#89bbde1770876a19bb8620b9808941cc%1773806275.408", "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119", "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106", - "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1766352506.497", + "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1780325855.472789", "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", "brotli/1.1.0#3f631ef77008f7b5eb388780116371a3%1764862343.045", "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1765955095.179", - "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1764497584.637" + "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1780325855.2969868" ], "build_requires": [ "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", @@ -70,7 +73,7 @@ "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37", "gperf/3.1#a7afdf8f7cccdc2dcd4d962370c33d4f%1755780571.156", "gnu-config/cci.20210814#466e9d4d7779e1c142443f7ea44b4284%1762363589.329", - "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1766352509.109", + "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780325856.10291", "gettext/0.26#28c867efd4914f03c6c05da08a23c35b%1765299118.633", "flex/2.6.4#efa781fc5088b47c895bd4eef6911f2e%1761560242.855", "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1773780142.26", diff --git a/conanfile.py b/conanfile.py index 32705106..54125ab5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,7 +47,7 @@ def requirements(self): self.requires("uchardet/0.0.8") self.requires("utfcpp/4.0.9") if self.options.get_safe("with_pdf2htmlEX", False): - self.requires("pdf2htmlex/0.18.8.rc1-odr-git-eb5d291") + self.requires("pdf2htmlex/0.18.8.rc1-odr-git-e685b24") if self.options.get_safe("with_wvWare", False): self.requires("wvware/1.2.9-odr") self.requires("cpp-httplib/0.16.3") From 403d427744ea2bd9bad695ad9ed86e40ed08ac65 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 20:59:43 +0200 Subject: [PATCH 02/12] update submodule --- conan-odr-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan-odr-index b/conan-odr-index index c46e1e74..4cb9cabe 160000 --- a/conan-odr-index +++ b/conan-odr-index @@ -1 +1 @@ -Subproject commit c46e1e74d524b2120eb2ce6a5d58ca93d61db98a +Subproject commit 4cb9cabe71588deae53886521b5bfd8aa713efde From c2407fd8457b23b15854a569eb5bd411a133e514 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 21:10:43 +0200 Subject: [PATCH 03/12] fix --- src/odr/internal/pdf_poppler/poppler_pdf_file.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/odr/internal/pdf_poppler/poppler_pdf_file.cpp b/src/odr/internal/pdf_poppler/poppler_pdf_file.cpp index c5e21c3e..a2495ba4 100644 --- a/src/odr/internal/pdf_poppler/poppler_pdf_file.cpp +++ b/src/odr/internal/pdf_poppler/poppler_pdf_file.cpp @@ -29,11 +29,11 @@ void PopplerPdfFile::open(const std::optional &password) { } else if (const std::shared_ptr memory_file = std::dynamic_pointer_cast(m_file); memory_file != nullptr) { - // `stream` is freed by `m_pdf_doc` - auto stream = new MemStream(memory_file->memory_data(), 0, - static_cast(memory_file->size()), - Object(objNull)); - m_pdf_doc = std::make_shared(stream, password_goo, password_goo); + auto stream = std::make_unique( + memory_file->memory_data(), 0, + static_cast(memory_file->size()), Object::null()); + m_pdf_doc = + std::make_shared(std::move(stream), password_goo, password_goo); } else { throw NoPdfFile(); } From d3b01b6d0780bfe4a90cb86f687a9334bcdd656c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 21:58:06 +0200 Subject: [PATCH 04/12] try again --- .github/workflows/build_test.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/tidy.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 0282c8ab..f324dacb 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -63,7 +63,7 @@ jobs: conan-${{ matrix.host_profile }}- - name: export conan-odr-index - run: python conan-odr-index/scripts/conan_export_all_packages.py + run: python conan-odr-index/scripts/conan_export_all_packages.py --selection-config conan-odr-index/defaults.yaml - name: conan config run: conan config install .github/config/conan diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6d354ebe..b568fc25 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -55,7 +55,7 @@ jobs: conan-${{ matrix.host_profile }}- - name: export conan-odr-index - run: python conan-odr-index/scripts/conan_export_all_packages.py + run: python conan-odr-index/scripts/conan_export_all_packages.py --selection-config conan-odr-index/defaults.yaml - name: conan config run: conan config install .github/config/conan diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index 37d35545..813eb0cc 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -56,7 +56,7 @@ jobs: conan-${{ matrix.host_profile }}- - name: export conan-odr-index - run: python conan-odr-index/scripts/conan_export_all_packages.py + run: python conan-odr-index/scripts/conan_export_all_packages.py --selection-config conan-odr-index/defaults.yaml - name: conan config run: conan config install .github/config/conan From b292850d68ee36dead0bb19f11eb1fa542d8b935 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 22:32:59 +0200 Subject: [PATCH 05/12] try again --- conan.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conan.lock b/conan.lock index 8a283e94..c8d09a33 100644 --- a/conan.lock +++ b/conan.lock @@ -12,12 +12,12 @@ "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978", "pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483", "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014", - "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780325860.873493", - "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780325860.723243", + "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780344293.8660889", + "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780344293.709663", "poppler/24.08.0-odr#5150a6889acc1c8c9176d857c12fa3c8%1766352521.627", "pixman/0.46.2#88b157b4faa6474a6028c2ba2a987924%1752742515.414", "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#fadb1d15d841bf6c75e3bc76bde81777%1766352519.27", - "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780325860.2562702", + "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780344293.242528", "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", "openjpeg/2.5.4#372fbc2b4348d45ab0c0a62a8475dc2f%1760446899.685", "nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94", @@ -36,20 +36,20 @@ "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", "lcms/2.17#3feb06eea368c52c82f50107cd7694cd%1753693316.094", "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169", - "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780325856.10291", + "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973", "giflib/5.2.2#b445ec67bae61a96ddf0fa5614afde18%1773315754.794", "freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281", - "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780325855.94292", + "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780344288.892788", "fontforge/20240423-git#af7f643fc24bfd3661e97e8adf7c5a72%1766352508.159", - "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780325855.632538", + "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780344288.5746791", "expat/2.7.5#89bbde1770876a19bb8620b9808941cc%1773806275.408", "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119", "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106", - "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1780325855.472789", + "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1780344288.42029", "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", "brotli/1.1.0#3f631ef77008f7b5eb388780116371a3%1764862343.045", "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1765955095.179", - "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1780325855.2969868" + "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1780344288.253698" ], "build_requires": [ "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", @@ -73,7 +73,7 @@ "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37", "gperf/3.1#a7afdf8f7cccdc2dcd4d962370c33d4f%1755780571.156", "gnu-config/cci.20210814#466e9d4d7779e1c142443f7ea44b4284%1762363589.329", - "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780325856.10291", + "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973", "gettext/0.26#28c867efd4914f03c6c05da08a23c35b%1765299118.633", "flex/2.6.4#efa781fc5088b47c895bd4eef6911f2e%1761560242.855", "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1773780142.26", From 2c87d8fb8dcee0fd8e75ced57d7c08e957b69698 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 22:48:17 +0200 Subject: [PATCH 06/12] bump cache rev --- .github/workflows/build_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index f324dacb..eeae3466 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -9,9 +9,9 @@ concurrency: env: CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_MAXSIZE: 1G - CCACHE_KEY_SUFFIX: r1 + CCACHE_KEY_SUFFIX: r2 CONAN_HOME: ${{ github.workspace }}/.conan2 - CONAN_KEY_SUFFIX: r1 + CONAN_KEY_SUFFIX: r2 jobs: build: From f2c07a9b2d044e91d7183fe0684c521c7d7572d5 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 22:51:18 +0200 Subject: [PATCH 07/12] revert --- .github/workflows/build_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index eeae3466..f324dacb 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -9,9 +9,9 @@ concurrency: env: CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_MAXSIZE: 1G - CCACHE_KEY_SUFFIX: r2 + CCACHE_KEY_SUFFIX: r1 CONAN_HOME: ${{ github.workspace }}/.conan2 - CONAN_KEY_SUFFIX: r2 + CONAN_KEY_SUFFIX: r1 jobs: build: From f47d74353f766a300802c244497b692cced3cbd4 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 22:51:32 +0200 Subject: [PATCH 08/12] try again --- conan.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/conan.lock b/conan.lock index c8d09a33..d0b8aa14 100644 --- a/conan.lock +++ b/conan.lock @@ -4,7 +4,6 @@ "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", - "wvware/1.2.9-odr#2d8e0b63ad3ece786e8e70cb5c550f5f%1766352522.558", "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177", "util-linux-libuuid/2.41.2#ee8e33ba15c17c0140643e0bd93c0b6f%1765881086.29", "utfcpp/4.0.9#b5eb56fe6b829b6f3eb8da167c4f41b2%1773905531.586", From fd2a5ceb26fd95fa884663ff5c6aae4d66ba182c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 22:56:47 +0200 Subject: [PATCH 09/12] revert; try without lock --- .github/workflows/build_test.yml | 1 - conan.lock | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index f324dacb..17d590ca 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -78,7 +78,6 @@ jobs: - name: conan install run: > conan install . - --lockfile conan.lock --profile:host '${{ matrix.host_profile }}' --profile:build '${{ matrix.build_profile }}' --build missing diff --git a/conan.lock b/conan.lock index d0b8aa14..c8d09a33 100644 --- a/conan.lock +++ b/conan.lock @@ -4,6 +4,7 @@ "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", + "wvware/1.2.9-odr#2d8e0b63ad3ece786e8e70cb5c550f5f%1766352522.558", "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177", "util-linux-libuuid/2.41.2#ee8e33ba15c17c0140643e0bd93c0b6f%1765881086.29", "utfcpp/4.0.9#b5eb56fe6b829b6f3eb8da167c4f41b2%1773905531.586", From 1134f6758251b77b9e5b0bf9ad00f0597a2e70b3 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 22:58:06 +0200 Subject: [PATCH 10/12] remove lock --- conan.lock | 87 ------------------------------------------------------ 1 file changed, 87 deletions(-) delete mode 100644 conan.lock diff --git a/conan.lock b/conan.lock deleted file mode 100644 index c8d09a33..00000000 --- a/conan.lock +++ /dev/null @@ -1,87 +0,0 @@ -{ - "version": "0.5", - "requires": [ - "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", - "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", - "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", - "wvware/1.2.9-odr#2d8e0b63ad3ece786e8e70cb5c550f5f%1766352522.558", - "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177", - "util-linux-libuuid/2.41.2#ee8e33ba15c17c0140643e0bd93c0b6f%1765881086.29", - "utfcpp/4.0.9#b5eb56fe6b829b6f3eb8da167c4f41b2%1773905531.586", - "utfcpp/4.0.4#199ad4051968b14d27cb937173bcf42a%1773905534.969", - "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978", - "pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483", - "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014", - "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780344293.8660889", - "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780344293.709663", - "poppler/24.08.0-odr#5150a6889acc1c8c9176d857c12fa3c8%1766352521.627", - "pixman/0.46.2#88b157b4faa6474a6028c2ba2a987924%1752742515.414", - "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#fadb1d15d841bf6c75e3bc76bde81777%1766352519.27", - "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780344293.242528", - "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", - "openjpeg/2.5.4#372fbc2b4348d45ab0c0a62a8475dc2f%1760446899.685", - "nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94", - "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259", - "miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805", - "lzo/2.10#f00b10acc508cea70645727d970a23e1%1759909644.842", - "libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767", - "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344", - "libpng/1.6.55#f32362d4db3c562271d907c99be24091%1770802173.684", - "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09", - "libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087", - "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321", - "libgsf/1.14.52#7b7b45fff714f0441d8837e7b14b8b9a%1766352516.733", - "libgettext/0.22#b09eea019e19b9b9c46d8f1da7d75444%1765809130.834", - "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396", - "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", - "lcms/2.17#3feb06eea368c52c82f50107cd7694cd%1753693316.094", - "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169", - "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973", - "giflib/5.2.2#b445ec67bae61a96ddf0fa5614afde18%1773315754.794", - "freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281", - "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780344288.892788", - "fontforge/20240423-git#af7f643fc24bfd3661e97e8adf7c5a72%1766352508.159", - "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780344288.5746791", - "expat/2.7.5#89bbde1770876a19bb8620b9808941cc%1773806275.408", - "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119", - "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106", - "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1780344288.42029", - "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", - "brotli/1.1.0#3f631ef77008f7b5eb388780116371a3%1764862343.045", - "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1765955095.179", - "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1780344288.253698" - ], - "build_requires": [ - "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", - "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", - "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", - "pkgconf/2.5.1#93c2051284cba1279494a43a4fcfeae2%1757684701.089", - "pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021", - "pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82", - "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", - "ninja/1.13.2#c8c5dc2a52ed6e4e42a66d75b4717ceb%1764096931.974", - "meson/1.10.1#426d7d29e3e5f7285cb8398d84546734%1772032339.966", - "meson/1.9.1#abbc783cd297bedce14581b4aec060b8%1758626166.349", - "m4/1.4.19#1f9bd25d2bd53f49ad509caa467f57b9%1770982506.688", - "libtool/2.4.7#14e7739cc128bc1623d2ed318008e47e%1755679003.847", - "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344", - "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09", - "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321", - "libgettext/0.22#b09eea019e19b9b9c46d8f1da7d75444%1765809130.834", - "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396", - "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", - "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37", - "gperf/3.1#a7afdf8f7cccdc2dcd4d962370c33d4f%1755780571.156", - "gnu-config/cci.20210814#466e9d4d7779e1c142443f7ea44b4284%1762363589.329", - "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973", - "gettext/0.26#28c867efd4914f03c6c05da08a23c35b%1765299118.633", - "flex/2.6.4#efa781fc5088b47c895bd4eef6911f2e%1761560242.855", - "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1773780142.26", - "cmake/3.31.11#f325c933f618a1fcebc1e1c0babfd1ba%1769622857.944", - "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", - "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56", - "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86" - ], - "python_requires": [], - "config_requires": [] -} From 17914b6679b914d4229cade0b8e79d7d5950e9c9 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 23:02:40 +0200 Subject: [PATCH 11/12] Revert "remove lock" This reverts commit 1134f6758251b77b9e5b0bf9ad00f0597a2e70b3. --- conan.lock | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 conan.lock diff --git a/conan.lock b/conan.lock new file mode 100644 index 00000000..c8d09a33 --- /dev/null +++ b/conan.lock @@ -0,0 +1,87 @@ +{ + "version": "0.5", + "requires": [ + "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", + "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", + "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", + "wvware/1.2.9-odr#2d8e0b63ad3ece786e8e70cb5c550f5f%1766352522.558", + "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177", + "util-linux-libuuid/2.41.2#ee8e33ba15c17c0140643e0bd93c0b6f%1765881086.29", + "utfcpp/4.0.9#b5eb56fe6b829b6f3eb8da167c4f41b2%1773905531.586", + "utfcpp/4.0.4#199ad4051968b14d27cb937173bcf42a%1773905534.969", + "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978", + "pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483", + "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014", + "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780344293.8660889", + "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780344293.709663", + "poppler/24.08.0-odr#5150a6889acc1c8c9176d857c12fa3c8%1766352521.627", + "pixman/0.46.2#88b157b4faa6474a6028c2ba2a987924%1752742515.414", + "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#fadb1d15d841bf6c75e3bc76bde81777%1766352519.27", + "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780344293.242528", + "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", + "openjpeg/2.5.4#372fbc2b4348d45ab0c0a62a8475dc2f%1760446899.685", + "nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94", + "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259", + "miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805", + "lzo/2.10#f00b10acc508cea70645727d970a23e1%1759909644.842", + "libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767", + "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344", + "libpng/1.6.55#f32362d4db3c562271d907c99be24091%1770802173.684", + "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09", + "libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087", + "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321", + "libgsf/1.14.52#7b7b45fff714f0441d8837e7b14b8b9a%1766352516.733", + "libgettext/0.22#b09eea019e19b9b9c46d8f1da7d75444%1765809130.834", + "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396", + "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", + "lcms/2.17#3feb06eea368c52c82f50107cd7694cd%1753693316.094", + "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169", + "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973", + "giflib/5.2.2#b445ec67bae61a96ddf0fa5614afde18%1773315754.794", + "freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281", + "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780344288.892788", + "fontforge/20240423-git#af7f643fc24bfd3661e97e8adf7c5a72%1766352508.159", + "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780344288.5746791", + "expat/2.7.5#89bbde1770876a19bb8620b9808941cc%1773806275.408", + "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119", + "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106", + "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1780344288.42029", + "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", + "brotli/1.1.0#3f631ef77008f7b5eb388780116371a3%1764862343.045", + "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1765955095.179", + "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1780344288.253698" + ], + "build_requires": [ + "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", + "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", + "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", + "pkgconf/2.5.1#93c2051284cba1279494a43a4fcfeae2%1757684701.089", + "pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021", + "pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82", + "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", + "ninja/1.13.2#c8c5dc2a52ed6e4e42a66d75b4717ceb%1764096931.974", + "meson/1.10.1#426d7d29e3e5f7285cb8398d84546734%1772032339.966", + "meson/1.9.1#abbc783cd297bedce14581b4aec060b8%1758626166.349", + "m4/1.4.19#1f9bd25d2bd53f49ad509caa467f57b9%1770982506.688", + "libtool/2.4.7#14e7739cc128bc1623d2ed318008e47e%1755679003.847", + "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344", + "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09", + "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321", + "libgettext/0.22#b09eea019e19b9b9c46d8f1da7d75444%1765809130.834", + "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396", + "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", + "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37", + "gperf/3.1#a7afdf8f7cccdc2dcd4d962370c33d4f%1755780571.156", + "gnu-config/cci.20210814#466e9d4d7779e1c142443f7ea44b4284%1762363589.329", + "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973", + "gettext/0.26#28c867efd4914f03c6c05da08a23c35b%1765299118.633", + "flex/2.6.4#efa781fc5088b47c895bd4eef6911f2e%1761560242.855", + "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1773780142.26", + "cmake/3.31.11#f325c933f618a1fcebc1e1c0babfd1ba%1769622857.944", + "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", + "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56", + "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86" + ], + "python_requires": [], + "config_requires": [] +} From e21d29a3070aacd8e36ba7dec9267ca0ff48c041 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 1 Jun 2026 23:07:08 +0200 Subject: [PATCH 12/12] fix --- conan.lock | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/conan.lock b/conan.lock index c8d09a33..24bf6fd8 100644 --- a/conan.lock +++ b/conan.lock @@ -4,24 +4,19 @@ "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069", "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337", "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286", - "wvware/1.2.9-odr#2d8e0b63ad3ece786e8e70cb5c550f5f%1766352522.558", + "wvware/1.2.9-odr#ecdcc87eeee4ba3171fc52b885ffcd37%1780344294.0196831", "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177", "util-linux-libuuid/2.41.2#ee8e33ba15c17c0140643e0bd93c0b6f%1765881086.29", "utfcpp/4.0.9#b5eb56fe6b829b6f3eb8da167c4f41b2%1773905531.586", - "utfcpp/4.0.4#199ad4051968b14d27cb937173bcf42a%1773905534.969", "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978", "pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483", - "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014", "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780344293.8660889", "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780344293.709663", - "poppler/24.08.0-odr#5150a6889acc1c8c9176d857c12fa3c8%1766352521.627", "pixman/0.46.2#88b157b4faa6474a6028c2ba2a987924%1752742515.414", - "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#fadb1d15d841bf6c75e3bc76bde81777%1766352519.27", "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780344293.242528", "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693", "openjpeg/2.5.4#372fbc2b4348d45ab0c0a62a8475dc2f%1760446899.685", "nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94", - "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259", "miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805", "lzo/2.10#f00b10acc508cea70645727d970a23e1%1759909644.842", "libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767", @@ -30,7 +25,7 @@ "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09", "libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087", "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321", - "libgsf/1.14.52#7b7b45fff714f0441d8837e7b14b8b9a%1766352516.733", + "libgsf/1.14.52#5dbc15a9ac6f146fa648766f8691256e%1780344289.224694", "libgettext/0.22#b09eea019e19b9b9c46d8f1da7d75444%1765809130.834", "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396", "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327", @@ -40,7 +35,6 @@ "giflib/5.2.2#b445ec67bae61a96ddf0fa5614afde18%1773315754.794", "freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281", "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780344288.892788", - "fontforge/20240423-git#af7f643fc24bfd3661e97e8adf7c5a72%1766352508.159", "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780344288.5746791", "expat/2.7.5#89bbde1770876a19bb8620b9808941cc%1773806275.408", "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119",