From 712c63e399f6b614f3addd39fda90c5595ee8e82 Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Fri, 26 Jul 2024 16:19:53 +0300 Subject: [PATCH] [2/2] Suffix cairo, fontconfig, glib, poppler and poppler-data versions with "-odr", This should allow using conan-odr-index without having to have it as index 0 --- recipes/pdf2htmlex/all/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pdf2htmlex/all/conanfile.py b/recipes/pdf2htmlex/all/conanfile.py index b35c076..07f8818 100644 --- a/recipes/pdf2htmlex/all/conanfile.py +++ b/recipes/pdf2htmlex/all/conanfile.py @@ -25,12 +25,12 @@ class pdf2htmlEXConan(ConanFile): default_options = {"shared": False, "fPIC": True} def requirements(self): - self.requires("poppler/24.07.0", options={ + self.requires("poppler/24.07.0-odr", options={ "with_cairo": True, "with_glib": True, "shared": False, }) - self.requires("cairo/1.18.0", options={ + self.requires("cairo/1.18.0-odr", options={ # Don't pull in xorg dependencies. "with_xlib": False, "with_xlib_xrender": False, @@ -41,7 +41,7 @@ def requirements(self): "install_private_headers": True, }) - self.requires("glib/2.78.3") + self.requires("glib/2.78.3-odr") # self.requires("libtiff/4.6.0") # # jbig and libdeflate are required by libtiff