feat: add package libxkbcommon & xkeyboard-config

Signed-off-by: sisungo <[email protected]>

packages/glib/pkgbuild.py

@@ -14,14 +14,13 @@ source_url("https://download.gnome.org/sources/glib/2.89/glib-2.89.2.tar.xz")
 builddep("shortcut/c++")
 builddep("shortcut/meson")
 builddep("gettext")
-builddep("libintl-dev @target")
+builddep(f"libintl-dev @{arch.get_target()}")
 builddep("pcre2-tools")
-builddep("libpcre2-dev @target")
-builddep("libffi-dev @target")
+builddep(f"libpcre2-dev @{arch.get_target()}")
+builddep(f"libffi-dev @{arch.get_target()}")
 builddep("pkgconf")
-builddep("libz-ng-dev @target")
+builddep(f"libz-ng-dev @{arch.get_target()}")
 builddep("libexpat")
-builddep("gobject-introspection @target")
 
 
 def build():
@@ -30,7 +29,6 @@ def build():
     cpp.meson_setup([
         "-Druntime_dir=/run",
         f"-Dgio_module_dir=/lib/{arch.get_target()}/gio/modules",
-        "-Dintrospection=enabled",
         "--prefix=/",
         f"--bindir={get_prefix('glib-tools')}/bin",
         f"--libdir={get_prefix('glib-dev')}/lib",

packages/gobject-introspection/pkgbuild.py

@@ -1,49 +0,0 @@
-import shutil
-
-from lib.make import *
-from lib import cpp, arch
-
-
-version("1.86.0")
-description("to describe the APIs and collect them in a uniform, machine readable format")
-maintainer("sisungo <[email protected]>")
-source_url("https://gitlab.gnome.org/GNOME/gobject-introspection/-/archive/1.86.0/gobject-introspection-1.86.0.tar.gz")
-
-builddep("shortcut/meson")
-builddep("shortcut/c")
-builddep("glib-dev @target")
-builddep("setuptools.py @target")
-builddep("libpython-dev @target")
-builddep("flex")
-builddep("bison")
-builddep("libexpat @target")
-
-
-def build():
-    cpp.meson_setup([
-        f"--prefix={get_prefix('gobject-introspection')}",
-        f"-Dgir_dir_prefix=/lib/{arch.get_target()}/include/gir",
-        "-Dcairo=disabled",
-        "-Dpython=/bin/python3",
-        "-Dtests=false",
-    ])
-    cpp.meson_compile()
-    cpp.meson_install()
-
-on_build(build)
-
-
-def pack(composer):
-    composer.add_dir("include")
-    composer.add_dir("share")
-    composer.add_dir("bin")
-    composer.add_dir("lib")
-    shutil.rmtree(f"{composer.workdir}/bundle/lib/{arch.get_target()}")
-    composer.add_dir(f"lib/{arch.get_target()}/include/gir", "include/gir")
-
-package("gobject-introspection")
-dep("python @same-arch")
-dep("setuptools.py @same-arch")
-dep("glib-dev @same-arch")
-on_pack(pack)
-

packages/libgudev/patches/0001-clang-support.patch

@@ -1,6 +0,0 @@
---- a/gudev/meson.build
-+++ b/gudev/meson.build
-36c36
-<   '-export-dynamic',
----
->   '-Wl,-export-dynamic',

packages/libgudev/pkgbuild.py

@@ -1,42 +0,0 @@
-from lib import cpp
-from lib.make import *
-
-version("238")
-description("Input device management and event handling library")
-maintainer("sisungo <[email protected]>")
-source_url("https://gitlab.gnome.org/GNOME/libgudev/-/archive/238/libgudev-238.tar.gz")
-
-builddep("shortcut/c")
-builddep("shortcut/meson")
-builddep("gobject-introspection @target")
-builddep("glib-dev @target")
-builddep("lxdeviced-libudev-dev @target")
-builddep("glib-tools")
-builddep("libexpat")
-
-
-def build():
-    cpp.meson_setup([
-        "--prefix=/",
-        f"--libdir={get_prefix('libgudev')}/lib",
-        f"--includedir={get_prefix('libgudev-dev')}/include",
-        "-Dintrospection=enabled",
-    ])
-    cpp.meson_compile()
-    cpp.meson_install()
-
-on_build(build)
-
-
-package("libgudev")
-dep("semi-libc @same-arch")
-dep("lxdeviced-libudev @same-arch")
-dep("libglib @same-arch")
-dep("libgobject @same-arch")
-cpp.use_auto_pack(["lib"])
-
-package("libgudev-dev")
-dep("libgudev (same)")
-dep("lxdeviced-libudev-dev @same-arch")
-dep("glib-dev @same-arch")
-cpp.use_auto_pack(["dev"])

packages/libxkbcommon/pkgbuild.py

@@ -0,0 +1,103 @@
+import os
+
+from lib.make import *
+from lib import cpp, arch
+
+
+version("1.14.0-beta.1")
+description("keymap handling library for toolkits and window systems")
+maintainer("sisungo <[email protected]>")
+source_url("https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-1.14.0-beta1.tar.gz")
+
+builddep("shortcut/c")
+builddep("shortcut/meson")
+builddep("flex")
+builddep("bison")
+builddep("libxml2-dev @target")
+builddep("libwayland-dev @target")
+builddep("wayland-protocols @target")
+builddep("awk")
+builddep("bash")
+builddep("xkeyboard-config-dev (=2.48) @any")
+
+
+def build():
+    os.environ["PKG_CONFIG_PATH"] = "/share/pkgconfig"
+
+    # FIXME: Building the package requires `/bin/sh` to be bash.
+    if in_atomic():
+        os.system("ln -sf /bin/bash /bin/sh")
+
+    cpp.meson_setup([
+        f"--libdir={get_prefix('libxkbcommon')}/lib",
+        f"--includedir={get_prefix('libxkbcommon-dev')}/include",
+        f"--bindir={get_prefix('xkbcli')}/bin",
+        f"--libexecdir={get_prefix('xkbcli')}/libexec",
+        "-Denable-x11=false",
+    ])
+    cpp.meson_compile()
+    cpp.meson_install()
+
+on_build(build)
+
+
+def pack_libxkbcommon(composer):
+    composer.makedir("lib")
+    for i in glob.glob("lib/*common*so*"):
+        composer.add(i)
+
+package("libxkbcommon")
+dep("semi-libc @same-arch")
+cpp.use_auto_pack(["lib"])
+
+def pack_libxkbregistry(composer):
+    composer.makedir("lib")
+    for i in glob.glob("lib/*registry*so*"):
+        composer.add(i)
+
+package("libxkbregistry")
+dep("semi-libc @same-arch")
+dep("libxml2 @same-arch")
+dep("xkeyboard-config (=2.48) @any")
+cpp.use_auto_pack(["lib"])
+
+def pack_libxkbcommon_dev(composer):
+    composer.makedirs("lib/pkgconfig")
+    composer.add("lib/pkgconfig/xkbcommon.pc")
+    composer.makedirs("include/xkbcommon")
+    for i in glob.glob("include/xkbcommon/*"):
+        if "registry" in i:
+            continue
+        composer.add(i)
+
+package("libxkbcommon-dev")
+dep("libxkbcommon (same)")
+cpp.use_auto_pack(["dev"])
+
+def pack_libxkbregistry_dev(composer):
+    composer.makedirs("lib/pkgconfig")
+    with open("lib/pkgconfig/xkbregistry.pc", "r") as pcf:
+        pc = pcf.read()
+    pc = pc.replace(get_prefix("libxkbcommon"), get_prefix("libxkbregistry"))
+    pc = pc.replace(get_prefix("libxkbcommon-dev"), get_prefix("libxkbregistry-dev"))
+    with open("lib/pkgconfig/xkbregistry.pc", "wt+") as pcf:
+        pcf.write(pc)
+    composer.add("lib/pkgconfig/xkbregistry.pc")
+    composer.makedirs("include/xkbcommon")
+    for i in glob.glob("include/xkbcommon/*"):
+        if "registry" in i:
+            composer.add(i)
+
+package("libxkbregistry-dev")
+dep("libxkbregistry (same)")
+dep("libxml2-dev @same-arch")
+dep("xkeyboard-config-dev (=2.48) @any")
+cpp.use_auto_pack(["dev"])
+
+def pack_bin(composer):
+    composer.add("bin")
+    composer.add("libexec")
+
+package("xkbcli")
+dep("libxkbcommon (same)")
+on_pack(pack_bin)

packages/libxml2/pkgbuild.py

@@ -1,15 +1,15 @@
 from lib import arch, cpp
 from lib.make import *
-
-
+ 
+ 
 version("2.15.3")
 description("an XML toolkit implemented in C, originally developed for the GNOME Project")
-maintainer("sisungo <[email protected]>")
+maintainer("sisungo <[email protected]>")
 source_url("https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.3.tar.xz")
-
+ 
 builddep("shortcut/autotools")
 builddep("shortcut/c")
-
+ 
 
 def build():
     cpp.configure([
@@ -27,6 +27,5 @@ dep("semi-libc @same-arch")
 cpp.use_auto_pack(["lib"])
 
 package("libxml2-dev")
-dep("libxml2 (same)")
-dep("semi-libc-dev @same-arch")
+dep("semi-libc @same-arch")
 cpp.use_auto_pack(["dev"])

packages/xkeyboard-config/pkgbuild.py

@@ -0,0 +1,51 @@
+import glob
+
+from lib.make import *
+from lib import cpp, arch
+
+
+version("2.48")
+description("a consistent, well-structured, frequently released, open source database of keyboard configuration data")
+maintainer("sisungo <[email protected]>")
+source_url("https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-2.48/xkeyboard-config-xkeyboard-config-2.48.tar.gz")
+
+builddep("shortcut/c")
+builddep("shortcut/meson")
+builddep("libintl-dev @target")
+builddep("gettext")
+builddep("libexpat")
+builddep("perl")
+
+
+def build():
+    cpp.meson_setup([
+        f"--prefix={get_prefix('xkeyboard-config')}",
+    ])
+    cpp.meson_compile()
+    cpp.meson_install()
+
+on_build(build)
+
+
+def pack(composer):
+    composer.makedir("share")
+    composer.add("share/xkeyboard-config-2")
+
+package("xkeyboard-config")
+arch_any()
+on_pack(pack)
+
+def pack_dev(composer):
+    for i in glob.glob("share/pkgconfig/*"):
+        with open(i, "r") as file:
+            content = file.read()
+        content = content.replace(get_prefix("xkeyboard-config-dev"), get_prefix("xkeyboard-config"))
+        with open(i, "wt+") as file:
+            file.write(content)
+    composer.makedir("share")
+    composer.add("share/pkgconfig")
+
+package("xkeyboard-config-dev")
+arch_any()
+dep("xkeyboard-config (same-version) @any")
+on_pack(pack_dev)