poppler: drop v21.07.0

conan-io · Nov 16, 2023 · 87039e6 · 87039e6
1 parent 258f12f
commit 87039e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/recipes/poppler/all/conandata.yml b/recipes/poppler/all/conandata.yml
@@ -2,14 +2,7 @@ sources:
   "23.11.0":
     url: "https://poppler.freedesktop.org/poppler-23.11.0.tar.xz"
     sha256: "f99cca6799cb9cb6c92fc1e0eb78547b611cb733750ab7cb047cb0e6c246539c"
-  "21.07.0":
-    url: "https://poppler.freedesktop.org/poppler-21.07.0.tar.xz"
-    sha256: "e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4"
 patches:
   "23.11.0":
     - patch_file: "patches/23/0004-add-POPPLER_DATADIR-environment-variable.patch"
     - patch_file: "patches/23/0007-cmake-use_conan_qt.patch"
-  "21.07.0":
-    - patch_file: "patches/21/0004-add-POPPLER_DATADIR-environment-variable.patch"
-    - patch_file: "patches/21/0005-fix-visual-studio-basetsd.h-libjpeg-INT32.patch"
-    - patch_file: "patches/21/0007-cmake-use_conan_qt.patch"
diff --git a/recipes/poppler/all/conanfile.py b/recipes/poppler/all/conanfile.py
@@ -69,21 +69,10 @@ class PopplerConan(ConanFile):
 
     @property
     def _cppstd_required(self):
-        if Version(self.version) > "21.11" or (self.options.with_qt and Version(self.dependencies["qt"].ref.version).major == "6"):
-            return 17
-        else:
-            return 14
+        return 17
 
     @property
     def _minimum_compilers_version(self):
-        if self._cppstd_required == 14:
-            return {
-                "Visual Studio": "15",
-                "msvc": "191",
-                "gcc": "5",
-                "clang": "5",
-                "apple-clang": "5.1",
-            }
         return {
             "Visual Studio": "16",
             "msvc": "192",
@@ -160,18 +149,15 @@ def validate(self):
             check_min_cppstd(self, 14)
 
         minimum_version = self._minimum_compilers_version.get(str(self.settings.compiler), False)
-        if not minimum_version:
-            self.output.warning("C++14 support required. Your compiler is unknown. Assuming it supports C++14.")
-        elif Version(self.settings.compiler.version) < minimum_version:
+        if minimum_version and Version(self.settings.compiler.version) < minimum_version:
             raise ConanInvalidConfiguration("C++14 support required, which your compiler does not support.")
 
     def build_requirements(self):
         if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
             self.tool_requires("pkgconf/2.0.3")
         if self.options.get_safe("with_glib"):
             self.tool_requires("glib/<host_version>")
-        if Version(self.version) > "22.12.0":
-            self.tool_requires("cmake/[>=3.16 <4]")
+        self.tool_requires("cmake/[>=3.16 <4]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

diff --git a/recipes/poppler/config.yml b/recipes/poppler/config.yml
@@ -1,5 +1,4 @@
 versions:
   "23.11.0":
     folder: all
-  "21.07.0":
-    folder: all
+