Skip to content

Commit

Permalink
[Buildstream SDK] Update to latest GTK4
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=258873

Reviewed by Carlos Alberto Lopez Perez.

Update the FDO junction to latest 22.08 release and bump gobject-introspection and glib to versions
required by GTK 4.11.

* Tools/buildstream/elements/freedesktop-sdk.bst:
* Tools/buildstream/elements/sdk/gtk.bst:
* Tools/buildstream/patches/fdo-0007-components-Bump-GLib-to-version-2.76.patch: Added.
* Tools/buildstream/patches/fdo-0008-components-Bump-g-i-to-version-1.76.patch: Added.

Canonical link: https://commits.webkit.org/265770@main
  • Loading branch information
philn committed Jul 5, 2023
1 parent 2da4c96 commit ca95701
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 4 deletions.
6 changes: 5 additions & 1 deletion Tools/buildstream/elements/freedesktop-sdk.bst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sources:
- kind: git_tag
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
track: 'release/22.08'
ref: freedesktop-sdk-22.08.11-127-g7bed8a0d05bfd13939862b30e7080d1ffd5f635b
ref: freedesktop-sdk-22.08.13-17-g4cbd1d47a91cfa60269974bf84396dc12ff8df36
- kind: patch
path: patches/fdo-0001-pipewire-base-Disable-AEC-module.patch
- kind: patch
Expand All @@ -18,6 +18,10 @@ sources:
path: patches/fdo-0005-GStreamer-Bump-to-1.22.4.patch
- kind: patch
path: patches/fdo-0006-gst-plugins-bad-Enable-soundtouch.patch
- kind: patch
path: patches/fdo-0007-components-Bump-GLib-to-version-2.76.patch
- kind: patch
path: patches/fdo-0008-components-Bump-g-i-to-version-1.76.patch
config:
options:
target_arch: '%{arch}'
Expand Down
7 changes: 4 additions & 3 deletions Tools/buildstream/elements/sdk/gtk.bst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kind: meson
sources:
- kind: git_tag
url: gitlab_gnome_org:GNOME/gtk.git
# No gtk-4-6 branch, so track most recent release...
track: 4.6.1
ref: 4.6.1-0-g5088103d31942e2af87ed64a61967cdc6af48f78
# No gtk-4-11 branch, so track most recent release...
track: 4.11.4
ref: 4.11.4-0-gf5d68bb586be6a82b9c2fa8c1a32ea540999ea10
build-depends:
- sdk-build-depends/sassc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
Expand Down Expand Up @@ -32,6 +32,7 @@ variables:
-Dmedia-ffmpeg=disabled
-Dvulkan=disabled
-Dbuild-tests=false
-Dbuild-testsuite=false
public:
bst:
overlap-whitelist:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 381461cd9e0ea4e6310e306ea1d4088acd595676 Mon Sep 17 00:00:00 2001
From: Philippe Normand <philn@igalia.com>
Date: Wed, 5 Jul 2023 10:50:24 +0100
Subject: [PATCH] components: Bump GLib to version 2.76

Required for GTK 4.11.
---
elements/components/glib.bst | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/elements/components/glib.bst b/elements/components/glib.bst
index e130d3943..075ebeff9 100644
--- a/elements/components/glib.bst
+++ b/elements/components/glib.bst
@@ -54,7 +54,11 @@ sources:
url: gnome:glib.git
track: main
track-extra:
- - glib-2-72
+ - glib-2-76
match:
- 2.*[02468].*
- ref: 2.72.4-0-g6ed6303e40d6eaf80f2acfbfbcadbb169d156e9c
+ ref: 2.76.3-0-g69e209764bcfef599a21b32f82f88f1906bf197c
+- kind: git_module
+ path: subprojects/gvdb
+ url: gnome:gvdb.git
+ ref: 0854af0fdb6d527a8d1999835ac2c5059976c210
--
2.41.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From ee34aab8459bc120824504f26bde97aea7843262 Mon Sep 17 00:00:00 2001
From: Philippe Normand <philn@igalia.com>
Date: Wed, 5 Jul 2023 11:07:08 +0100
Subject: [PATCH] components: Bump g-i to version 1.76

Also required for GTK 4.11.
---
elements/components/gobject-introspection.bst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elements/components/gobject-introspection.bst b/elements/components/gobject-introspection.bst
index 3055815bd..2f71bb7e8 100644
--- a/elements/components/gobject-introspection.bst
+++ b/elements/components/gobject-introspection.bst
@@ -39,7 +39,7 @@ sources:
url: gnome:gobject-introspection.git
track: main
track-extra:
- - gnome-42
+ - gnome-44
match:
- "*.*[02468].*"
- ref: 1.72.1-0-gc8aefdd9f606796037e36023d16e956450de3bf3
+ ref: 1.76.1-0-g1565805460c3fd65f8630debd0337ec0e33ee2e7
--
2.41.0

0 comments on commit ca95701

Please sign in to comment.