diff --git a/internal/rosa/x.go b/internal/rosa/x.go index b10aa31d..c19bae6b 100644 --- a/internal/rosa/x.go +++ b/internal/rosa/x.go @@ -127,6 +127,65 @@ func init() { } } +func (t Toolchain) newXCBProto() (pkg.Artifact, string) { + const ( + version = "1.17.0" + checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv" + ) + return t.NewPackage("xcb-proto", version, newTar( + "https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz", + checksum, + pkg.TarGzip, + ), nil, (*MakeHelper)(nil), + Python, + ), version +} +func init() { + artifactsM[XCBProto] = Metadata{ + f: Toolchain.newXCBProto, + + Name: "xcb-proto", + Description: "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions", + Website: "https://gitlab.freedesktop.org/xorg/proto/xcbproto", + + ID: 13646, + } +} + +func (t Toolchain) newXCB() (pkg.Artifact, string) { + const ( + version = "1.17.0" + checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd" + ) + return t.NewPackage("xcb", version, newTar( + "https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz", + checksum, + pkg.TarGzip, + ), nil, (*MakeHelper)(nil), + Python, + PkgConfig, + + XCBProto, + LibXau, + ), version +} +func init() { + artifactsM[XCB] = Metadata{ + f: Toolchain.newXCB, + + Name: "xcb", + Description: "The X protocol C-language Binding", + Website: "https://xcb.freedesktop.org/", + + Dependencies: P{ + XCBProto, + LibXau, + }, + + ID: 1767, + } +} + func (t Toolchain) newLibX11() (pkg.Artifact, string) { const ( version = "1.8.13" diff --git a/internal/rosa/xcb.go b/internal/rosa/xcb.go deleted file mode 100644 index 1d00a2a0..00000000 --- a/internal/rosa/xcb.go +++ /dev/null @@ -1,62 +0,0 @@ -package rosa - -import "hakurei.app/internal/pkg" - -func (t Toolchain) newXCBProto() (pkg.Artifact, string) { - const ( - version = "1.17.0" - checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv" - ) - return t.NewPackage("xcb-proto", version, newTar( - "https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz", - checksum, - pkg.TarGzip, - ), nil, (*MakeHelper)(nil), - Python, - ), version -} -func init() { - artifactsM[XCBProto] = Metadata{ - f: Toolchain.newXCBProto, - - Name: "xcb-proto", - Description: "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions", - Website: "https://gitlab.freedesktop.org/xorg/proto/xcbproto", - - ID: 13646, - } -} - -func (t Toolchain) newXCB() (pkg.Artifact, string) { - const ( - version = "1.17.0" - checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd" - ) - return t.NewPackage("xcb", version, newTar( - "https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz", - checksum, - pkg.TarGzip, - ), nil, (*MakeHelper)(nil), - Python, - PkgConfig, - - XCBProto, - LibXau, - ), version -} -func init() { - artifactsM[XCB] = Metadata{ - f: Toolchain.newXCB, - - Name: "xcb", - Description: "The X protocol C-language Binding", - Website: "https://xcb.freedesktop.org/", - - Dependencies: P{ - XCBProto, - LibXau, - }, - - ID: 1767, - } -}