(#18020) entt: add version 3.12.2

* entt: add version 3.12.1 * Remove older versions Add cpp_info.names back * Update to 3.12.2
conan-io · Jun 27, 2023 · 5f37eee · 5f37eee
1 parent c228286
commit 5f37eee
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 88 deletions.
diff --git a/recipes/entt/3.x.x/conandata.yml b/recipes/entt/3.x.x/conandata.yml
@@ -1,67 +1,19 @@
 sources:
+  "3.12.2":
+    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.12.2.tar.gz"
+    sha256: "3F3E43988218DAECC0530CCAF45E960F7F7416E1FCF2C69799160C18B6A2FEE3"
   "3.11.1":
     url: "https://github.com/skypjack/entt/archive/refs/tags/v3.11.1.tar.gz"
     sha256: "0ac010f232d3089200c5e545bcbd6480cf68b705de6930d8ff7cdb0a29f5b47b"
-  "3.11.0":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.11.0.tar.gz"
-    sha256: "7cca2bd4d4aeef6c5bdbe06b9e047e7f2519ebaff901207cc81ac71a2bbe185e"
   "3.10.3":
     url: "https://github.com/skypjack/entt/archive/refs/tags/v3.10.3.tar.gz"
     sha256: "315918fc678e89a326ce1c13b0e9d3e53882dd9c58a63fef413325917a5c753b"
-  "3.10.1":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.10.1.tar.gz"
-    sha256: "f7031545130bfc06f5fe6b2f8c87dcbd4c1254fab86657e2788b70dfeea57965"
-  "3.10.0":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.10.0.tar.gz"
-    sha256: "4c716cebf4f2964824da158dd58cc81d9f1e056a083538e22fb03ae2d64805ee"
-  "3.9.0":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.9.0.tar.gz"
-    sha256: "1b06f1f6627c3702486855877bdeab6885f5d821d3dd78862126d4308c627c23"
-  "3.8.1":
-    url: "https://github.com/skypjack/entt/archive/v3.8.1.tar.gz"
-    sha256: "a2b767f06bca67a73a4d71fb9ebb6ed823bb5146faad3c282b9dbbbdae1aa01b"
-  "3.8.0":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.8.0.tar.gz"
-    sha256: "71c8ff5a604e8e214571a8b2218dfeaf61be59e2fe2ff5b550b4810c37d4da3c"
-  "3.7.1":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.7.1.tar.gz"
-    sha256: "fe3ce773c17797c0c57ffa97f73902854fcc8e7afc7e09bea373e0c64fa24a23"
-  "3.7.0":
-    url: "https://github.com/skypjack/entt/archive/refs/tags/v3.7.0.tar.gz"
-    sha256: "39ad5c42acf3434f8c37e0baa18a8cb562c0845383a6b4da17fdbacc9f0a7695"
-  "3.6.0":
-    url: "https://github.com/skypjack/entt/archive/v3.6.0.tar.gz"
-    sha256: "94b7dc874acd0961cfc28cf6b0342eeb0b7c58250ddde8bdc6c101e84b74c190"
-  "3.5.2":
-    url: "https://github.com/skypjack/entt/archive/v3.5.2.tar.gz"
-    sha256: "f9271293c44518386c402c9a2188627819748f66302df48af4f6d08e30661036"
-  "3.5.1":
-    url: "https://github.com/skypjack/entt/archive/v3.5.1.tar.gz"
-    sha256: "f442ece6881ec24863e7f0fbdc4bf641e01b0f87955f49dc4687b2fa564e9c83"
-  "3.5.0":
-    url: "https://github.com/skypjack/entt/archive/v3.5.0.tar.gz"
-    sha256: "89cba5ddf90bcec0dcf8d9554d9acf5ad86f5ce305e3acacf795007ee65c93f8"
-  "3.4.0":
-    url: "https://github.com/skypjack/entt/archive/v3.4.0.tar.gz"
-    sha256: "07086b8c5b1d84a1b76b39b0ce257c36c4f1521b77e664368b3d5ca7c00264e2"
-  "3.3.2":
-    url: "https://github.com/skypjack/entt/archive/v3.3.2.tar.gz"
-    sha256: "150cd89b45bffbcd7643d39bbce282e8fa38307bb5ed25567b79e337376ba1c7"
-  "3.3.1":
-    url: "https://github.com/skypjack/entt/archive/v3.3.1.tar.gz"
-    sha256: "432f31a80fb0463960dfd36e103c206dd67f1bfa91fc48408594c28aa790a3f5"
-  "3.3.0":
-    url: "https://github.com/skypjack/entt/archive/v3.3.0.tar.gz"
-    sha256: "d21a45df4960adc86a8f23a8c3c0cea6d2cecc4ef6946a8040e336d8e5266ab3"
-  "3.2.2":
-    url: "https://github.com/skypjack/entt/archive/v3.2.2.tar.gz"
-    sha256: "94592270b6750dd0b057a4af9d2c1ea8798369b3bb127927a8f70db232808f93"
 patches:
-  "3.11.1":
-    - patch_file: "patches/0001-3.11.0-fix-gcc-7.0-7.3.patch"
+  "3.12.2":
+    - patch_file: "patches/0002-3.12.1-fix-gcc-7.0-7.3.patch"
       patch_description: "Fix GCC 7.0 to 7.3"
       patch_type: "portability"
-  "3.11.0":
+  "3.11.1":
     - patch_file: "patches/0001-3.11.0-fix-gcc-7.0-7.3.patch"
       patch_description: "Fix GCC 7.0 to 7.3"
       patch_type: "portability"
diff --git a/recipes/entt/3.x.x/patches/0002-3.12.1-fix-gcc-7.0-7.3.patch b/recipes/entt/3.x.x/patches/0002-3.12.1-fix-gcc-7.0-7.3.patch
@@ -0,0 +1,20 @@
+--- a/src/entt/meta/meta.hpp
++++ b/src/entt/meta/meta.hpp
+@@ -1688,7 +1688,7 @@ public:
+     using reference = value_type;
+     using iterator_category = std::input_iterator_tag;
+
+-    constexpr meta_iterator() noexcept
++    meta_iterator() noexcept
+         : ctx{},
+           vtable{},
+           handle{} {}
+@@ -1782,7 +1782,7 @@ public:
+     using reference = value_type;
+     using iterator_category = std::input_iterator_tag;
+
+-    constexpr meta_iterator() noexcept
++    meta_iterator() noexcept
+         : ctx{},
+           vtable{},
+           handle{} {}
diff --git a/recipes/entt/config.yml b/recipes/entt/config.yml
@@ -1,39 +1,7 @@
 versions:
-  "3.11.1":
+  "3.12.2":
     folder: 3.x.x
-  "3.11.0":
+  "3.11.1":
     folder: 3.x.x
   "3.10.3":
     folder: 3.x.x
-  "3.10.1":
-    folder: 3.x.x
-  "3.10.0":
-    folder: 3.x.x
-  "3.9.0":
-    folder: 3.x.x
-  "3.8.1":
-    folder: 3.x.x
-  "3.8.0":
-    folder: 3.x.x
-  "3.7.1":
-    folder: 3.x.x
-  "3.7.0":
-    folder: 3.x.x
-  "3.6.0":
-    folder: 3.x.x
-  "3.5.2":
-    folder: 3.x.x
-  "3.5.1":
-    folder: 3.x.x
-  "3.5.0":
-    folder: 3.x.x
-  "3.4.0":
-    folder: 3.x.x
-  "3.3.2":
-    folder: 3.x.x
-  "3.3.1":
-    folder: 3.x.x
-  "3.3.0":
-    folder: 3.x.x
-  "3.2.2":
-    folder: 3.x.x