From bddcaea10152edfdb56a1ff79f0d543e09d15611 Mon Sep 17 00:00:00 2001 From: nick black Date: Sun, 23 May 2021 04:32:44 -0400 Subject: [PATCH] update to 2.3.7 --- recipes/notcurses/all/conandata.yml | 6 +++--- recipes/notcurses/all/conanfile.py | 6 ++---- recipes/notcurses/config.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/recipes/notcurses/all/conandata.yml b/recipes/notcurses/all/conandata.yml index 9b848e1693b5ee..d9c55fe533704b 100644 --- a/recipes/notcurses/all/conandata.yml +++ b/recipes/notcurses/all/conandata.yml @@ -1,4 +1,4 @@ sources: - "2.1.7": - url: "https://github.com/dankamongmen/notcurses/archive/v2.1.7.tar.gz" - sha256: "f6be3cf9654f2a9ccb30ed89aacf248f4edcf5a3c61d2353560e161166fc2d35" + "2.3.7": + url: "https://github.com/dankamongmen/notcurses/archive/v2.3.7.tar.gz" + sha256: "2bddee98346495fea4572650999c51cce7bc0551e696f62aee0eef2ae371005a" diff --git a/recipes/notcurses/all/conanfile.py b/recipes/notcurses/all/conanfile.py index 528ad04af0bd7b..2abe817068d087 100644 --- a/recipes/notcurses/all/conanfile.py +++ b/recipes/notcurses/all/conanfile.py @@ -11,9 +11,7 @@ class NotcursesConan(ConanFile): exports_sources = ["CMakeLists.txt"] settings = "os", "compiler", "build_type", "arch" options = {"shared": [True, False]} - default_options = {"shared": False, - "readline:with_library":"curses" - } + default_options = {"shared": False} generators = "cmake", "pkg_config" _cmake = None @@ -21,7 +19,6 @@ class NotcursesConan(ConanFile): def requirements(self): self.requires("openimageio/2.2.7.0") self.requires("libunistring/0.9.10") - self.requires("readline/8.0") self.requires("ncurses/6.2") def build_requirements(self): @@ -50,6 +47,7 @@ def _configure_cmake(self): self._cmake.definitions["USE_PANDOC"] = "OFF" self._cmake.definitions["USE_POC"] = "OFF" self._cmake.definitions["USE_QRCODEGEN"] = "OFF" + self._cmake.definitions["USE_READLINE"] = "OFF" self._cmake.definitions["USE_STATIC"] = not self.options.shared self._cmake.configure(source_folder="notcurses-" + self.version) return self._cmake diff --git a/recipes/notcurses/config.yml b/recipes/notcurses/config.yml index fbc071889160a2..e5f9f6d7528077 100644 --- a/recipes/notcurses/config.yml +++ b/recipes/notcurses/config.yml @@ -1,3 +1,3 @@ versions: - "2.1.7": + "2.3.7": folder: all