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

gdk-pixbuf: bump glib #19557

Merged
merged 4 commits into from
Sep 7, 2023
Merged

gdk-pixbuf: bump glib #19557

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
152ad86
gdk-pixbuf: bump glib
ericLemanissier Aug 31, 2023
5c3feaa
Update conanfile.py
ericLemanissier Aug 31, 2023
65d4d25
Remove old glib workaround
RubenRBS Sep 2, 2023
7a4c22a
Bump libpng
RubenRBS Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions recipes/gdk-pixbuf/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

import os

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.56.0 <2 || >=2.0.6"


class GdkPixbufConan(ConanFile):
name = "gdk-pixbuf"
description = "toolkit for image loading and pixel buffer manipulation"
topics = ("gdk-pixbuf", "image")
topics = ("image")
url = "https://github.com/conan-io/conan-center-index"
homepage = "https://developer.gnome.org/gdk-pixbuf/"
license = "LGPL-2.1-or-later"
Expand Down Expand Up @@ -63,9 +63,9 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("glib/2.76.0", transitive_headers=True, transitive_libs=True, run=can_run(self))
self.requires("glib/2.77.0", transitive_headers=True, transitive_libs=True)
if self.options.with_libpng:
self.requires("libpng/1.6.39")
self.requires("libpng/1.6.40")
if self.options.with_libtiff:
self.requires("libtiff/4.4.0")
if self.options.with_libjpeg == "libjpeg-turbo":
Expand Down Expand Up @@ -93,8 +93,7 @@ def build_requirements(self):
self.tool_requires("meson/1.0.0")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.3")
if not can_run(self):
self.tool_requires("glib/2.76.0")
self.tool_requires("glib/<host_version>")
if self.options.with_introspection:
self.tool_requires("gobject-introspection/1.72.0")

Expand Down