gtsam: get rid of a duplicate patch

conan-io · Jun 15, 2023 · 7317737 · 7317737
1 parent 9e7c0e3
commit 7317737
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/recipes/gtsam/all/conandata.yml b/recipes/gtsam/all/conandata.yml
@@ -13,10 +13,10 @@ sources:
     sha256: "8770a440f1af98c3f0d9d4dffd568de2d4c21b245e7231e987e26bc236aeb5aa"
 patches:
   "4.2.0a9":
-    - patch_file: "patches/4.2.0-0001-cmake-boost.patch"
+    - patch_file: "patches/4.1.1-0001-cmake-boost.patch"
       patch_description: "Use boost targets"
       patch_type: "conan"
-    - patch_file: "patches/4.2.0-0002-macos-rpath.patch"
+    - patch_file: "patches/4.2.0-0001-macos-rpath.patch"
       patch_description: "Relocatable shared libs on Apple OS"
       patch_type: "conan"
   "4.1.1":

diff --git a/recipes/gtsam/all/patches/4.2.0-0001-cmake-boost.patch b/recipes/gtsam/all/patches/4.2.0-0001-cmake-boost.patch
diff --git a/.../all/patches/4.2.0-0002-macos-rpath.patch → .../all/patches/4.2.0-0001-macos-rpath.patch b/.../all/patches/4.2.0-0002-macos-rpath.patch → .../all/patches/4.2.0-0001-macos-rpath.patch