zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gobject-introspection: add v1.60.2 (#44643)

Browse Source 
Signed-off-by: Teague Sterling <teaguesterling@gmail.com>
This commit is contained in:
Teague Sterling 2024-06-30 11:46:02 -07:00 committed by GitHub
parent c9a24bc6c5
commit dae6fe711c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/gobject-introspection/package.py
View File

@ -24,6 +24,7 @@ class GobjectIntrospection(MesonPackage, AutotoolsPackage):
version("1.76.1", sha256="196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf") version("1.76.1", sha256="196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf")
version("1.72.1", sha256="012e313186e3186cf0fde6decb57d970adf90e6b1fac5612fe69cbb5ba99543a") version("1.72.1", sha256="012e313186e3186cf0fde6decb57d970adf90e6b1fac5612fe69cbb5ba99543a")
version("1.72.0", sha256="02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc") version("1.72.0", sha256="02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc")
version("1.60.2", sha256="ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c")
version("1.56.1", sha256="5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b") version("1.56.1", sha256="5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b")
version("1.49.2", sha256="73d59470ba1a546b293f54d023fd09cca03a951005745d86d586b9e3a8dde9ac") version("1.49.2", sha256="73d59470ba1a546b293f54d023fd09cca03a951005745d86d586b9e3a8dde9ac")
version("1.48.0", sha256="fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877") version("1.48.0", sha256="fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877")
@ -44,7 +45,7 @@ class GobjectIntrospection(MesonPackage, AutotoolsPackage):
depends_on("cairo+gobject") depends_on("cairo+gobject")
depends_on("glib@2.78:", when="@1.78") depends_on("glib@2.78:", when="@1.78")
depends_on("glib@2.76:", when="@1.76") depends_on("glib@2.76:", when="@1.76")
depends_on("glib@2.58:", when="@1.72") depends_on("glib@2.58:", when="@1.60:1.72")
depends_on("glib@2.56:", when="@1.56") depends_on("glib@2.56:", when="@1.56")
depends_on("glib@2.49.2:", when="@1.49.2") depends_on("glib@2.49.2:", when="@1.49.2")
depends_on("glib@2.48.1", when="@1.48.0") depends_on("glib@2.48.1", when="@1.48.0")
@ -74,7 +75,10 @@ class GobjectIntrospection(MesonPackage, AutotoolsPackage):
# extra sed expression in its TOOL_SUBSTITUTION that results in # extra sed expression in its TOOL_SUBSTITUTION that results in
# an `#!/bin/bash /path/to/spack/bin/sbang` unconditionally being # an `#!/bin/bash /path/to/spack/bin/sbang` unconditionally being
# inserted into the scripts as they're generated. # inserted into the scripts as they're generated.
patch("sbang.patch", when="@:1.60") patch("sbang.patch", when="@:1.56")
# The TOOL_SUBSITUTION line changed after 1.58 to include /usr/bin/env in
# the Python substituion more explicitly. The Makefile.am was removed in 1.61.
patch("sbang-1.60.2.patch", when="@1.58:1.60")
# Drop deprecated xml.etree.ElementTree.Element.getchildren() which leads # Drop deprecated xml.etree.ElementTree.Element.getchildren() which leads
# to compilation issues with Python 3.9. # to compilation issues with Python 3.9.
@ -86,6 +90,12 @@ class GobjectIntrospection(MesonPackage, AutotoolsPackage):
when="@:1.63.1", when="@:1.63.1",
) )
conflicts(
"^python@3.11:",
when="@:1.60",
msg="giscannermodule.c in <=v1.60 uses syntax incompatible with Python >=3.11",
)
def url_for_version(self, version): def url_for_version(self, version):
url = "https://download.gnome.org/sources/gobject-introspection/{0}/gobject-introspection-{1}.tar.xz" url = "https://download.gnome.org/sources/gobject-introspection/{0}/gobject-introspection-{1}.tar.xz"
return url.format(version.up_to(2), version) return url.format(version.up_to(2), version)

11
var/spack/repos/builtin/packages/gobject-introspection/sbang-1.60.2.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Makefile.in 2016-09-13 01:23:59.000000000 -0700
+++ b/Makefile.in 2017-02-22 10:26:31.824509512 -0800
@@ -1475,7 +1475,7 @@
gir_DATA = $(STATIC_GIRSOURCES) $(SUBSTITUTED_GIRSOURCES) $(BUILT_GIRSOURCES)
typelibsdir = $(libdir)/girepository-1.0
typelibs_DATA = $(gir_DATA:.gir=.typelib)
-TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g
+TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g -e "1i\#!/bin/bash $(SPACK_SBANG)"
g_ir_compiler_SOURCES = tools/compiler.c
g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-I$(top_srcdir)/girepository