Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

at-spi2-atk: bump requirements #9335

Merged
merged 5 commits into from
Mar 10, 2022
Merged

at-spi2-atk: bump requirements #9335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4828240
at-spi2-atk: bump requirements
ericLemanissier Feb 10, 2022
a6ccb97
at-spi2-atk: Update Conan conventions
bincrafters-user Feb 10, 2022
11889f2
Update conanfile.py
ericLemanissier Feb 10, 2022
6997c09
Update conanfile.py
ericLemanissier Feb 10, 2022
eb732f6
Update conanfile.py
ericLemanissier Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions recipes/at-spi2-atk/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from conans.errors import ConanInvalidConfiguration
import os

required_conan_version = ">=1.33.0"

class AtSPI2AtkConan(ConanFile):
name = "at-spi2-atk"
Expand Down Expand Up @@ -42,19 +43,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('at-spi2-core/2.42.0')
self.requires('atk/2.36.0')
self.requires('glib/2.67.6')
self.requires('libxml2/2.9.10')
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)
ericLemanissier marked this conversation as resolved.
Show resolved Hide resolved

def _configure_meson(self):
if self._meson:
Expand Down
2 changes: 1 addition & 1 deletion recipes/at-spi2-atk/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)