From 0566480977180503a09a9733493bff18de8a93da Mon Sep 17 00:00:00 2001 From: Paulo Coutinho Date: Mon, 31 May 2021 12:49:03 -0300 Subject: [PATCH 1/4] add ptz to header list --- recipes/date/all/conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/date/all/conanfile.py b/recipes/date/all/conanfile.py index 6302ceae3afc4..58117a953cf10 100644 --- a/recipes/date/all/conanfile.py +++ b/recipes/date/all/conanfile.py @@ -87,6 +87,7 @@ def package(self): dst = os.path.join("include", "date") self.copy(pattern="date.h", dst=dst, src=src) self.copy(pattern="tz.h", dst=dst, src=src) + self.copy(pattern="ptz.h", dst=dst, src=src) self.copy(pattern="iso_week.h", dst=dst, src=src) self.copy(pattern="julian.h", dst=dst, src=src) self.copy(pattern="islamic.h", dst=dst, src=src) From 9d5bfe57b8e86e30132bf3f88806acd5aa323b32 Mon Sep 17 00:00:00 2001 From: Paulo Coutinho Date: Mon, 31 May 2021 15:24:38 -0300 Subject: [PATCH 2/4] add ptz to header list --- recipes/date/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/date/all/conanfile.py b/recipes/date/all/conanfile.py index 58117a953cf10..2f6ca61441a3f 100644 --- a/recipes/date/all/conanfile.py +++ b/recipes/date/all/conanfile.py @@ -56,6 +56,8 @@ def config_options(self): del self.options.fPIC def configure(self): + if self.options.shared: + del self.options.fPIC if self.settings.compiler.cppstd: tools.check_min_cppstd(self, "11") From 02cca309b9319e8bf090088467698109cdd84123 Mon Sep 17 00:00:00 2001 From: Paulo Coutinho Date: Mon, 31 May 2021 16:11:55 -0300 Subject: [PATCH 3/4] add version 3.0.1 --- recipes/date/all/conandata.yml | 8 +++++++- .../all/patches/{cmake-3.0.0.patch => cmake-3.0.x.patch} | 0 recipes/date/config.yml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) rename recipes/date/all/patches/{cmake-3.0.0.patch => cmake-3.0.x.patch} (100%) diff --git a/recipes/date/all/conandata.yml b/recipes/date/all/conandata.yml index d1bcf54a4c8d7..7c6945b5ab49f 100644 --- a/recipes/date/all/conandata.yml +++ b/recipes/date/all/conandata.yml @@ -5,6 +5,9 @@ sources: "3.0.0": sha256: 87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3 url: https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz + "3.0.1": + sha256: 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538 + url: https://github.com/HowardHinnant/date/archive/v3.0.1.tar.gz patches: "2.4.1": - base_path: source_subfolder @@ -15,4 +18,7 @@ patches: patch_file: patches/string_view.patch "3.0.0": - base_path: source_subfolder - patch_file: patches/cmake-3.0.0.patch + patch_file: patches/cmake-3.0.x.patch + "3.0.1": + - base_path: source_subfolder + patch_file: patches/cmake-3.0.x.patch diff --git a/recipes/date/all/patches/cmake-3.0.0.patch b/recipes/date/all/patches/cmake-3.0.x.patch similarity index 100% rename from recipes/date/all/patches/cmake-3.0.0.patch rename to recipes/date/all/patches/cmake-3.0.x.patch diff --git a/recipes/date/config.yml b/recipes/date/config.yml index 960726f7be698..8da6f34991031 100644 --- a/recipes/date/config.yml +++ b/recipes/date/config.yml @@ -4,3 +4,5 @@ versions: folder: all "3.0.0": folder: all + "3.0.1": + folder: all From db031b281039cc3d1a9e43d692f4d77cf9e254e5 Mon Sep 17 00:00:00 2001 From: Paulo Coutinho Date: Mon, 31 May 2021 16:59:51 -0300 Subject: [PATCH 4/4] add patch for version 3.0.1 --- recipes/date/all/conandata.yml | 4 ++-- .../{cmake-3.0.x.patch => cmake-3.0.0.patch} | 0 recipes/date/all/patches/cmake-3.0.1.patch | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) rename recipes/date/all/patches/{cmake-3.0.x.patch => cmake-3.0.0.patch} (100%) create mode 100644 recipes/date/all/patches/cmake-3.0.1.patch diff --git a/recipes/date/all/conandata.yml b/recipes/date/all/conandata.yml index 7c6945b5ab49f..3a000e554ebbb 100644 --- a/recipes/date/all/conandata.yml +++ b/recipes/date/all/conandata.yml @@ -18,7 +18,7 @@ patches: patch_file: patches/string_view.patch "3.0.0": - base_path: source_subfolder - patch_file: patches/cmake-3.0.x.patch + patch_file: patches/cmake-3.0.0.patch "3.0.1": - base_path: source_subfolder - patch_file: patches/cmake-3.0.x.patch + patch_file: patches/cmake-3.0.1.patch diff --git a/recipes/date/all/patches/cmake-3.0.x.patch b/recipes/date/all/patches/cmake-3.0.0.patch similarity index 100% rename from recipes/date/all/patches/cmake-3.0.x.patch rename to recipes/date/all/patches/cmake-3.0.0.patch diff --git a/recipes/date/all/patches/cmake-3.0.1.patch b/recipes/date/all/patches/cmake-3.0.1.patch new file mode 100644 index 0000000000000..8edcb30921f23 --- /dev/null +++ b/recipes/date/all/patches/cmake-3.0.1.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ad74900..ac390a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,6 +156,9 @@ if( BUILD_TZ_LIB ) + target_include_directories( date-tz SYSTEM PRIVATE ${CURL_INCLUDE_DIRS} ) + target_link_libraries( date-tz PRIVATE ${CURL_LIBRARIES} ) + endif( ) ++ if( DISABLE_STRING_VIEW ) ++ target_compile_definitions( date-tz PRIVATE -DHAS_STRING_VIEW=0 -DHAS_DEDUCTION_GUIDES=0 ) ++ endif( ) + endif( ) + + #[===================================================================[