summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Galby <67924449+Jordan474@users.noreply.github.com>2024-10-21 08:40:42 +0200
committerGitHub <noreply@github.com>2024-10-21 08:40:42 +0200
commit37fe3b498430ae9c11b60166ed04f5eb602acd5b (patch)
tree8697103490475c135ccd6daabceee7f00229da38
parenta00fddef4ef790468c62061dce455b5b03dc79f2 (diff)
downloadspack-37fe3b498430ae9c11b60166ed04f5eb602acd5b.tar.gz
spack-37fe3b498430ae9c11b60166ed04f5eb602acd5b.tar.bz2
spack-37fe3b498430ae9c11b60166ed04f5eb602acd5b.tar.xz
spack-37fe3b498430ae9c11b60166ed04f5eb602acd5b.zip
Add old gtkplus 3.22.30 (#40310)
This makes it compatible with external glib 2.56 (rhel7/rhel8). Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/gtkplus/package.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py
index 889a789cff..158d7adfd7 100644
--- a/var/spack/repos/builtin/packages/gtkplus/package.py
+++ b/var/spack/repos/builtin/packages/gtkplus/package.py
@@ -25,6 +25,11 @@ class Gtkplus(AutotoolsPackage, MesonPackage):
version("3.24.29", sha256="f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa")
version("3.24.26", sha256="2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9")
version(
+ "3.22.30",
+ sha256="a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567",
+ deprecated=True,
+ )
+ version(
"3.20.10",
sha256="e81da1af1c5c1fee87ba439770e17272fa5c06e64572939814da406859e56b70",
deprecated=True,
@@ -58,7 +63,9 @@ class Gtkplus(AutotoolsPackage, MesonPackage):
# depends_on('docbook-xsl', when='@3.24:', type='build')
# depends_on('libxslt', when='@3.24:', type='build')
depends_on("pkgconfig", type="build")
- depends_on("glib@2.57.2:")
+ depends_on("glib")
+ depends_on("glib@2.49.4:", when="@3.22:")
+ depends_on("glib@2.57.2:", when="@3.24:")
depends_on("pango@1.41.0:+X")
depends_on("fribidi@0.19.7:")
# atk was also merged into at-spi2-core, but gtk3 doesn't want to build without it
@@ -94,7 +101,7 @@ class Gtkplus(AutotoolsPackage, MesonPackage):
)
# https://gitlab.gnome.org/GNOME/gtk/-/issues/3776
- if self.spec.satisfies("@3:%gcc@11:"):
+ if self.spec.satisfies("@3.24:%gcc@11:"):
filter_file(" '-Werror=array-bounds',", "", "meson.build", string=True)
def setup_run_environment(self, env):