[gnome-build-meta/abderrahim/gtk-sassc] sdk/gtk.bst: depends on sassc
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/gtk-sassc] sdk/gtk.bst: depends on sassc
- Date: Tue, 4 Feb 2020 12:33:16 +0000 (UTC)
commit 911f2081871d7c20e5339f59c70fcbdcfdcb9932
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Tue Feb 4 13:25:45 2020 +0100
sdk/gtk.bst: depends on sassc
as sassc is not part of the sdk, I added a new sdk-deps/ directory that
contains elements that are not part of the sdk, but that sdk elements could
build-depend on (but not runtime-depend)
elements/core-deps.bst | 2 --
elements/core/gnome-shell.bst | 6 +++++-
elements/{core-deps => sdk-deps}/libsass.bst | 8 +++++---
elements/{core-deps => sdk-deps}/sassc.bst | 11 +++++++----
elements/sdk/gtk.bst | 6 ++++++
5 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 7d311836..7c419260 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -85,7 +85,6 @@ depends:
- core-deps/libpeas.bst
- core-deps/libqmi.bst
- core-deps/librest.bst
-- core-deps/libsass.bst
- core-deps/libsigcplusplus-2.0.bst
- core-deps/libsigcplusplus.bst
- core-deps/libusb.bst
@@ -119,7 +118,6 @@ depends:
- core-deps/rpcsvc-proto.bst
- core-deps/samba.bst
- core-deps/sane-backends.bst
-- core-deps/sassc.bst
- core-deps/speech-dispatcher.bst
- core-deps/spice-gtk.bst
- core-deps/spice-protocol.bst
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index 7a65d7eb..3985d01b 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -1,4 +1,5 @@
kind: meson
+
sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/gnome-shell.git
@@ -7,19 +8,22 @@ sources:
subprojects/gvc:
checkout: true
url: gitlab_gnome_org:GNOME/libgnome-volume-control.git
+
build-depends:
+- sdk-deps/sassc.bst
- freedesktop-sdk.bst:components/asciidoc.bst
- freedesktop-sdk.bst:components/docbook-xsl.bst
- freedesktop-sdk.bst:components/perl.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
runtime-depends:
- core-deps/libgnomekbd.bst
+
depends:
- core-deps/NetworkManager.bst
- core-deps/accountsservice.bst
- core-deps/evolution-data-server.bst
- core-deps/gnome-autoar.bst
-- core-deps/sassc.bst
- core-deps/startup-notification.bst
- core-deps/upower.bst
- core/gdm.bst
diff --git a/elements/core-deps/libsass.bst b/elements/sdk-deps/libsass.bst
similarity index 99%
rename from elements/core-deps/libsass.bst
rename to elements/sdk-deps/libsass.bst
index c06633d9..12a3b53d 100644
--- a/elements/core-deps/libsass.bst
+++ b/elements/sdk-deps/libsass.bst
@@ -1,9 +1,11 @@
kind: autotools
+sources:
+- kind: tar
+ url: https://github.com/sass/libsass/archive/3.5.0.tar.gz
+
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
depends:
- freedesktop-sdk.bst:bootstrap-import.bst
-sources:
-- kind: tar
- url: https://github.com/sass/libsass/archive/3.5.0.tar.gz
diff --git a/elements/core-deps/sassc.bst b/elements/sdk-deps/sassc.bst
similarity index 90%
rename from elements/core-deps/sassc.bst
rename to elements/sdk-deps/sassc.bst
index 65f43feb..5928a24f 100644
--- a/elements/core-deps/sassc.bst
+++ b/elements/sdk-deps/sassc.bst
@@ -1,9 +1,12 @@
kind: autotools
+
+sources:
+- kind: tar
+ url: https://github.com/sass/sassc/releases/download/3.4.8/sassc-3.4.8.tar.gz
+
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
depends:
-- core-deps/libsass.bst
+- sdk-deps/libsass.bst
- freedesktop-sdk.bst:bootstrap-import.bst
-sources:
-- kind: tar
- url: https://github.com/sass/sassc/releases/download/3.4.8/sassc-3.4.8.tar.gz
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index b89cdb45..d8dda073 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -1,11 +1,15 @@
kind: meson
+
sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/gtk.git
track: master
+
build-depends:
+- sdk-deps/sassc.bst
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
depends:
- sdk/at-spi2-atk.bst
- sdk/atk.bst
@@ -24,9 +28,11 @@ depends:
- freedesktop-sdk.bst:components/wayland-protocols.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:bootstrap-import.bst
+
variables:
meson-local: >-
-Denable-broadway-backend=true
+
public:
bst:
split-rules:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]