Skip to content
Permalink
Browse files
[Flatpak SDK] Partial revert of r249480
https://bugs.webkit.org/show_bug.cgi?id=239700

Patch by Philippe Normand <pnormand@igalia.com> on 2022-04-26
Reviewed by Adrian Perez de Castro.

The switch to upstream gtk3 recipe broke something related with icons handling and
introduced a crash in media/video-controls-drag.html. For the time being, revert to our
custom recipe.

This patch also updates the pipenv environment used to build the SDK, to BuildStream 1.6.5.

* Pipfile:
* Pipfile.lock:
* elements/qt5/qtbase.bst:
* elements/sdk-platform.bst:
* elements/sdk/adwaita-icon-theme.bst:
* elements/sdk/gst-plugins-base.bst:
* elements/sdk/gst-plugins-good.bst:
* elements/sdk/gtk+-3.bst: Added.

Canonical link: https://commits.webkit.org/249979@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293419 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
philn authored and webkit-commit-queue committed Apr 26, 2022
1 parent 5d96110 commit b10e49959095b49f456cac00d63f4487be1a0c2f
Show file tree
Hide file tree
Showing 9 changed files with 322 additions and 263 deletions.
@@ -1,3 +1,25 @@
2022-04-24 Philippe Normand <philn@igalia.com>

[Flatpak SDK] Partial revert of r249480
https://bugs.webkit.org/show_bug.cgi?id=239700

Reviewed by Adrian Perez de Castro.

The switch to upstream gtk3 recipe broke something related with icons handling and
introduced a crash in media/video-controls-drag.html. For the time being, revert to our
custom recipe.

This patch also updates the pipenv environment used to build the SDK, to BuildStream 1.6.5.

* Pipfile:
* Pipfile.lock:
* elements/qt5/qtbase.bst:
* elements/sdk-platform.bst:
* elements/sdk/adwaita-icon-theme.bst:
* elements/sdk/gst-plugins-base.bst:
* elements/sdk/gst-plugins-good.bst:
* elements/sdk/gtk+-3.bst: Added.

2022-04-11 Philippe Normand <pnormand@igalia.com>

[Flatpak SDK] Almost-easter eggs update
@@ -6,6 +6,6 @@ verify_ssl = true
[dev-packages]

[packages]
buildstream = "==1.6.3"
buildstream = "==1.6.5"
buildstream-external = "*"
pygobject = "==3.42"

Large diffs are not rendered by default.

@@ -1,7 +1,7 @@
kind: manual

depends:
- freedesktop-sdk.bst:components/gtk3.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:components/perl.bst
# gtk3 seems to have all the so files that qtbase needs access to
# perl is listed as a recommended dependency on packages.debian.org
@@ -30,6 +30,7 @@ depends:
- sdk/gst-plugins-good.bst
- sdk/gst-plugins-ugly.bst
- sdk/gstreamer.bst
- sdk/gtk+-3.bst
- sdk/gtk.bst
- sdk/icecc.bst
- sdk/krb5.bst
@@ -107,7 +108,6 @@ depends:
- freedesktop-sdk.bst:components/google-crosextra-carlito.bst
- freedesktop-sdk.bst:components/gpgme.bst
- freedesktop-sdk.bst:components/graphite2.bst
- freedesktop-sdk.bst:components/gtk3.bst
- freedesktop-sdk.bst:components/gtk-doc.bst
- freedesktop-sdk.bst:components/gzip.bst
- freedesktop-sdk.bst:components/harfbuzz.bst
@@ -1,11 +1,11 @@
kind: autotools
sources:
- kind: tar
url: gnome_downloads:adwaita-icon-theme/40/adwaita-icon-theme-40.1.1.tar.xz
ref: 0b6c436ed6ad9887a88ada1f72a0197b1eb73b020d8d344abab4c7fa7250f8f6
url: gnome_downloads:adwaita-icon-theme/42/adwaita-icon-theme-42.0.tar.xz
ref: 5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- freedesktop-sdk.bst:components/gtk3.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:components/librsvg.bst
- freedesktop-sdk.bst:bootstrap-import.bst
@@ -9,7 +9,7 @@ depends:
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/gstreamer.bst
- sdk/graphene.bst
- freedesktop-sdk.bst:components/gtk3.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:components/pango.bst
- freedesktop-sdk.bst:components/libdrm.bst
- freedesktop-sdk.bst:components/libsoup.bst
@@ -9,7 +9,7 @@ depends:
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/gstreamer.bst
- sdk/gst-plugins-base.bst
- freedesktop-sdk.bst:components/gtk3.bst
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:components/libsoup.bst
- freedesktop-sdk.bst:components/v4l-utils.bst
- qt5/qtdeclarative.bst
@@ -0,0 +1,57 @@
kind: meson
sources:
- kind: tar
url: gnome_downloads:gtk+/3.24/gtk+-3.24.33.tar.xz
ref: 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- freedesktop-sdk.bst:components/at-spi2-atk.bst
- freedesktop-sdk.bst:components/atk.bst
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/glib.bst
- freedesktop-sdk.bst:components/gobject-introspection.bst
- freedesktop-sdk.bst:components/pango.bst
- freedesktop-sdk.bst:components/cairo.bst
- freedesktop-sdk.bst:components/hicolor-icon-theme.bst
- freedesktop-sdk.bst:components/libepoxy.bst
- freedesktop-sdk.bst:components/libxkbcommon.bst
- freedesktop-sdk.bst:components/mesa-headers.bst
- freedesktop-sdk.bst:components/wayland-protocols.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:components/xorg-lib-xcomposite.bst
- freedesktop-sdk.bst:components/xorg-lib-xcursor.bst
- freedesktop-sdk.bst:components/xorg-lib-xdamage.bst
- freedesktop-sdk.bst:components/xorg-lib-xi.bst
- freedesktop-sdk.bst:components/xorg-lib-xinerama.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
meson-local: >-
-Ddemos=false
-Dbroadway_backend=true
-Dinstalled_tests=true
-Dtests=false
-Dx11_backend=true
-Dgtk_doc=false
-Dman=false
-Dintrospection=true
public:
bst:
integration-commands:
- |-
for dir in %{prefix}/share/icons/*; do
if test -f $dir/index.theme; then
gtk-update-icon-cache --quiet $dir
fi
done
- gtk-query-immodules-3.0 --update-cache
overlap-whitelist:
- '**'
split-rules:
devel:
(>):
- '%{libdir}/libgailutil-3.so'
- '%{libdir}/libgdk-3.so'
- '%{libdir}/libgtk-3.so'
cpe:
product: gtk+

0 comments on commit b10e499

Please sign in to comment.