Skip to content

Commit

Permalink
Remove support for version one
Browse files Browse the repository at this point in the history
Very old, last 1.3.2 is from 2015.
  • Loading branch information
anton-danielsson committed Apr 18, 2024
1 parent 95ca555 commit a353cbf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
3 changes: 0 additions & 3 deletions recipes/qcustomplot/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ sources:
"2.1.0":
url: "https://www.qcustomplot.com/release/2.1.0fixed/QCustomPlot-source.tar.gz"
sha256: "357b78be0f52b2d01c17ec3e2e1271255761810af7e8a9476cef51fccf1a0f44"
"1.3.2":
url: "https://www.qcustomplot.com/release/1.3.2/QCustomPlot.tar.gz"
sha256: "ea2ed5712c2020b25f40eacabd0926ef71a7f07e2a3771c32d53ace1f47123eb"
patches:
"2.1.0":
- patch_file: "patches/0001-fix-for-qt6.2.patch"

Check warning on line 10 in recipes/qcustomplot/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed. required key(s) 'patch_description', 'patch_type' not found in - patch_file: patches/0001-fix ... ^ (line: 10)
15 changes: 6 additions & 9 deletions recipes/qcustomplot/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ def configure(self):
self.options.rm_safe("fPIC")

def requirements(self):
if Version(self.version) >= "2.0.0":
self.requires("qt/[~6.4]", transitive_headers=True, transitive_libs=True)
else:
self.requires("qt/[~5]", transitive_headers=True, transitive_libs=True)
self.requires("qt/[~6.4]", transitive_headers=True, transitive_libs=True)

if self.options.with_opengl and self.settings.os == "Windows":
self.requires("opengl/system")

Expand Down Expand Up @@ -78,11 +76,10 @@ def generate(self):

def _patch_sources(self):
apply_conandata_patches(self)
if Version(self.version) >= "2.0.0":
# allow static qcustomplot with shared qt, and vice versa
replace_in_file(self, os.path.join(self.source_folder, "qcustomplot.h"),
"#if defined(QT_STATIC_BUILD)",
"#if 0" if self.options.shared else "#if 1")
# allow static qcustomplot with shared qt, and vice versa
replace_in_file(self, os.path.join(self.source_folder, "qcustomplot.h"),
"#if defined(QT_STATIC_BUILD)",
"#if 0" if self.options.shared else "#if 1")

def build(self):
self._patch_sources()
Expand Down

0 comments on commit a353cbf

Please sign in to comment.