AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'revert-sassc-wrapdb' into 'main'

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

See merge request GNOME/gtk!6415
This commit is contained in:
Matthias Clasen 2023-09-20 22:46:33 +00:00
commit ef6d3af6b9
6 changed files with 130 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
build-aux/flatpak/org.gtk.Demo4.json
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"
}
]
}

54
build-aux/flatpak/org.gtk.IconBrowser4.json
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"
}
]
}

54
build-aux/flatpak/org.gtk.WidgetFactory4.json
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"
}
]
}

54
build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
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"
}
]
}

18
subprojects/libsass.wrap
View File

@ -1,13 +1,5 @@
[wrap-file]
directory = libsass-3.6.4
source_url = https://github.com/sass/libsass/archive/refs/tags/3.6.4.tar.gz
source_filename = libsass-3.6.4.tar.gz
source_hash = f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889
patch_filename = libsass_3.6.4-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/libsass_3.6.4-1/get_patch
patch_hash = c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz
wrapdb_version = 3.6.4-1
[provide]
libsass = libsass_dep
[wrap-git]
directory=libsass
url=https://github.com/lazka/libsass.git
revision=meson
depth=1

15
subprojects/sassc.wrap
View File

@ -1,13 +1,8 @@
[wrap-file]
directory = sassc-3.6.2
source_url = https://github.com/sass/sassc/archive/refs/tags/3.6.2.tar.gz
source_filename = sassc-3.6.2.tar.gz
source_hash = 608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03
patch_filename = sassc_3.6.2-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/sassc_3.6.2-1/get_patch
patch_hash = 3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz
wrapdb_version = 3.6.2-1
[wrap-git]
directory = sassc
url = https://github.com/lazka/sassc.git
revision = meson
depth = 1
[provide]
program_names = sassc