Commit 081612ea authored by Abderrahim Kitouni's avatar Abderrahim Kitouni

use the new dependencies and junctions syntax from buildstream 1.4

parent d15324f3
Pipeline #118550 failed with stages
in 211 minutes and 37 seconds
......@@ -3,18 +3,15 @@ sources:
# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/85
- kind: tar
url: https://www.freedesktop.org/software/ModemManager/ModemManager-1.10.0.tar.xz
build-depends:
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/libgudev.bst
- core-deps/libmbim.bst
- core-deps/libqmi.bst
- sdk/glib.bst
- filename: sdk/gtk-doc.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--with-udev-base-dir=/usr/lib/udev
......
......@@ -3,33 +3,24 @@ sources:
- kind: git_tag
url: git_freedesktop_org:NetworkManager/NetworkManager.git
track: master
build-depends:
- core-deps/intltool.bst
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:components/perl-xml-parser.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- filename: core-deps/intltool.bst
type: build
- core-deps/iptables.bst
- core-deps/libgudev.bst
- core-deps/libndp.bst
- core-deps/ppp.bst
- sdk/glib.bst
- sdk/gobject-introspection.bst
- filename: sdk/gtk-doc.bst
type: build
- sdk/pygobject.bst
- sdk/vala.bst
- filename: components/curl.bst
junction: freedesktop-sdk.bst
- filename: components/gnutls.bst
junction: freedesktop-sdk.bst
- filename: components/nss.bst
junction: freedesktop-sdk.bst
- filename: components/perl-xml-parser.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/curl.bst
- freedesktop-sdk.bst:components/gnutls.bst
- freedesktop-sdk.bst:components/nss.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
PYTHON=python3
......
......@@ -3,26 +3,19 @@ sources:
- kind: git_tag
url: github_com:hughsie/PackageKit.git
track: master
build-depends:
- core-deps/intltool.bst
- sdk/gobject-introspection.bst
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:components/perl-xml-parser.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/NetworkManager.bst
- filename: core-deps/intltool.bst
type: build
- core-deps/libgudev.bst
- core-deps/polkit.bst
- sdk/glib.bst
- filename: sdk/gobject-introspection.bst
type: build
- sdk/gtk+-3.bst
- filename: sdk/gtk-doc.bst
type: build
- filename: components/perl-xml-parser.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--disable-vala
......
......@@ -3,16 +3,12 @@ sources:
- kind: git_tag
url: git_freedesktop_org:accountsservice/accountsservice.git
track: master
build-depends:
- sdk/vala.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- core-deps/polkit.bst
- sdk/glib.bst
- sdk/gobject-introspection.bst
- filename: sdk/vala.bst
type: build
- filename: components/dbus.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/dbus.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -3,17 +3,13 @@ sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/atkmm.git
track: atkmm-2-28
build-depends:
- freedesktop-sdk.bst:components/perl-xml-parser.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/glibmm-2.4.bst
- sdk/atk.bst
- filename: components/perl-xml-parser.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--enable-maintainer-mode
......@@ -3,17 +3,13 @@ sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/atkmm.git
track: master
build-depends:
- freedesktop-sdk.bst:components/perl-xml-parser.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/glibmm.bst
- sdk/atk.bst
- filename: components/perl-xml-parser.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--enable-maintainer-mode
......@@ -2,16 +2,13 @@ kind: autotools
sources:
- kind: tar
url: github_com:lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz
build-depends:
- core-deps/intltool.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- filename: core-deps/intltool.bst
type: build
- core-deps/libdaemon.bst
- sdk/gtk+-3.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--with-distro=none
......
......@@ -3,16 +3,10 @@ sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/babl.git
track: master
build-depends:
- sdk/gobject-introspection.bst
- freedesktop-sdk.bst:components/git-minimal.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- filename: sdk/gobject-introspection.bst
type: build
- filename: components/git-minimal.bst
junction: freedesktop-sdk.bst
type: build
- filename: components/lcms.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/lcms.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -2,12 +2,10 @@ kind: autotools
sources:
- kind: tar
url: http://http.debian.net/debian/pool/main/d/db5.3/db5.3_5.3.28.orig.tar.xz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: dist/
conf-cmd: ./dist/configure
......@@ -2,6 +2,8 @@ kind: autotools
sources:
- kind: tar
url: github_com:storaged-project/libblockdev/releases/download/2.21-1/libblockdev-2.21.tar.gz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/cryptsetup.bst
- core-deps/dmraid.bst
......@@ -11,12 +13,6 @@ depends:
- core-deps/ndctl.bst
- core-deps/parted.bst
- core-deps/volume-key.bst
- filename: vm/linux-vm-boot/kmod.bst
junction: freedesktop-sdk.bst
- filename: components/systemd.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/systemd.bst
- freedesktop-sdk.bst:vm/linux-vm-boot/kmod.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -3,15 +3,14 @@ sources:
- kind: tar
url: https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2
depends:
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
config:
configure-commands:
- ./bootstrap.sh --includedir=%{install-root}%{includedir} --libdir=%{install-root}%{libdir}
- ./bootstrap.sh --includedir=%{install-root}%{includedir} --libdir=%{install-root}%{libdir}
build-commands:
- ./b2 -q -j${JOBS} --build-dir=_build link=shared stage
- ./b2 -q -j${JOBS} --build-dir=_build link=shared stage
install-commands:
- ./b2 -q --build-dir=_build link=shared install
- ./b2 -q --build-dir=_build link=shared install
environment:
JOBS: '%{max-jobs}'
environment-nocache:
......
......@@ -2,14 +2,11 @@ kind: autotools
sources:
- kind: tar
url: cairo_org:releases/cairomm-1.13.1.tar.gz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/libsigcplusplus-2.0.bst
- filename: components/cairo.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/cairo.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build
......@@ -3,15 +3,12 @@ sources:
- kind: git_tag
url: git_freedesktop_org:cairo/cairomm.git
track: master
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/libsigcplusplus.bst
- filename: components/cairo.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/cairo.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--disable-documentation
......@@ -3,21 +3,16 @@ sources:
- kind: git_tag
url: github_com:hughsie/colord-gtk.git
track: master
build-depends:
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:components/perl-xml-parser.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- core-deps/colord.bst
- sdk/glib.bst
- sdk/gtk+-3.bst
- filename: sdk/gtk-doc.bst
type: build
- sdk/vala.bst
- filename: components/perl-xml-parser.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
meson-local: >-
-Dman=false
......
......@@ -3,24 +3,18 @@ sources:
- kind: git_tag
url: github_com:hughsie/colord.git
track: master
build-depends:
- sdk/gobject-introspection.bst
- sdk/gtk-doc.bst
- sdk/vala.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- core-deps/libgudev.bst
- core-deps/libgusb.bst
- core-deps/polkit.bst
- sdk/glib.bst
- filename: sdk/gobject-introspection.bst
type: build
- filename: sdk/gtk-doc.bst
type: build
- filename: sdk/vala.bst
type: build
- filename: components/lcms.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/lcms.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
meson-local: >-
-Dargyllcms_sensor=false
......
......@@ -3,15 +3,11 @@ sources:
- kind: tar
# volume_key doesn't work with 2.x
url: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/json-c.bst
- core-deps/lvm2.bst
- filename: components/libgcrypt.bst
junction: freedesktop-sdk.bst
- filename: components/util-linux.bst
junction: freedesktop-sdk.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:components/libgcrypt.bst
- freedesktop-sdk.bst:components/util-linux.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -3,13 +3,11 @@ sources:
- kind: tar
url: tarballs_needing_help:dmraid-1.0.0.rc16-3.tar.bz2
base-dir: dmraid/1.0.0.rc16-3/dmraid
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/lvm2.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
make: make -j1
conf-aux: autoconf
......@@ -2,9 +2,7 @@ kind: autotools
sources:
- kind: tar
url: github_com:williamh/dotconf/archive/v1.3.tar.gz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -4,8 +4,7 @@ sources:
url: downloads.sourceforge.net:espeak/espeak/espeak-1.48/espeak-1.48.04-source.zip
depends:
- core-deps/portaudio.bst
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
config:
configure-commands:
- cp -f src/portaudio19.h src/portaudio.h
......
......@@ -3,10 +3,12 @@ sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/evolution-data-server.git
track: master
build-depends:
- core-deps/intltool.bst
- freedesktop-sdk.bst:components/gperf.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
depends:
- core-deps/gnome-online-accounts.bst
- filename: core-deps/intltool.bst
type: build
- core-deps/libgdata.bst
- core-deps/libgweather.bst
- core-deps/libical.bst
......@@ -18,14 +20,7 @@ depends:
- sdk/libsecret.bst
- sdk/libsoup.bst
- sdk/vala.bst
- filename: components/gperf.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-cmake.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
cmake-local: >-
-DENABLE_INTROSPECTION=ON
......
......@@ -2,13 +2,9 @@ kind: autotools
sources:
- kind: tar
url: https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.bz2
build-depends:
- freedesktop-sdk.bst:components/expat.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/boost.bst
- filename: components/expat.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -2,9 +2,7 @@ kind: cmake
sources:
- kind: tar
url: github_com:Exiv2/exiv2/archive/v0.26.tar.gz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
depends:
- filename: public-stacks/buildsystem-cmake.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -3,16 +3,14 @@ sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/folks.git
track: master
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- core-deps/evolution-data-server.bst
- sdk/gobject-introspection.bst
- sdk/libgee.bst
- sdk/vala.bst
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
meson-local: >-
-Deds_backend=true
......
......@@ -2,12 +2,8 @@ kind: autotools
sources:
- kind: tar
url: https://www.x.org/releases/individual/font/font-util-1.3.1.tar.bz2
build-depends:
- freedesktop-sdk.bst:components/xorg-proto-xorgproto.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- filename: components/xorg-proto-xorgproto.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -2,12 +2,8 @@ kind: autotools
sources:
- kind: tar
url: https://www.x.org/releases/individual/lib/libfontenc-1.1.3.tar.bz2
build-depends:
- freedesktop-sdk.bst:components/xorg-proto-xorgproto.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- filename: components/xorg-proto-xorgproto.bst
junction: freedesktop-sdk.bst
type: build
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -2,6 +2,8 @@ kind: autotools
sources:
- kind: tar
url: https://ftp.gimp.org/pub/gegl/0.4/gegl-0.4.16.tar.bz2
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- core-deps/babl.bst
- sdk/gdk-pixbuf.bst
......@@ -9,11 +11,7 @@ depends:
- sdk/json-glib.bst
- sdk/librsvg.bst
- sdk/pango.bst
- filename: public-stacks/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-local: >-
--without-graphviz
......
......@@ -3,15 +3,12 @@ sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/geocode-glib.git
track: master
build-depends:
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/glib.bst
- sdk/gobject-introspection.bst
- filename: sdk/gtk-doc.bst
type: build
- sdk/json-glib.bst
- sdk/libsoup.bst
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- freedesktop-sdk.bst:bootstrap-import.bst
......@@ -2,13 +2,11 @@ kind: meson
sources:
- kind: tar
url: gnome_downloads:gexiv2/0.12/gexiv2-0.12.0.tar.xz
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/glib.bst
- core-deps/exiv2.bst
- filename: public-stacks/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
- sdk/glib.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
conf-aux: build-aux
......@@ -3,17 +3,13 @@ sources:
- kind: git_tag