[gnome-build-meta/abderrahim/fdsdk-20.08.1-38: 1/4] Exchange git.bst for git-minimal.bst in build-depends




commit 16b6bf324f45bad9e186d12be9447d9ebc572434
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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index 30c584b8d..c48a5e884 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -15,7 +15,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 0e0d02c83..6492910c3 100644
--- a/elements/core-deps/libostree.bst
+++ b/elements/core-deps/libostree.bst
@@ -10,7 +10,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 3c0c3c768..2d32eaae1 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -5,7 +5,7 @@ sources:
   ref: 71f0a9cd70afd4dd1412a0298331dbb8ac71c0377f52117afc15eb88dc6fb910
 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 a390871ea..9d6e14dde 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 9cbaca643..ed2217336 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]