Title: [290242] trunk/Tools/buildstream
- Revision
- 290242
- Author
- [email protected]
- Date
- 2022-02-21 07:13:17 -0800 (Mon, 21 Feb 2022)
Log Message
[Flatpak SDK] Update pango and gtk4
https://bugs.webkit.org/show_bug.cgi?id=236939
Patch by Philippe Normand <[email protected]> on 2022-02-21
Reviewed by Adrian Perez de Castro.
Update to GTK 4.6.2, which requires Pango 1.50.x, so also update Pango.
* elements/freedesktop-sdk.bst:
* elements/sdk/gtk.bst:
* patches/fdo-0001-pango-Bump-to-1.50.4.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (290241 => 290242)
--- trunk/Tools/buildstream/ChangeLog 2022-02-21 14:31:27 UTC (rev 290241)
+++ trunk/Tools/buildstream/ChangeLog 2022-02-21 15:13:17 UTC (rev 290242)
@@ -1,3 +1,16 @@
+2022-02-21 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Update pango and gtk4
+ https://bugs.webkit.org/show_bug.cgi?id=236939
+
+ Reviewed by Adrian Perez de Castro.
+
+ Update to GTK 4.6.2, which requires Pango 1.50.x, so also update Pango.
+
+ * elements/freedesktop-sdk.bst:
+ * elements/sdk/gtk.bst:
+ * patches/fdo-0001-pango-Bump-to-1.50.4.patch: Added.
+
2022-02-15 Adrian Perez de Castro <[email protected]>
[Flatpak SDK] Add mold linker
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (290241 => 290242)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-02-21 14:31:27 UTC (rev 290241)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-02-21 15:13:17 UTC (rev 290242)
@@ -6,6 +6,8 @@
ref: freedesktop-sdk-21.08.10-21-g7f2b952d70b0cd71ef9156983947b1dc713a393f
- kind: patch
path: patches/fdo-0001-Bump-libnice-to-current-git-master-HEAD.patch
+- kind: patch
+ path: patches/fdo-0001-pango-Bump-to-1.50.4.patch
config:
options:
target_arch: '%{arch}'
Modified: trunk/Tools/buildstream/elements/sdk/gtk.bst (290241 => 290242)
--- trunk/Tools/buildstream/elements/sdk/gtk.bst 2022-02-21 14:31:27 UTC (rev 290241)
+++ trunk/Tools/buildstream/elements/sdk/gtk.bst 2022-02-21 15:13:17 UTC (rev 290242)
@@ -1,11 +1,10 @@
kind: meson
-
sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/gtk.git
- track: master
- track-tags: true
- ref: 4.2.0-0-gccbbc2f2babcfaee88d8d8040938ca6bf39d05b6
+ # No gtk-4-6 branch, so track most recent release...
+ track: 4.6.1
+ ref: 4.6.1-0-g5088103d31942e2af87ed64a61967cdc6af48f78
build-depends:
- sdk-build-depends/sassc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -34,7 +33,7 @@
-Dprint-cloudprint=disabled
-Dmedia-ffmpeg=disabled
-Dvulkan=disabled
-
+ -Dbuild-tests=false
public:
bst:
overlap-whitelist:
Added: trunk/Tools/buildstream/patches/fdo-0001-pango-Bump-to-1.50.4.patch (0 => 290242)
--- trunk/Tools/buildstream/patches/fdo-0001-pango-Bump-to-1.50.4.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0001-pango-Bump-to-1.50.4.patch 2022-02-21 15:13:17 UTC (rev 290242)
@@ -0,0 +1,36 @@
+From b51d6c17f2eb1f0a4c0832c9603bd46268e22bb7 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Sun, 20 Feb 2022 11:05:52 +0000
+Subject: [PATCH] pango: Bump to 1.50.4
+
+Needed for GTK 4.6.
+---
+ elements/components/pango.bst | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/elements/components/pango.bst b/elements/components/pango.bst
+index 6dfa50e4a..5750b901c 100644
+--- a/elements/components/pango.bst
++++ b/elements/components/pango.bst
+@@ -1,5 +1,4 @@
+ kind: meson
+-
+ build-depends:
+ - components/gobject-introspection.bst
+ - public-stacks/buildsystem-meson.bst
+@@ -30,9 +29,9 @@ variables:
+ -Dgtk_doc=false
+ -Dintrospection=enabled
+ -Dinstall-tests=false
+-
+ sources:
+ - kind: git_tag
+ url: gnome:pango.git
+- track: pango-1-48
+- ref: 1.48.11-0-gaa565e5dee2ba3aa11345ea0fcb39befe7d1cef8
++ # No pango-1-50 branch so track most recent release.
++ track: 1.50.4
++ ref: 1.50.4-0-gbcf61fc3a0c30da173c8629d1458fe3440288878
+--
+2.35.1
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
