From d6a855666e55efda17daac4da63a27b20b6d8d65 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 21 Oct 2023 20:36:02 +0200 Subject: [PATCH 1/5] podofo/all: bump deps, use version range for OpenSSL --- recipes/podofo/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/podofo/all/conanfile.py b/recipes/podofo/all/conanfile.py index 87fbb60fe26b7..903399607339f 100644 --- a/recipes/podofo/all/conanfile.py +++ b/recipes/podofo/all/conanfile.py @@ -67,13 +67,13 @@ def requirements(self): if self.settings.os != "Windows": self.requires("fontconfig/2.14.2") if self.options.with_openssl: - self.requires("openssl/1.1.1u") + self.requires("openssl/[>=1.1 <4]") if self.options.with_libidn: self.requires("libidn/1.36") if self.options.with_jpeg: self.requires("libjpeg/9e") if self.options.with_tiff: - self.requires("libtiff/4.5.1") + self.requires("libtiff/4.6.0") if self.options.with_png: self.requires("libpng/1.6.40") if self.options.with_unistring: From 4f54cde93fafcd276f3c07d4c786b4e59cdeed7c Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 6 Feb 2024 21:16:25 +0100 Subject: [PATCH 2/5] bump libpng & freetype --- recipes/podofo/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/podofo/all/conanfile.py b/recipes/podofo/all/conanfile.py index 903399607339f..2cd1ae8f61761 100644 --- a/recipes/podofo/all/conanfile.py +++ b/recipes/podofo/all/conanfile.py @@ -62,7 +62,7 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("freetype/2.13.0") + self.requires("freetype/2.13.2") self.requires("zlib/[>=1.2.11 <2]") if self.settings.os != "Windows": self.requires("fontconfig/2.14.2") @@ -75,7 +75,7 @@ def requirements(self): if self.options.with_tiff: self.requires("libtiff/4.6.0") if self.options.with_png: - self.requires("libpng/1.6.40") + self.requires("libpng/1.6.42") if self.options.with_unistring: self.requires("libunistring/0.9.10") From eae080b6188811612c1e19b3fdc8cf272c55665f Mon Sep 17 00:00:00 2001 From: mayeut Date: Wed, 7 Feb 2024 07:54:32 +0100 Subject: [PATCH 3/5] bump fontconfig --- recipes/podofo/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/podofo/all/conanfile.py b/recipes/podofo/all/conanfile.py index 2cd1ae8f61761..7f8ec9da0d030 100644 --- a/recipes/podofo/all/conanfile.py +++ b/recipes/podofo/all/conanfile.py @@ -65,7 +65,7 @@ def requirements(self): self.requires("freetype/2.13.2") self.requires("zlib/[>=1.2.11 <2]") if self.settings.os != "Windows": - self.requires("fontconfig/2.14.2") + self.requires("fontconfig/2.15.0") if self.options.with_openssl: self.requires("openssl/[>=1.1 <4]") if self.options.with_libidn: From 9a722b8a1cb3dae0f3e88ada048199c721193266 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 17 Mar 2024 12:10:51 +0100 Subject: [PATCH 4/5] use version range for libpng --- recipes/podofo/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/podofo/all/conanfile.py b/recipes/podofo/all/conanfile.py index 7f8ec9da0d030..93c7cdb66aa0e 100644 --- a/recipes/podofo/all/conanfile.py +++ b/recipes/podofo/all/conanfile.py @@ -75,7 +75,7 @@ def requirements(self): if self.options.with_tiff: self.requires("libtiff/4.6.0") if self.options.with_png: - self.requires("libpng/1.6.42") + self.requires("libpng/[>=1.6 <2]") if self.options.with_unistring: self.requires("libunistring/0.9.10") From 624c3853b23524c03497a5e6165e9415a2de3d86 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 9 May 2024 20:43:47 +0200 Subject: [PATCH 5/5] limit to c++14 for version<0.9.7 --- recipes/podofo/all/conanfile.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/podofo/all/conanfile.py b/recipes/podofo/all/conanfile.py index 93c7cdb66aa0e..365ade4380f35 100644 --- a/recipes/podofo/all/conanfile.py +++ b/recipes/podofo/all/conanfile.py @@ -1,4 +1,4 @@ -from conan import ConanFile +from conan import ConanFile, conan_version from conan.tools.build import check_min_cppstd, valid_min_cppstd from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir @@ -82,6 +82,13 @@ def requirements(self): def validate(self): if self.info.settings.compiler.get_safe("cppstd") and Version(self.version) >= "0.9.7": check_min_cppstd(self, 11) + if conan_version.major >= 2 and Version(self.version) < "0.9.7": + # FIXME: linter complains, but function is there + # https://docs.conan.io/2.0/reference/tools/build.html?highlight=check_min_cppstd#conan-tools-build-check-max-cppstd + import sys + check_max_cppstd = getattr(sys.modules['conan.tools.build'], 'check_max_cppstd') + # INFO: error: no template named 'auto_ptr' in namespace 'std'. Removed in C++17. + check_max_cppstd(self, 14) def source(self): get(self, **self.conan_data["sources"][self.version],