Revert "build-aux/flatpak: use sassc from wrapdb"

This reverts commit cac0cb7f02.

This doesn't work since CI currently mixes flatpak-builder and the host git repo
and doesn't download the gtk sources, so all subprojects are missing.
This commit is contained in:
Christoph Reiter 2023-09-19 21:27:20 +02:00
parent ef82e0ce4e
commit 7135f80094
4 changed files with 120 additions and 96 deletions

View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name": "boost",
"buildsystem": "simple",
@ -164,30 +194,6 @@
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gtk.git",
"branch" : "main"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz",
"sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip",
"sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz",
"sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip",
"sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c",
"dest": "subprojects/packagecache"
}
]
}

View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name" : "pango",
"buildsystem" : "meson",
@ -93,30 +123,6 @@
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gtk.git",
"branch" : "main"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz",
"sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip",
"sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz",
"sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip",
"sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c",
"dest": "subprojects/packagecache"
}
]
}

View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name" : "pango",
"buildsystem" : "meson",
@ -93,30 +123,6 @@
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gtk.git",
"branch" : "main"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz",
"sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip",
"sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz",
"sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip",
"sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c",
"dest": "subprojects/packagecache"
}
]
}

View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name" : "pango",
"buildsystem" : "meson",
@ -93,30 +123,6 @@
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gtk.git",
"branch" : "main"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz",
"sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip",
"sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz",
"sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03",
"dest": "subprojects/packagecache"
},
{
"type" : "file",
"url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip",
"sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c",
"dest": "subprojects/packagecache"
}
]
}