diff options
| author | Michael Kuhn <michael.kuhn@ovgu.de> | 2024-02-05 10:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 10:23:57 +0100 |
| commit | e35fbfab773ebd0a78b485a1b4bf42de9a1280a3 (patch) | |
| tree | 0adf2f8add92386eb46b06161686f4258bbc3b02 | |
| parent | 478203dc681894cb6137ec23b8ef20f419ba8543 (diff) | |
| download | spack-e35fbfab773ebd0a78b485a1b4bf42de9a1280a3.tar.gz spack-e35fbfab773ebd0a78b485a1b4bf42de9a1280a3.tar.bz2 spack-e35fbfab773ebd0a78b485a1b4bf42de9a1280a3.tar.xz spack-e35fbfab773ebd0a78b485a1b4bf42de9a1280a3.zip | |
gtkplus: add v3.24.41 and fix CUPS problems (#42480)
Fixes #42297
| -rw-r--r-- | var/spack/repos/builtin/packages/gtkplus/package.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 884fe8552e..846ed52df8 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -15,6 +15,7 @@ class Gtkplus(MesonPackage): license("LGPL-2.0-or-later") + version("3.24.41", sha256="47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa") version("3.24.29", sha256="f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa") version("3.24.26", sha256="2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9") version( @@ -74,10 +75,11 @@ class Gtkplus(MesonPackage): return url.format(version.up_to(2), version) def patch(self): - # remove disable deprecated flag. - filter_file( - r'CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"', "", "configure", string=True - ) + if self.spec.satisfies("@:3.24.35"): + # remove disable deprecated flag. + filter_file( + r'CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"', "", "configure", string=True + ) # https://gitlab.gnome.org/GNOME/gtk/-/issues/3776 if self.spec.satisfies("@3:%gcc@11:"): @@ -95,7 +97,7 @@ class Gtkplus(MesonPackage): env.prepend_path("GI_TYPELIB_PATH", join_path(self.prefix.lib, "girepository-1.0")) def meson_args(self): - args = std_meson_args + args = [] if self.spec.satisfies("platform=darwin"): args.extend(["-Dx11_backend=false", "-Dquartz_backend=true"]) @@ -104,6 +106,8 @@ class Gtkplus(MesonPackage): ["-Dgtk_doc=false", "-Dman=false", "-Dintrospection=true", "-Dwayland_backend=false"] ) + args.append("-Dprint_backends=file,lpr{0}".format(",cups" if "+cups" in self.spec else "")) + return args def configure_args(self): |