diff options
| -rw-r--r-- | internal/rosa/gtk.go | 58 | ||||
| -rw-r--r-- | internal/rosa/package/glib/package.az | 38 | ||||
| -rw-r--r-- | internal/rosa/package/glib/stub-machine-id | 1 | ||||
| -rw-r--r-- | internal/rosa/package/glib/stub-machine-id-fhs | 1 | ||||
| -rw-r--r-- | internal/rosa/state.go | 15 | ||||
| -rw-r--r-- | internal/rosa/state_native.go | 3 |
6 files changed, 50 insertions, 66 deletions
diff --git a/internal/rosa/gtk.go b/internal/rosa/gtk.go deleted file mode 100644 index eaa67654..00000000 --- a/internal/rosa/gtk.go +++ /dev/null @@ -1,58 +0,0 @@ -package rosa - -import ( - "hakurei.app/fhs" - "hakurei.app/internal/pkg" -) - -func (t Toolchain) newGLib() (pkg.Artifact, string) { - const ( - version = "2.88.1" - checksum = "Rkszn6W4RHjyspyqfXdVAVawdwDJCuS0Zu0f7qot7tbJhnw2fUDoUUJB40m-1MCX" - ) - return t.NewPackage("glib", version, t.newTagRemote( - "https://gitlab.gnome.org/GNOME/glib.git", - version, checksum, - ), &PackageAttr{ - Paths: []pkg.ExecPath{ - pkg.Path(fhs.AbsEtc.Append( - "machine-id", - ), false, pkg.NewFile( - "glib-machine-id", - []byte("ffffffffffffffffffffffffffffffff\n"), - )), - pkg.Path(AbsSystem.Append( - "var/lib/dbus/machine-id", - ), false, pkg.NewFile( - "glib-machine-id", - []byte("fefefefefefefefefefefefefefefefe\n"), - )), - }, - }, &MesonHelper{ - Setup: []KV{ - {"Ddefault_library", "both"}, - }, - }, - PythonPackaging, - Bash, - - PCRE2, - Libffi, - Zlib, - ), version -} -func init() { - native.mustRegister(Toolchain.newGLib, &Metadata{ - Name: "glib", - Description: "the GNU library of miscellaneous stuff", - Website: "https://developer.gnome.org/glib/", - - Dependencies: P{ - PCRE2, - Libffi, - Zlib, - }, - - ID: 10024, - }) -} diff --git a/internal/rosa/package/glib/package.az b/internal/rosa/package/glib/package.az new file mode 100644 index 00000000..583c7832 --- /dev/null +++ b/internal/rosa/package/glib/package.az @@ -0,0 +1,38 @@ +package glib { + description = "the GNU library of miscellaneous stuff"; + website = "https://developer.gnome.org/glib"; + anitya = 10024; + + version* = "2.88.1"; + source = remoteGit { + url = "https://gitlab.gnome.org/GNOME/glib.git"; + tag = version; + checksum = "Rkszn6W4RHjyspyqfXdVAVawdwDJCuS0Zu0f7qot7tbJhnw2fUDoUUJB40m-1MCX"; + }; + + files = [ + "/etc/machine-id:stub-machine-id-fhs", + "/system/var/lib/dbus/machine-id:stub-machine-id", + ]; + + exec = meson { + setup = { + "Ddefault_library": "both"; + }; + }; + + inputs = [ + python-packaging, + bash, + + pcre2, + libffi, + zlib, + ]; + + runtime = [ + pcre2, + libffi, + zlib, + ]; +} diff --git a/internal/rosa/package/glib/stub-machine-id b/internal/rosa/package/glib/stub-machine-id new file mode 100644 index 00000000..97534cf7 --- /dev/null +++ b/internal/rosa/package/glib/stub-machine-id @@ -0,0 +1 @@ +fefefefefefefefefefefefefefefefe diff --git a/internal/rosa/package/glib/stub-machine-id-fhs b/internal/rosa/package/glib/stub-machine-id-fhs new file mode 100644 index 00000000..ed07f5dc --- /dev/null +++ b/internal/rosa/package/glib/stub-machine-id-fhs @@ -0,0 +1 @@ +ffffffffffffffffffffffffffffffff diff --git a/internal/rosa/state.go b/internal/rosa/state.go index 3934fe38..ed1124fb 100644 --- a/internal/rosa/state.go +++ b/internal/rosa/state.go @@ -18,6 +18,7 @@ import ( "unique" "unsafe" + "hakurei.app/check" "hakurei.app/internal/pkg" "hakurei.app/internal/rosa/azalea" ) @@ -919,21 +920,25 @@ func (ctx *evalContext) pf( } for _, pair := range files { - base, pathname, ok := strings.Cut(pair, ":") + var pathname *check.Absolute + dst, src, ok := strings.Cut(pair, ":") if !ok { - pathname, base = base, filepath.Base(base) + src, dst = dst, filepath.Base(dst) + } + if pathname, err = check.NewAbs(dst); err != nil { + pathname = AbsUsrSrc.Append(dst) } var p []byte - p, err = fs.ReadFile(ctx.b, pathname) + p, err = fs.ReadFile(ctx.b, src) if err != nil { return } attr.Paths = append(attr.Paths, pkg.Path( - AbsUsrSrc.Append(base), + pathname, false, - pkg.NewFile(base, p), + pkg.NewFile(filepath.Base(dst), p), )) } diff --git a/internal/rosa/state_native.go b/internal/rosa/state_native.go index ef7b2b0a..ecec14ae 100644 --- a/internal/rosa/state_native.go +++ b/internal/rosa/state_native.go @@ -35,7 +35,6 @@ var ( HakureiDist = H("hakurei-dist") Hwdata = H("hwdata") Kmod = H("kmod") - LIT = H("lit") LibX11 = H("libX11") LibXau = H("libXau") LibXdmcp = H("libXdmcp") @@ -82,7 +81,6 @@ var ( Ncurses = H("ncurses") Nettle = H("nettle") OpenSSL = H("openssl") - PCRE2 = H("pcre2") Patch = H("patch") PerlTestCmd = H("perl-Test-Cmd") Pixman = H("pixman") @@ -97,7 +95,6 @@ var ( QEMU = H("qemu") Sed = H("sed") SPIRVLLVMTranslator = H("spirv-llvm-translator") - SPIRVTools = H("spirv-tools") SquashfsTools = H("squashfs-tools") Toybox = H("toybox") toyboxEarly = H("toybox-early") |