Title: [292103] trunk/Tools/buildstream
- Revision
- 292103
- Author
- [email protected]
- Date
- 2022-03-30 05:04:30 -0700 (Wed, 30 Mar 2022)
Log Message
[Flatpak SDK] Bump to Meson 0.62.
https://bugs.webkit.org/show_bug.cgi?id=238454
Patch by Philippe Normand <[email protected]> on 2022-03-30
Reviewed by Adrian Perez de Castro.
Needed for meson devenv --dump support in local dependencies builds.
* elements/freedesktop-sdk.bst:
* patches/fdo-0001-gobject-introspection-Bump-to-1.72.patch: Added.
* patches/fdo-0001-meson-Bump-to-0.60.3.patch: Removed.
* patches/fdo-0002-meson-Bump-to-1.62.patch: Added.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (292102 => 292103)
--- trunk/Tools/buildstream/ChangeLog 2022-03-30 09:48:05 UTC (rev 292102)
+++ trunk/Tools/buildstream/ChangeLog 2022-03-30 12:04:30 UTC (rev 292103)
@@ -1,3 +1,17 @@
+2022-03-30 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Bump to Meson 0.62.
+ https://bugs.webkit.org/show_bug.cgi?id=238454
+
+ Reviewed by Adrian Perez de Castro.
+
+ Needed for meson devenv --dump support in local dependencies builds.
+
+ * elements/freedesktop-sdk.bst:
+ * patches/fdo-0001-gobject-introspection-Bump-to-1.72.patch: Added.
+ * patches/fdo-0001-meson-Bump-to-0.60.3.patch: Removed.
+ * patches/fdo-0002-meson-Bump-to-1.62.patch: Added.
+
2022-03-20 Philippe Normand <[email protected]>
[Flatpak SDK] Bump to meson 0.60
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (292102 => 292103)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-03-30 09:48:05 UTC (rev 292102)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-03-30 12:04:30 UTC (rev 292103)
@@ -9,13 +9,15 @@
- kind: patch
path: patches/fdo-0001-pango-Bump-to-1.50.4.patch
- kind: patch
- path: patches/fdo-0001-meson-Bump-to-0.60.3.patch
-- kind: patch
path: patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch
- kind: patch
path: patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch
- kind: patch
path: patches/fdo-0001-gst-plugins-bad-Remove-invalid-meson-option.patch
+- kind: patch
+ path: patches/fdo-0001-gobject-introspection-Bump-to-1.72.patch
+- kind: patch
+ path: patches/fdo-0002-meson-Bump-to-1.62.patch
config:
options:
target_arch: '%{arch}'
Added: trunk/Tools/buildstream/patches/fdo-0001-gobject-introspection-Bump-to-1.72.patch (0 => 292103)
--- trunk/Tools/buildstream/patches/fdo-0001-gobject-introspection-Bump-to-1.72.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0001-gobject-introspection-Bump-to-1.72.patch 2022-03-30 12:04:30 UTC (rev 292103)
@@ -0,0 +1,27 @@
+From 0401909696262f21716f5a257f5ab5753d18088f Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Tue, 29 Mar 2022 15:24:31 +0000
+Subject: [PATCH 1/2] gobject-introspection: Bump to 1.72
+
+Which ships build fixes for Meson 0.62.
+---
+ elements/components/gobject-introspection.bst | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/elements/components/gobject-introspection.bst b/elements/components/gobject-introspection.bst
+index 5b7d66932..25485bc79 100644
+--- a/elements/components/gobject-introspection.bst
++++ b/elements/components/gobject-introspection.bst
+@@ -37,7 +37,5 @@ public:
+ sources:
+ - kind: git_tag
+ url: gnome:gobject-introspection.git
+- track: master
+- track-extra:
+- - gnome-3-38
+- ref: 1.70.0-0-g4502dd33da995e5e9e6d73aa996cf42e92c9e217
++ track: 1.72.0
++ ref: 1.72.0-0-gc1ce7d179cfce327162bd206cdf2808bd9bd0cc7
+--
+2.32.0
+
Deleted: trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.60.3.patch (292102 => 292103)
--- trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.60.3.patch 2022-03-30 09:48:05 UTC (rev 292102)
+++ trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.60.3.patch 2022-03-30 12:04:30 UTC (rev 292103)
@@ -1,36 +0,0 @@
-From 0cfdf05a0e1489907e0e45a9f68cd63a9ab03e6d Mon Sep 17 00:00:00 2001
-From: Philippe Normand <[email protected]>
-Date: Sat, 19 Mar 2022 16:42:03 +0000
-Subject: [PATCH] meson: Bump to 0.60.3
-
-Needed for GStreamer development builds.
----
- elements/components/meson.bst | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/elements/components/meson.bst b/elements/components/meson.bst
-index 4c4e1ba5b..17654df2c 100644
---- a/elements/components/meson.bst
-+++ b/elements/components/meson.bst
-@@ -1,5 +1,4 @@
- kind: pip
--
- depends:
- - bootstrap-import.bst
- - components/python3.bst
-@@ -12,9 +11,9 @@ build-depends:
- sources:
- - kind: pypi
- name: meson
-- url: pypi:57/90/1f5768627ef72e95483b2a899f5efc6efa6c999966b2a1a5ba2d1de6db9c/meson-0.59.4.tar.gz
-- sha256sum: a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
-+ url: pypi:48/fb/09b5098772ce484b203be026d8047c596a28107e1ecc0df1412058d9f715/meson-0.60.3.tar.gz
-+ sha256sum: 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
- include:
-- - 0\.59\..*
-+ - 0\.60\..*
- - kind: patch
- path: patches/meson/meson-no-lib64.patch
---
-2.35.1
-
Added: trunk/Tools/buildstream/patches/fdo-0002-meson-Bump-to-1.62.patch (0 => 292103)
--- trunk/Tools/buildstream/patches/fdo-0002-meson-Bump-to-1.62.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0002-meson-Bump-to-1.62.patch 2022-03-30 12:04:30 UTC (rev 292103)
@@ -0,0 +1,29 @@
+From f5ebab17f32c4f6ca4b479717fde72d03d8c1171 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Tue, 29 Mar 2022 15:25:17 +0000
+Subject: [PATCH 2/2] meson: Bump to 1.62
+
+---
+ elements/components/meson.bst | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/elements/components/meson.bst b/elements/components/meson.bst
+index 4c4e1ba5b..9bb2f410f 100644
+--- a/elements/components/meson.bst
++++ b/elements/components/meson.bst
+@@ -12,9 +12,9 @@ build-depends:
+ sources:
+ - kind: pypi
+ name: meson
+- url: pypi:57/90/1f5768627ef72e95483b2a899f5efc6efa6c999966b2a1a5ba2d1de6db9c/meson-0.59.4.tar.gz
+- sha256sum: a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
++ url: pypi:05/e8/91874090608d3cf1fb7c313219282f94cda28937150b3e7317009a462df8/meson-0.62.0.tar.gz
++ sha256sum: 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
+ include:
+- - 0\.59\..*
++ - 0\.62\..*
+ - kind: patch
+ path: patches/meson/meson-no-lib64.patch
+--
+2.32.0
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
