Attachment 455100 Details for Bug 237681 – Patch

[patch] Patch

bug-237681-20220318183002.patch (text/plain), 3.17 KB, created by Adrian Perez on 2022-03-18 09:30:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2022-03-18 09:30:04 PDT

Size: 3.17 KB

patch

obsolete

>Subversion Revision: 291482
>diff --git a/Tools/buildstream/ChangeLog b/Tools/buildstream/ChangeLog
>index 8af81c050ca7f867b880ec65a0c3c2f7a958f649..d886828fb1a412c9242a70f0b851f2d79c1ef1ea 100644
>--- a/Tools/buildstream/ChangeLog
>+++ b/Tools/buildstream/ChangeLog
>@@ -1,3 +1,18 @@
>+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
>diff --git a/Tools/buildstream/elements/sdk-platform.bst b/Tools/buildstream/elements/sdk-platform.bst
>index bf759a824e8472a94547158ff18dc48a0d5b7eff..7e2092195997b55b73ea7f6a392f39f1d9529d82 100644
>--- a/Tools/buildstream/elements/sdk-platform.bst
>+++ b/Tools/buildstream/elements/sdk-platform.bst
>@@ -19,6 +19,7 @@ depends:
> - sdk/eigen.bst
> - sdk/enchant-2.bst
> - sdk/ffmpeg.bst
>+- sdk/gi-docgen.bst
> - sdk/glib-networking.bst
> - sdk/glib.bst
> - sdk/graphviz.bst
>diff --git a/Tools/buildstream/elements/sdk/gi-docgen.bst b/Tools/buildstream/elements/sdk/gi-docgen.bst
>new file mode 100644
>index 0000000000000000000000000000000000000000..bd9f284450b4b11a0d1c3c43b8c1776a46c30616
>--- /dev/null
>+++ b/Tools/buildstream/elements/sdk/gi-docgen.bst
>@@ -0,0 +1,28 @@
>+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
>diff --git a/Tools/buildstream/elements/sdk/python-typogrify.bst b/Tools/buildstream/elements/sdk/python-typogrify.bst
>new file mode 100644
>index 0000000000000000000000000000000000000000..a4fe515656a3866dd00a268f8169fecec804bc6a
>--- /dev/null
>+++ b/Tools/buildstream/elements/sdk/python-typogrify.bst
>@@ -0,0 +1,18 @@
>+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"

Actions: View | Formatted Diff | Diff

Attachments on bug 237681: 455100 | 455181