Attachment #455100 for bug #237681

View Details Raw Unified Return to Bug 237681

| Differences between



2022-03-18  Adrian Perez de Castro  <aperez@igalia.com>

        [Flatpak SDK] Include gi-docgen and its dependencies
        https://bugs.webkit.org/show_bug.cgi?id=237681

        Reviewed by NOBODY (OOPS!).

        Import a build element for gi-docgen, which reuses most of the dependencies from the
        Freedesktop SDK, except for the python-typogrify element, which is not available there
        and this also adds an element for.

        * elements/sdk-platform.bst:
        * elements/sdk/gi-docgen.bst: Added.
        * elements/sdk/python-typogrify.bst: Added.

2022-03-16  Philippe Normand  <pnormand@igalia.com>

        [Flatpak SDK] Update to GStreamer 1.20.1

Lines 19-24 depends: a/Tools/buildstream/elements/sdk-platform.bst_sec1
- a/Tools/buildstream/elements/sdk-platform.bst +1 lines
19	- sdk/eigen.bst	19	- sdk/eigen.bst
20	- sdk/enchant-2.bst	20	- sdk/enchant-2.bst
21	- sdk/ffmpeg.bst	21	- sdk/ffmpeg.bst
		22	- sdk/gi-docgen.bst
22	- sdk/glib-networking.bst	23	- sdk/glib-networking.bst
23	- sdk/glib.bst	24	- sdk/glib.bst
24	- sdk/graphviz.bst	25	- sdk/graphviz.bst



kind: meson

depends:
- freedesktop-sdk.bst:components/python3-markupsafe.bst
- freedesktop-sdk.bst:components/python3-jinja2.bst
- freedesktop-sdk.bst:components/python3-markdown.bst
- freedesktop-sdk.bst:components/python3-pygments.bst
- freedesktop-sdk.bst:components/python3-toml.bst
- sdk/python-typogrify.bst

build-depends:
- freedesktop-sdk.bst:components/python3-pip.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst

sources:
- kind: tar
  url: gnome_downloads:gi-docgen/2022/gi-docgen-2022.1.tar.xz
  ref: fefe3153979595ddad2dc81d5efa7e54c8ca3770f91a5a75710c8fd6fad4575f

variables:
  meson-local: >-
    -Ddevelopment_tests=false

public:
  bst:
    integration-commands:
    - |
      gi-docgen --version



kind: pip

depends:
- freedesktop-sdk.bst:components/python3.bst

build-depends:
- freedesktop-sdk.bst:components/python3-pip.bst

sources:
- kind: tar
  url: pypi:8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz
  ref: 8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38

public:
  bst:
    integration-commands:
    - |
      python3 -c "import typogrify"

Return to Bug 237681

Lines 1-3 a/Tools/buildstream/ChangeLog_sec1
- a/Tools/buildstream/ChangeLog +15 lines
		1	2022-03-18 Adrian Perez de Castro <aperez@igalia.com>
		2
		3	[Flatpak SDK] Include gi-docgen and its dependencies
		4	https://bugs.webkit.org/show_bug.cgi?id=237681
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Import a build element for gi-docgen, which reuses most of the dependencies from the
		9	Freedesktop SDK, except for the python-typogrify element, which is not available there
		10	and this also adds an element for.
		11
		12	* elements/sdk-platform.bst:
		13	* elements/sdk/gi-docgen.bst: Added.
		14	* elements/sdk/python-typogrify.bst: Added.
		15
1	2022-03-16 Philippe Normand <pnormand@igalia.com>	16	2022-03-16 Philippe Normand <pnormand@igalia.com>
2		17
3	[Flatpak SDK] Update to GStreamer 1.20.1	18	[Flatpak SDK] Update to GStreamer 1.20.1

Line 0 a/Tools/buildstream/elements/sdk/gi-docgen.bst_sec1
- a/Tools/buildstream/elements/sdk/gi-docgen.bst +28 lines
	1	kind: meson
	2
	3	depends:
	4	- freedesktop-sdk.bst:components/python3-markupsafe.bst
	5	- freedesktop-sdk.bst:components/python3-jinja2.bst
	6	- freedesktop-sdk.bst:components/python3-markdown.bst
	7	- freedesktop-sdk.bst:components/python3-pygments.bst
	8	- freedesktop-sdk.bst:components/python3-toml.bst
	9	- sdk/python-typogrify.bst
	10
	11	build-depends:
	12	- freedesktop-sdk.bst:components/python3-pip.bst
	13	- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
	14
	15	sources:
	16	- kind: tar
	17	url: gnome_downloads:gi-docgen/2022/gi-docgen-2022.1.tar.xz
	18	ref: fefe3153979595ddad2dc81d5efa7e54c8ca3770f91a5a75710c8fd6fad4575f
	19
	20	variables:
	21	meson-local: >-
	22	-Ddevelopment_tests=false
	23
	24	public:
	25	bst:
	26	integration-commands:
	27	- \|
	28	gi-docgen --version

Line 0 a/Tools/buildstream/elements/sdk/python-typogrify.bst_sec1
- a/Tools/buildstream/elements/sdk/python-typogrify.bst +18 lines
	1	kind: pip
	2
	3	depends:
	4	- freedesktop-sdk.bst:components/python3.bst
	5
	6	build-depends:
	7	- freedesktop-sdk.bst:components/python3-pip.bst
	8
	9	sources:
	10	- kind: tar
	11	url: pypi:8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz
	12	ref: 8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38
	13
	14	public:
	15	bst:
	16	integration-commands:
	17	- \|
	18	python3 -c "import typogrify"