From 48282401784b4b930189b94a338adafbb7d62178 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Thu, 10 Feb 2022 10:36:21 +0100 Subject: [PATCH 1/5] at-spi2-atk: bump requirements --- recipes/at-spi2-atk/all/conanfile.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes/at-spi2-atk/all/conanfile.py b/recipes/at-spi2-atk/all/conanfile.py index 6f2046b991e0f..f52e2f388f0e5 100644 --- a/recipes/at-spi2-atk/all/conanfile.py +++ b/recipes/at-spi2-atk/all/conanfile.py @@ -42,19 +42,18 @@ def configure(self): del self.settings.compiler.cppstd def build_requirements(self): - self.build_requires('meson/0.57.1') - self.build_requires('pkgconf/1.7.3') + self.build_requires('meson/0.60.2') + self.build_requires('pkgconf/1.7.4') def requirements(self): self.requires('at-spi2-core/2.39.1') - self.requires('atk/2.36.0') - self.requires('glib/2.67.6') - self.requires('libxml2/2.9.10') + self.requires('atk/2.42.0') + self.requires('glib/2.70.1') + self.requires('libxml2/2.9.12') def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = self.name + "-" + self.version - os.rename(extracted_dir, self._source_subfolder) + tools.get(**self.conan_data["sources"][self.version], + strip_root=True, destination=self._source_subfolder) def _configure_meson(self): if self._meson: From a6ccb9793f1c9e9696461ea0249b1435ee873f5a Mon Sep 17 00:00:00 2001 From: bincrafters-user Date: Thu, 10 Feb 2022 09:37:14 +0000 Subject: [PATCH 2/5] at-spi2-atk: Update Conan conventions Automatically created by bincrafters-conventions 0.31.0 --- recipes/at-spi2-atk/all/conanfile.py | 2 +- recipes/at-spi2-atk/all/test_package/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/at-spi2-atk/all/conanfile.py b/recipes/at-spi2-atk/all/conanfile.py index f52e2f388f0e5..b7ca1001fce2e 100644 --- a/recipes/at-spi2-atk/all/conanfile.py +++ b/recipes/at-spi2-atk/all/conanfile.py @@ -46,7 +46,7 @@ def build_requirements(self): self.build_requires('pkgconf/1.7.4') def requirements(self): - self.requires('at-spi2-core/2.39.1') + self.requires('at-spi2-core/2.40.1') self.requires('atk/2.42.0') self.requires('glib/2.70.1') self.requires('libxml2/2.9.12') diff --git a/recipes/at-spi2-atk/all/test_package/conanfile.py b/recipes/at-spi2-atk/all/test_package/conanfile.py index bd7165a553cf4..d4128b0450777 100644 --- a/recipes/at-spi2-atk/all/test_package/conanfile.py +++ b/recipes/at-spi2-atk/all/test_package/conanfile.py @@ -12,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not tools.cross_building(self.settings): + if not tools.cross_building(self): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) From 11889f2f39e0388c00c77eb697b0c9a1eb4ce62f Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Thu, 10 Feb 2022 10:40:01 +0100 Subject: [PATCH 3/5] Update conanfile.py --- recipes/at-spi2-atk/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/at-spi2-atk/all/conanfile.py b/recipes/at-spi2-atk/all/conanfile.py index b7ca1001fce2e..4471e43725684 100644 --- a/recipes/at-spi2-atk/all/conanfile.py +++ b/recipes/at-spi2-atk/all/conanfile.py @@ -46,7 +46,7 @@ def build_requirements(self): self.build_requires('pkgconf/1.7.4') def requirements(self): - self.requires('at-spi2-core/2.40.1') + self.requires('at-spi2-core/2.42.0') self.requires('atk/2.42.0') self.requires('glib/2.70.1') self.requires('libxml2/2.9.12') From 6997c09186bfbf7265734c786f817bbec5fe19d6 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Thu, 10 Feb 2022 10:46:38 +0100 Subject: [PATCH 4/5] Update conanfile.py --- recipes/at-spi2-atk/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/at-spi2-atk/all/conanfile.py b/recipes/at-spi2-atk/all/conanfile.py index 4471e43725684..1667a2a02e680 100644 --- a/recipes/at-spi2-atk/all/conanfile.py +++ b/recipes/at-spi2-atk/all/conanfile.py @@ -47,7 +47,7 @@ def build_requirements(self): def requirements(self): self.requires('at-spi2-core/2.42.0') - self.requires('atk/2.42.0') + self.requires('atk/2.36.0') self.requires('glib/2.70.1') self.requires('libxml2/2.9.12') From eb732f624b313b83ab589873c3dcee4cc96ece5e Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 4 Mar 2022 23:44:27 +0100 Subject: [PATCH 5/5] Update conanfile.py --- recipes/at-spi2-atk/all/conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/at-spi2-atk/all/conanfile.py b/recipes/at-spi2-atk/all/conanfile.py index 1667a2a02e680..2cc75da786844 100644 --- a/recipes/at-spi2-atk/all/conanfile.py +++ b/recipes/at-spi2-atk/all/conanfile.py @@ -2,6 +2,7 @@ from conans.errors import ConanInvalidConfiguration import os +required_conan_version = ">=1.33.0" class AtSPI2AtkConan(ConanFile): name = "at-spi2-atk"