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.

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

gdk-pixbuf: bump deps and several fixes #21137

Merged
merged 14 commits into from
Mar 6, 2024

Conversation

valgur
Copy link
Contributor

@valgur valgur commented Nov 14, 2023

This PR contains several fixes and bumping dependencies. Among them:

Related failing PRs: #21126.

@ghost
Copy link

ghost commented Nov 14, 2023

I detected other pull requests that are modifying gdk-pixbuf/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@conan-center-bot

This comment has been minimized.

@ghost ghost mentioned this pull request Nov 15, 2023
3 tasks
@AbrilRBS AbrilRBS self-assigned this Nov 15, 2023
@AbrilRBS
Copy link
Member

AbrilRBS commented Nov 15, 2023

I've taken the opportunity to include another PR on top of this one as it needed this fix to pass, hopefully it does not cause any issues for you :)

@AbrilRBS AbrilRBS mentioned this pull request Nov 15, 2023
@AbrilRBS
Copy link
Member

Reverting as it currently does not build for v2, let's have this one go thru and get merged and then we can take care of re-enabling mac in the other PR :)

AbrilRBS
AbrilRBS previously approved these changes Nov 15, 2023
Copy link
Contributor

@franramirez688 franramirez688 left a comment

Choose a reason for hiding this comment

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

As far as I can see, this is not reported upstream (https://github.com/conan-io/conan-center-index/pull/21137/files#diff-471daaafe56f12730848ec964c04a3badcf52a304703057c2ef62b443ef628d1R169), is it? I think that we should start reporting it before merging this. Wdyt @uilianries?

@AbrilRBS AbrilRBS self-requested a review November 15, 2023 14:47
Copy link

@bdal-jsinge bdal-jsinge left a comment

Choose a reason for hiding this comment

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

Not directly related to your changes, but I was trying to create a conan package for openslide too and got stuck on gdk-pixbuf recipe.

I think line 205 "gdk_pixbuf_binarydir": "${libdir1}/gdk-pixbuf-2.0/2.10" contains a typo, should say ${libdir}. For me the typo resulted in not being able to use the gdk-pixbuf package from another meson package.

@conan-center-bot

This comment has been minimized.

@franramirez688
Copy link
Contributor

Not directly related to your changes, but I was trying to create a conan package for openslide too and got stuck on gdk-pixbuf recipe.

I think line 205 "gdk_pixbuf_binarydir": "${libdir1}/gdk-pixbuf-2.0/2.10" contains a typo, should say ${libdir}. For me the typo resulted in not being able to use the gdk-pixbuf package from another meson package.

You're right. Since Conan 2.0.8, PkgConfigDeps is not using 1 as the first index:

diff --git a/recipes/gdk-pixbuf/all/conanfile.py b/recipes/gdk-pixbuf/all/conanfile.py
index 4f44d79742..1ffbfc55c7 100644
--- a/recipes/gdk-pixbuf/all/conanfile.py
+++ b/recipes/gdk-pixbuf/all/conanfile.py
@@ -12,7 +12,7 @@ from conan.tools.scm import Version

 import os

-required_conan_version = ">=1.56.0 <2 || >=2.0.6"
+required_conan_version = ">=1.56.0 <2 || >=2.0.8"


 class GdkPixbufConan(ConanFile):
@@ -195,10 +195,12 @@ class GdkPixbufConan(ConanFile):
             self.cpp_info.exelinkflags = ldflags
             self.cpp_info.sharedlinkflags = ldflags

+        # Related to https://github.com/conan-io/conan/pull/14233
+        libdir_variable = "libdir1" if Version(conan_version) < "2.0" else "libdir"
         pkgconfig_variables = {
             "bindir": "${prefix}/bin",
             "gdk_pixbuf_binary_version": "2.10.0",
-            "gdk_pixbuf_binarydir": "${libdir1}/gdk-pixbuf-2.0/2.10",
+            "gdk_pixbuf_binarydir": "${%s}/gdk-pixbuf-2.0/2.10" % libdir_variable,
             "gdk_pixbuf_moduledir": "${gdk_pixbuf_binarydir}/loaders",
             "gdk_pixbuf_cache_file": "${gdk_pixbuf_binarydir}/loaders.cache",
             "gdk_pixbuf_csource": "${bindir}/gdk-pixbuf-csource",

@valgur could you add those changes too? Otherwise, we could open another PR to solve that.

@bdal-jsinge
Copy link

You're right. Since Conan 2.0.8, PkgConfigDeps is not using 1 as the first index

Oh, it's not a typo but a version incompatibility. Thanks for explaining!

…workaround for the breaking change to pkgconfig_variables
@franramirez688
Copy link
Contributor

franramirez688 commented Nov 16, 2023

Hi @valgur

I just added a couple of changes, including the macOS validation. I'm curious why it was there, so let's see if it passes now or if that validation could be more limited.

UPDATED: If everything passes, I'll update the PR description to add the rest of the changes that I introduced 😁

@conan-center-bot

This comment has been minimized.

@valgur
Copy link
Contributor Author

valgur commented Nov 17, 2023

@franramirez688 Looks like glib cannot find the libintl shared library from libgettext on macOS. I'll try to reproduce it locally.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

uilianries
uilianries previously approved these changes Nov 23, 2023
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

@franramirez688 franramirez688 marked this pull request as draft November 23, 2023 12:26
@franramirez688
Copy link
Contributor

Sorry for moving this to DRAFT... I'd like to see if we could simplify the tons of patches applied before merging it.

@conan-center-bot

This comment has been minimized.

@franramirez688 franramirez688 self-assigned this Nov 28, 2023
@ghost ghost mentioned this pull request Dec 5, 2023
3 tasks
@ghost ghost mentioned this pull request Dec 14, 2023
3 tasks
recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
@valgur
Copy link
Contributor Author

valgur commented Feb 28, 2024

@franramirez688 What's the status of this PR? I assume something is still blocking it?

@conan-center-bot

This comment has been minimized.

@franramirez688
Copy link
Contributor

franramirez688 commented Mar 1, 2024

@franramirez688 What's the status of this PR? I assume something is still blocking it?

@valgur I'd like to talk to the team about the possibility of simplifying all the patches that we're using in this recipe. I think I can give it another try in these coming days 😁 Thanks for the reminder!

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 17 (0d48e84a414b06e24fea4c872f7dd378a4b08ff9):

  • gdk-pixbuf/2.42.8:
    All packages built successfully! (All logs)

  • gdk-pixbuf/2.42.6:
    All packages built successfully! (All logs)

  • gdk-pixbuf/2.42.9:
    All packages built successfully! (All logs)

  • gdk-pixbuf/2.42.10:
    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 18 (0d48e84a414b06e24fea4c872f7dd378a4b08ff9):

  • gdk-pixbuf/2.42.6:
    All packages built successfully! (All logs)

  • gdk-pixbuf/2.42.9:
    All packages built successfully! (All logs)

  • gdk-pixbuf/2.42.10:
    All packages built successfully! (All logs)

  • gdk-pixbuf/2.42.8:
    All packages built successfully! (All logs)

@uilianries
Copy link
Member

uilianries commented Mar 6, 2024

Is it possible to drop the version gdk-pixbuf/2.42.6? I see several conditions related to that version. I also found gtk package using that version, but we could update it as well.

I took a look in Ubuntu and Arch package to gdk-pixbuf and indeed they use patches to build with meson and autotools, but of course, nothing related like us, because we have a full house of profiles.

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

@conan-center-bot conan-center-bot merged commit 0b3b4ba into conan-io:master Mar 6, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants