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

glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd #23030

Merged
merged 11 commits into from
Nov 28, 2024
Merged

glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd #23030

Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f92320e
glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd
jwillikers Mar 8, 2024
466aff2
glib: fix test
ericLemanissier Mar 28, 2024
195c1b0
Merge pull request #16 from ericLemanissier/glib-test
jwillikers Mar 28, 2024
d5a01ec
Merge branch 'master' into glib-bump-libmount
jwillikers Apr 11, 2024
57b8efa
Merge branch 'master' into glib-bump-libmount
jwillikers Apr 17, 2024
d857651
Merge branch 'master' into glib-bump-libmount
jwillikers Apr 18, 2024
d0c7cbd
Merge branch 'master' into glib-bump-libmount
jwillikers Jul 11, 2024
1f2c295
Fix dumb typo
jwillikers Jul 11, 2024
32d42d1
Merge branch 'master' into glib-bump-libmount
jwillikers Jul 15, 2024
6f62bdb
Cleanup, trigger CI
AbrilRBS Nov 25, 2024
b0464fd
Merge branch 'master' into glib-bump-libmount
AbrilRBS Nov 28, 2024
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
6 changes: 3 additions & 3 deletions recipes/glib/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def requirements(self):
if self.options.get_safe("with_elf"):
self.requires("libelf/0.8.13")
if self.options.get_safe("with_mount"):
self.requires("libmount/2.39")
self.requires("libmount/2.39.2")
if self.options.get_safe("with_selinux"):
self.requires("libselinux/3.5")
if self.settings.os != "Linux":
Expand All @@ -81,9 +81,9 @@ def requirements(self):
self.requires("libiconv/1.17")

def build_requirements(self):
self.tool_requires("meson/1.2.2")
self.tool_requires("meson/1.3.2")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.0.3")
self.tool_requires("pkgconf/2.1.0")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
Loading