internal/rosa/meson: migrate to helper interface

This change also removes some unused options.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 13 insertions, 17 deletions

diff --git a/internal/rosa/gtk.go b/internal/rosa/gtk.go
index 78469e8d..06449ca2 100644
--- a/internal/rosa/gtk.go
+++ b/internal/rosa/gtk.go
@@ -12,21 +12,13 @@ func (t Toolchain) newGLib() pkg.Artifact {
 		version  = "2.86.4"
 		checksum = "AfTjBrrxtXXPL6dFa1LfTe40PyPSth62CoIkM5m_VJTUngGLOFHw6I4XE7RGQE8G"
 	)
-	return t.NewViaMeson("glib", version, pkg.NewHTTPGet(
+	return t.NewPackage("glib", version, pkg.NewHTTPGet(
 		nil, "https://download.gnome.org/sources/glib/"+
 			strings.Join(strings.SplitN(version, ".", 3)[:2], ".")+
 			"/glib-"+version+".tar.xz",
 		mustDecode(checksum),
-	), &MesonAttr{
-		SourceSuffix: ".tar.xz",
-		ScriptEarly: `
-cd /usr/src/
-tar xf glib.tar.xz
-mv glib-` + version + ` glib
-`,
-		Configure: [][2]string{
-			{"Ddefault_library", "both"},
-		},
+	), &PackageAttr{
+		SourceKind: sourceTarXZ,
 
 		Paths: []pkg.ExecPath{
 			pkg.Path(fhs.AbsEtc.Append(
@@ -42,14 +34,18 @@ mv glib-` + version + ` glib
 				[]byte("fefefefefefefefefefefefefefefefe\n"),
 			)),
 		},
+	}, &MesonHelper{
+		Setup: [][2]string{
+			{"Ddefault_library", "both"},
+		},
 	},
-		t.Load(XZ),
-		t.Load(Packaging),
-		t.Load(Bash),
+		XZ,
+		Packaging,
+		Bash,
 
-		t.Load(PCRE2),
-		t.Load(Libffi),
-		t.Load(Zlib),
+		PCRE2,
+		Libffi,
+		Zlib,
 	)
 }
 func init() { artifactsF[GLib] = Toolchain.newGLib }