[gnome-build-meta/christopherdavis/git-minimal-fixups] Exchange git.bst for git-minimal.bst in build-depends
- From: Christopher Davis <christopherdavis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/christopherdavis/git-minimal-fixups] Exchange git.bst for git-minimal.bst in build-depends
- Date: Mon, 28 Sep 2020 20:29:04 +0000 (UTC)
commit 76e31b3b0dc5e734a93465705bc2f36e04570d1c
Author: Christopher Davis <brainblasted disroot org>
Date: Mon Sep 28 13:27:25 2020 -0700
Exchange git.bst for git-minimal.bst in build-depends
When building on top of freedesktop-sdk master,
builds fail due to an overlap issue between git
and git-minimal. This is resolved by using
git-minimal as a build-depend instead of git.
elements/core-deps/flatpak.bst | 2 +-
elements/core-deps/libostree.bst | 2 +-
elements/core-deps/phodav.bst | 2 +-
elements/core/gnome-builder.bst | 2 +-
elements/sdk/gcab.bst | 2 +-
elements/vm/toolbox.bst | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index bb8f0490..7108f65b 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -14,7 +14,7 @@ build-depends:
- core-deps/python-pyparsing.bst
- sdk/gobject-introspection.bst
- freedesktop-sdk.bst:components/bison.bst
-- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:components/git-minimal.bst
- freedesktop-sdk.bst:components/libxslt.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libostree.bst b/elements/core-deps/libostree.bst
index 39c7ac17..16ad94b4 100644
--- a/elements/core-deps/libostree.bst
+++ b/elements/core-deps/libostree.bst
@@ -9,7 +9,7 @@ sources:
build-depends:
- sdk/gobject-introspection.bst
- freedesktop-sdk.bst:components/bison.bst
-- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:components/git-minimal.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index 26c42eb8..5a883966 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -5,7 +5,7 @@ sources:
track: master
build-depends:
- sdk/gtk-doc.bst
-- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:components/git-minimal.bst
- freedesktop-sdk.bst:components/perl-xml-parser.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index 0ff3b2ed..fae273e1 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -6,12 +6,12 @@ sources:
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
runtime-depends:
+- core-deps/flatpak-builder.bst
- sdk/adwaita-icon-theme.bst
- sdk/gjs.bst
- sdk/pygobject.bst
- sdk/vala.bst
depends:
-- core-deps/flatpak-builder.bst
- core-deps/flatpak.bst
- core-deps/gspell.bst
- core-deps/jsonrpc-glib.bst
diff --git a/elements/sdk/gcab.bst b/elements/sdk/gcab.bst
index b8ae6cf5..d3c556af 100644
--- a/elements/sdk/gcab.bst
+++ b/elements/sdk/gcab.bst
@@ -6,7 +6,7 @@ sources:
build-depends:
- sdk/gtk-doc.bst
- sdk/vala.bst
-- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:components/git-minimal.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/glib.bst
diff --git a/elements/vm/toolbox.bst b/elements/vm/toolbox.bst
index 69b3304d..0d3d3708 100644
--- a/elements/vm/toolbox.bst
+++ b/elements/vm/toolbox.bst
@@ -86,7 +86,7 @@ build-depends:
- freedesktop-sdk.bst:components/go.bst
- freedesktop-sdk.bst:components/go-md2man.bst
- freedesktop-sdk.bst:components/strace.bst
-- freedesktop-sdk.bst:components/git.bst
+- freedesktop-sdk.bst:components/git-minimal.bst
depends:
- freedesktop-sdk.bst:components/podman.bst
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]