[gnome-build-meta/abderrahim/gtk-cantarell-dep: 8/8] sdk/gtk+-3.bst: depend on cantarell-fonts
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/gtk-cantarell-dep: 8/8] sdk/gtk+-3.bst: depend on cantarell-fonts
- Date: Wed, 29 Apr 2020 10:20:01 +0000 (UTC)
commit ef26159678181a926a99d342fe4595e304cdd8e7
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Wed Apr 29 10:44:11 2020 +0100
sdk/gtk+-3.bst: depend on cantarell-fonts
gtk would crash if there is no font
Fixes #266
elements/core/gnome-builder.bst | 1 -
elements/core/gnome-tour.bst | 1 -
elements/core/sysprof.bst | 1 -
elements/sdk/gtk+-3.bst | 8 ++++++++
elements/world/glade.bst | 1 -
elements/world/gnome-internet-radio-locator.bst | 1 -
elements/world/gnome-themes-extra.bst | 1 -
elements/world/seahorse.bst | 1 -
8 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index c3e2b141..e6b8dae8 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -7,7 +7,6 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
runtime-depends:
- sdk/adwaita-icon-theme.bst
-- sdk/cantarell-fonts.bst
- sdk/gjs.bst
- sdk/pygobject.bst
- sdk/vala.bst
diff --git a/elements/core/gnome-tour.bst b/elements/core/gnome-tour.bst
index 4ead8980..9c99cc69 100644
--- a/elements/core/gnome-tour.bst
+++ b/elements/core/gnome-tour.bst
@@ -9,7 +9,6 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/adwaita-icon-theme.bst
-- sdk/cantarell-fonts.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:bootstrap-import.bst
environment:
diff --git a/elements/core/sysprof.bst b/elements/core/sysprof.bst
index d3bf9822..6fdf07ae 100644
--- a/elements/core/sysprof.bst
+++ b/elements/core/sysprof.bst
@@ -8,7 +8,6 @@ build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
runtime-depends:
- sdk/adwaita-icon-theme.bst
-- sdk/cantarell-fonts.bst
depends:
- core-deps/polkit.bst
- core-deps/libdazzle.bst
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index a6a4af6c..6b6a35dd 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -1,11 +1,17 @@
kind: meson
+
sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/gtk.git
track: gtk-3-24
+
build-depends:
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+runtime-depends:
+- sdk/cantarell-fonts.bst
+
depends:
- sdk/at-spi2-atk.bst
- sdk/atk.bst
@@ -26,6 +32,7 @@ depends:
- freedesktop-sdk.bst:components/xorg-lib-xi.bst
- freedesktop-sdk.bst:components/xorg-lib-xinerama.bst
- freedesktop-sdk.bst:bootstrap-import.bst
+
variables:
meson-local: >-
-Dbroadway_backend=true
@@ -36,6 +43,7 @@ variables:
-Dgtk_doc=true
-Dman=true
-Dintrospection=true
+
public:
bst:
integration-commands:
diff --git a/elements/world/glade.bst b/elements/world/glade.bst
index 98044983..3440e06e 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -4,7 +4,6 @@ build-depends:
runtime-depends:
- core-deps/glade-libs.bst
- sdk/adwaita-icon-theme.bst
-- sdk/cantarell-fonts.bst
config:
exclude:
- glade-libs
diff --git a/elements/world/gnome-internet-radio-locator.bst b/elements/world/gnome-internet-radio-locator.bst
index d134d488..a6868464 100644
--- a/elements/world/gnome-internet-radio-locator.bst
+++ b/elements/world/gnome-internet-radio-locator.bst
@@ -9,7 +9,6 @@ depends:
- core-deps/geocode-glib.bst
- core-deps/libchamplain.bst
- core/gnome-maps.bst
-- sdk/cantarell-fonts.bst
- sdk/clutter-gtk.bst
- sdk/clutter.bst
- sdk/glib.bst
diff --git a/elements/world/gnome-themes-extra.bst b/elements/world/gnome-themes-extra.bst
index 9a1804f6..0346cdbf 100644
--- a/elements/world/gnome-themes-extra.bst
+++ b/elements/world/gnome-themes-extra.bst
@@ -7,7 +7,6 @@ build-depends:
- core-deps/intltool.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
-- sdk/cantarell-fonts.bst
- sdk/gtk+-3.bst
- sdk/librsvg.bst
- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index a665f732..a058e1f1 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -9,7 +9,6 @@ sources:
url: purism:Librem5/libhandy.git
runtime-depends:
- sdk/adwaita-icon-theme.bst
-- sdk/cantarell-fonts.bst
depends:
- core-deps/avahi.bst
- core-deps/libhandy.bst
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]