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] update dependencies and modernize #13174

Merged
merged 18 commits into from
Oct 2, 2022

Conversation

planetmarshall
Copy link
Contributor

Specify library name and version: gdk-pixbuf

  • Update dependency versions
  • Migrate to new meson toolchain

  • I've read the guidelines for contributing.
  • I've followed the PEP8 style guides for Python code in the recipes.
  • I've used the latest Conan client version.
  • I've tried at least one configuration locally with the conan-center hook activated.

@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.

@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.

@conan-center-bot

This comment has been minimized.

recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
recipes/gdk-pixbuf/all/conanfile.py Show resolved Hide resolved
recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
recipes/gdk-pixbuf/all/conanfile.py Outdated Show resolved Hide resolved
Copy link
Contributor

@jwillikers jwillikers left a comment

Choose a reason for hiding this comment

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

Also, be sure to create a test_v1_package test package and update the test_package to use the new Conan CMake generators. Thanks!

@conan-center-bot

This comment has been minimized.

Copy link
Contributor

@jwillikers jwillikers left a comment

Choose a reason for hiding this comment

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

Looking really good. I think all that's left besides the couple of small tweaks is to use the new CMake generators in the test_package. Nvm, I see you just updated the test_package. That looks great.


def validate(self):
if self.options.shared and not self.options["glib"].shared:
if self.info.options.shared and not self.options["glib"].shared:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if self.info.options.shared and not self.options["glib"].shared:
if self.info.options.shared and not self.info.options["glib"].shared:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This doesn't work, and results in the error

ERROR: gdk-pixbuf/2.42.9: Error in validate() method, line 64
        if self.info.options["glib"].shared and microsoft.is_msvc_static_runtime(self):
        ConanException: option 'shared' doesn't exist

I don't entirely follow the explanation of the difference between self.info.options and self.options, but I assume it is to do with the latter being the options of a dependency

Copy link
Contributor

Choose a reason for hiding this comment

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

In the validate method, you should use the dependencies model to access the options of glib. I think something pretty close to the following should work.

Suggested change
if self.info.options.shared and not self.options["glib"].shared:
if self.info.options.shared and not self.dependencies.direct_host["glib"].options.shared:

recipes/gdk-pixbuf/all/test_v1_package/CMakeLists.txt Outdated Show resolved Hide resolved
Co-authored-by: Jordan Williams <jordan@jwillikers.com>
@conan-center-bot

This comment has been minimized.

Copy link
Contributor

@jwillikers jwillikers left a comment

Choose a reason for hiding this comment

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

Can you remove the test_v1_package/test_package.c file now that it's using the test_package/test_package.c file?


def validate(self):
if self.options.shared and not self.options["glib"].shared:
if self.info.options.shared and not self.options["glib"].shared:
Copy link
Contributor

Choose a reason for hiding this comment

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

In the validate method, you should use the dependencies model to access the options of glib. I think something pretty close to the following should work.

Suggested change
if self.info.options.shared and not self.options["glib"].shared:
if self.info.options.shared and not self.dependencies.direct_host["glib"].options.shared:

@conan-center-bot
Copy link
Collaborator

All green in build 17 (42c4a6af9740727f7725cebf1eefaff080e82ed1):

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

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

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

Copy link
Contributor

@jwillikers jwillikers left a comment

Choose a reason for hiding this comment

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

Awesome! Great work.

@conan-center-bot conan-center-bot merged commit f178e95 into conan-io:master Oct 2, 2022
System-Arch pushed a commit to System-Arch/conan-center-index that referenced this pull request Oct 7, 2022
* [gdk-pixbuf] bump dependency versions

* [gdk-pixbuf] update to new meson toolchain

* [gdk-pixbuf] update compiler-rt test

* [gdk-pixbuf] remove base path for patches (not required)

* [gdk-pixbuf] fix license file copy

* [gdk-pixbuf] fix compiler-rt test

* [gdk-pixbuf] raise normal exception from compiler-rt check

* [gdk-pixbuf] remove the compiler-rt workaround (no longer reproducible)

* [gdk-pixbuf] clean up the generate method

* [gdk-pixbuf] reinstate compiler-rt flag for clang <= 12

* [gdk-pixbuf] disallow static msvc runtime with shared glib

* [gdk-pixbuf] use glib 2.73.0 on MSVC due to conan-io#12342

* [gdk-pixbuf] apply review suggestions

* [gdk-pixbuf] add v1 test package

* [gdk-pixbuf] update test package

* Update recipes/gdk-pixbuf/all/test_v1_package/CMakeLists.txt

Co-authored-by: Jordan Williams <jordan@jwillikers.com>

* [gdk-pixbuf] remove duplicated test source file

* [gdk-pixbuf] update dependency options in validate

Co-authored-by: Jordan Williams <jordan@jwillikers.com>
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.

5 participants