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

Jump to bottom

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

merged 11 commits into from
Nov 28, 2024

Conversation

jwillikers
Copy link
Contributor

@jwillikers jwillikers commented Mar 8, 2024 •
edited
Loading

Also avoids conflicts with libwebsockets and eudev.

@conan-center-bot

This comment has been minimized.

Sign in to view
This was referenced Mar 8, 2024
Closed
Closed
Closed
@prince-chrismc prince-chrismc mentioned this pull request Mar 8, 2024
Open
@conan-center-bot

This comment has been minimized.

Sign in to view
@jwillikers jwillikers force-pushed the glib-bump-libmount branch from bf8c6c7 to 8a788fd Compare March 8, 2024 15:37
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@AbrilRBS AbrilRBS self-assigned this Mar 14, 2024
@ghost ghost mentioned this pull request Mar 14, 2024
Closed
3 tasks
@jwillikers
Copy link
Contributor Author

I'm a bit confused as to why this one broke.

@conan-center-bot

This comment has been minimized.

Sign in to view
@jwillikers
glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd
f92320e 
Also avoids conflicts with libwebsockets.
@conan-center-bot

This comment has been minimized.

Sign in to view
@jwillikers
Copy link
Contributor Author

I think something breaks when pkgconf is bumped in the test package. It appears that PkgConfig is not actually using the pkgconf executable from the tool_requires but looking for an executable named pkg-config, which it doesn't always find.

ericLemanissier added a commit to ericLemanissier/conan-center-index that referenced this pull request Mar 21, 2024
@ericLemanissier
pkgconf: set tools.gnu:pkg_config
b958b8f 
It is used by conan's PkgConfig helper
https://github.com/conan-io/conan/blob/59029095e86eacd402083fca7c308b06889f6301/conan/tools/gnu/pkgconfig.py#L25

unblocks conan-io#23030
@ericLemanissier ericLemanissier mentioned this pull request Mar 21, 2024
Closed
3 tasks
@ghost ghost mentioned this pull request Mar 21, 2024
Closed
3 tasks
This was referenced May 21, 2024
Merged
Open
Closed
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot conan-center-bot added Bump dependencies Only bumping dependencies versions in the recipe and removed Waiting for CI labels Jul 29, 2024
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 12 (32d42d101558e15508759060820f6f90e7408513):

  • glib/2.81.0:
    All packages built successfully! (All logs)

  • glib/2.77.3:
    All packages built successfully! (All logs)

  • glib/2.78.3:
    All packages built successfully! (All logs)

  • glib/2.76.3:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 12 (32d42d101558e15508759060820f6f90e7408513):

  • glib/2.81.0:
    All packages built successfully! (All logs)

  • glib/2.78.3:
    All packages built successfully! (All logs)

  • glib/2.77.3:
    All packages built successfully! (All logs)

  • glib/2.76.3:
    All packages built successfully! (All logs)

@github-actions GitHub Actions
Copy link
Contributor

Hooks produced the following warnings for commit 32d42d1
glib/2.81.0@#9cf9484c51dfbc19f1a7cc7734112f80 
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './lib/libgirepository-2.0.so' links to system library 'm' but it is not in cpp_info.system_libs.

danimtb
danimtb previously approved these changes Jul 29, 2024
View reviewed changes
uilianries
uilianries previously approved these changes Jul 29, 2024
View reviewed changes
@AbrilRBS AbrilRBS dismissed stale reviews from uilianries and danimtb via 6f62bdb November 25, 2024 22:35
AbrilRBS
AbrilRBS approved these changes Nov 25, 2024
View reviewed changes
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jwillikers sorry that this took so long to get addressed, I've now launched this PR on the new pipeline, let's merge this :)

uilianries
uilianries approved these changes Nov 28, 2024
View reviewed changes
Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. All other recipes are using the newest version available in Conan Center:

../glib/all/conanfile.py:            self.requires("libmount/2.39")
../libsystemd/all/conanfile.py:        self.requires("libmount/2.39.2")
../libwebsockets/all/conanfile.py:            self.requires("libmount/2.39.2")
../eudev/all/conanfile.py:            self.requires("libmount/2.39.2")

