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

xkeyboard-config: add xkbdata provider (#45571)

Browse Source 
Signed-off-by: Teague Sterling <teaguesterling@gmail.com>
This commit is contained in:
Teague Sterling 2025-01-04 01:39:45 -08:00 committed by GitHub
parent b4f048cc14
commit 9cccdc5424
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/spack/defaults/packages.yaml
View File

@ -65,6 +65,7 @@ packages:
unwind: [libunwind] unwind: [libunwind]
uuid: [util-linux-uuid, libuuid] uuid: [util-linux-uuid, libuuid]
wasi-sdk: [wasi-sdk-prebuilt] wasi-sdk: [wasi-sdk-prebuilt]
xkbdata-api: [xkeyboard-config, xkbdata]
xxd: [xxd-standalone, vim] xxd: [xxd-standalone, vim]
yacc: [bison, byacc] yacc: [bison, byacc]
ziglang: [zig] ziglang: [zig]

6
var/spack/repos/builtin/packages/libxkbcommon/package.py
View File

@ -53,7 +53,7 @@ class Libxkbcommon(MesonPackage, AutotoolsPackage):
depends_on("pkgconfig@0.9.0:", type="build") depends_on("pkgconfig@0.9.0:", type="build")
depends_on("bison", type="build") depends_on("bison", type="build")
depends_on("util-macros") depends_on("util-macros")
depends_on("xkbdata") depends_on("xkbdata-api")
depends_on("libxcb@1.10:") depends_on("libxcb@1.10:")
depends_on("libxml2", when="@1:") depends_on("libxml2", when="@1:")
@ -64,7 +64,7 @@ class Libxkbcommon(MesonPackage, AutotoolsPackage):
class MesonBuilder(spack.build_systems.meson.MesonBuilder): class MesonBuilder(spack.build_systems.meson.MesonBuilder):
def meson_args(self): def meson_args(self):
args = [ args = [
"-Dxkb-config-root={0}".format(self.spec["xkbdata"].prefix), "-Dxkb-config-root={0}".format(self.spec["xkbdata-api"].prefix),
"-Denable-docs=false", "-Denable-docs=false",
"-Denable-wayland=" + str(self.spec.satisfies("+wayland")), "-Denable-wayland=" + str(self.spec.satisfies("+wayland")),
] ]
@ -79,6 +79,6 @@ class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder):
def configure_args(self): def configure_args(self):
"""Configure arguments are passed using meson_args functions""" """Configure arguments are passed using meson_args functions"""
return [ return [
"--with-xkb-config-root={0}".format(self.spec["xkbdata"].prefix), "--with-xkb-config-root={0}".format(self.spec["xkbdata-api"].prefix),
"--disable-docs", "--disable-docs",
] + self.enable_or_disable("wayland") ] + self.enable_or_disable("wayland")

2
var/spack/repos/builtin/packages/xkbdata/package.py
View File

@ -15,3 +15,5 @@ class Xkbdata(AutotoolsPackage, XorgPackage):
version("1.0.1", sha256="5b43ca5219cd4022a158a8d4bfa30308ea5e16c9b5270a64589ebfe7f875f430") version("1.0.1", sha256="5b43ca5219cd4022a158a8d4bfa30308ea5e16c9b5270a64589ebfe7f875f430")
depends_on("xkbcomp", type="build") depends_on("xkbcomp", type="build")
provides("xkbdata-api")

2
var/spack/repos/builtin/packages/xkeyboard-config/package.py
View File

@ -25,6 +25,8 @@ class XkeyboardConfig(AutotoolsPackage, XorgPackage):
depends_on("intltool@0.30:", type="build") depends_on("intltool@0.30:", type="build")
depends_on("xproto@7.0.20:", type="build") depends_on("xproto@7.0.20:", type="build")
provides("xkbdata-api")
# TODO: missing dependencies # TODO: missing dependencies
# xgettext # xgettext
# msgmerge # msgmerge