@uilianries uilianries merged commit 99954a6 into conan-io:master Nov 28, 2024
9 checks passed
@jwillikers jwillikers deleted the glib-bump-libmount branch November 28, 2024 13:14
memsharded pushed a commit to toge/conan-center-index that referenced this pull request Nov 29, 2024
@jwillikers @ericLemanissier
@AbrilRBS @memsharded
glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd (con…
4d87e36 
…an-io#23030)

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Abril Rincón Blanco <rubenrb@jfrog.com>
OMGtechy pushed a commit to OMGtechy/conan-center-index that referenced this pull request Dec 31, 2024
@jwillikers @ericLemanissier
@AbrilRBS @OMGtechy
glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd (con…
991a66f 
…an-io#23030)

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Abril Rincón Blanco <rubenrb@jfrog.com>
jcar87 added a commit that referenced this pull request Jan 10, 2025
@toge @memsharded
@AbrilRBS @kambala-decapitator @amoeba @niktischenko @valgur @franramirez688 @jorgen @irieger @perseoGI @jwillikers @ericLemanissier @Nekto89 @jcar87
re2c: add version 4.0.2 (#25998)
cd0b755 
* re2c: add version 4.0

* update 4.0.1

* changing to CMake build

* dropping 1.3

* remove config.yml entry

* simdutf: add version 5.6.3 (#26039)

* SDL: fix Android shared library and expose HIDAPI setting (#26049)

* arrow: add version 18.1.0 (#26035)

* libwebm: add webm directory to include path (#26029)

* libpsl: add v0.21.5, bump deps, simplify patching (#22029)

* libpsl: add v0.21.2, bump deps, simplify patching

* libpsl: rmdir share

* libpsl: bump to v0.21.5

* cleanup

* Automaticlly injected in Conan 2

* Using  option. Using the old patch

* Update recipes/libpsl/all/conanfile.py

---------

Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>

* json_struct receipt (#25335)

* tree-sitter-sql: add version 0.3.7 (#26012)

* OpenColorIO: Fix validation & package_info (#24395)

* OpenColorIO: Fix validation & package_info

* Remove the validation preventing shared building
* Add required libraries to package_info

* update recipe

* fix linux transitive shared

* try to remove redundant requires

* fix previous versions

* removed versions from config.yml

* more fixes previous versions

---------

Co-authored-by: memsharded <james@conan.io>

* openh264: add version 2.5.0 (#26044)

Co-authored-by: PerseoGI <perseog@jfrog.com>
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>

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

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Abril Rincón Blanco <rubenrb@jfrog.com>

* sqlite3: add 3.47.1 (#26043)

* removing old 2.0.3

* update 4.0.2

* re2c updates

* fix test_package conanfile

---------

Co-authored-by: memsharded <james@conan.io>
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
Co-authored-by: Bryce Mecum <petridish@gmail.com>
Co-authored-by: Nikolay Tischenko <niktischenko@gmail.com>
Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: Francisco Ramirez de Anton <franchuti688@gmail.com>
Co-authored-by: Jørgen Lind <jorgen.lind@gmail.com>
Co-authored-by: Ingmar Rieger <git@irieger.net>
Co-authored-by: PerseoGI <perseog@jfrog.com>
Co-authored-by: Jordan Williams <jordan@jwillikers.com>
Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
Co-authored-by: Abril Rincón Blanco <rubenrb@jfrog.com>
Co-authored-by: Marian Klymov <nekto1989@gmail.com>
Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AbrilRBS AbrilRBS AbrilRBS approved these changes

@uilianries uilianries uilianries approved these changes

@ericLemanissier ericLemanissier ericLemanissier approved these changes

@valgur valgur valgur approved these changes

@danimtb danimtb Awaiting requested review from danimtb

Assignees

@AbrilRBS AbrilRBS

Labels
Bump dependencies Only bumping dependencies versions in the recipe
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jwillikers @conan-center-bot @valgur @ericLemanissier @uilianries @AbrilRBS @danimtb