Log Message
[Flatpak SDK] Pre-easter eggs update https://bugs.webkit.org/show_bug.cgi?id=239007
Patch by Philippe Normand <pnorm...@igalia.com> on 2022-04-10 Reviewed by Adrian Perez de Castro. * elements/freedesktop-sdk.bst: Bump junction. * elements/qt5/qtbase.bst: Remove reference to removed gtk3 recipe. * elements/sdk-platform.bst: Replace duplicate recipes with their upstream version. * elements/sdk/adwaita-icon-theme.bst: Remove reference to removed gtk3 recipe. * elements/sdk/bubblewrap.bst: Removed. * elements/sdk/ffmpeg.bst: Bump to version 5, inspired from upstream version of the recipe. * elements/sdk/gst-plugins-base.bst: Remove reference to removed gtk3 recipe. * elements/sdk/gst-plugins-good.bst: Remove reference to removed gtk3 recipe. * elements/sdk/gtk+-3.bst: Removed. * patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch: Removed. * patches/gtk-gcc11-build-fix.patch: Removed.
Modified Paths
- trunk/Tools/buildstream/ChangeLog
- trunk/Tools/buildstream/elements/freedesktop-sdk.bst
- trunk/Tools/buildstream/elements/qt5/qtbase.bst
- trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst
- trunk/Tools/buildstream/elements/sdk/ffmpeg.bst
- trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst
- trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst
- trunk/Tools/buildstream/elements/sdk-platform.bst
Removed Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (292687 => 292688)
--- trunk/Tools/buildstream/ChangeLog 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/ChangeLog 2022-04-10 16:50:36 UTC (rev 292688)
@@ -1,3 +1,22 @@
+2022-04-10 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] Pre-easter eggs update
+ https://bugs.webkit.org/show_bug.cgi?id=239007
+
+ Reviewed by Adrian Perez de Castro.
+
+ * elements/freedesktop-sdk.bst: Bump junction.
+ * elements/qt5/qtbase.bst: Remove reference to removed gtk3 recipe.
+ * elements/sdk-platform.bst: Replace duplicate recipes with their upstream version.
+ * elements/sdk/adwaita-icon-theme.bst: Remove reference to removed gtk3 recipe.
+ * elements/sdk/bubblewrap.bst: Removed.
+ * elements/sdk/ffmpeg.bst: Bump to version 5, inspired from upstream version of the recipe.
+ * elements/sdk/gst-plugins-base.bst: Remove reference to removed gtk3 recipe.
+ * elements/sdk/gst-plugins-good.bst: Remove reference to removed gtk3 recipe.
+ * elements/sdk/gtk+-3.bst: Removed.
+ * patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch: Removed.
+ * patches/gtk-gcc11-build-fix.patch: Removed.
+
2022-04-08 Carlos Alberto Lopez Perez <clo...@igalia.com>
[Flatpak SDK] Update patchelf recipe
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -3,14 +3,12 @@
- kind: git_tag
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
track: 'release/21.08'
- ref: freedesktop-sdk-21.08.11-68-gc5c9e4d4b64f099843657fabbab295b3b77403c6
+ ref: freedesktop-sdk-21.08.12-73-g6f02787ff2f4506731cf6aac153728e3251bdda1
- 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
- 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
Modified: trunk/Tools/buildstream/elements/qt5/qtbase.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/qt5/qtbase.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/qt5/qtbase.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -1,7 +1,7 @@
kind: manual
depends:
-- sdk/gtk+-3.bst
+- freedesktop-sdk.bst:components/gtk3.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
Modified: trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -6,6 +6,6 @@
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
-- sdk/gtk+-3.bst
+- freedesktop-sdk.bst:components/gtk3.bst
- freedesktop-sdk.bst:components/librsvg.bst
- freedesktop-sdk.bst:bootstrap-import.bst
Deleted: trunk/Tools/buildstream/elements/sdk/bubblewrap.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk/bubblewrap.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk/bubblewrap.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -1,11 +0,0 @@
-kind: autotools
-sources:
-- kind: tar
- url: github_com:containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
- ref: 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
-
-depends:
-- freedesktop-sdk.bst:components/libcap.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
Modified: trunk/Tools/buildstream/elements/sdk/ffmpeg.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk/ffmpeg.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk/ffmpeg.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -22,8 +22,13 @@
- filename: freedesktop-sdk.bst:components/libvorbis.bst
- filename: freedesktop-sdk.bst:components/libvpx.bst
- filename: freedesktop-sdk.bst:components/opus.bst
+- filename: freedesktop-sdk.bst:components/vulkan-icd-loader.bst
+- filename: freedesktop-sdk.bst:components/v4l-utils.bst
+- filename: freedesktop-sdk.bst:components/xorg-lib-xcb.bst
- filename: freedesktop-sdk.bst:components/nasm.bst
type: build
+- filename: freedesktop-sdk.bst:components/vulkan-headers.bst
+ type: build
- filename: freedesktop-sdk.bst:components/noopenh264.bst
variables:
@@ -32,78 +37,96 @@
ffmpeg-arch: '%{arch}'
audio-encoders: |
- ac3,alac,flac,libfdk_aac,g723_1,mp2,libmp3lame,libopus,pcm_alaw,pcm_mulaw,\
+ ac3,alac,flac,libfdk_aac,g723_1,mp2,libmp3lame,libopus,libspeex,pcm_alaw,pcm_mulaw,\
pcm_f32le,pcm_s16be,pcm_s24be,pcm_s16le,pcm_s24le,pcm_s32le,\
pcm_u8,tta,libvorbis,wavpack,%{extra-aud-enc}
audio-decoders: |
- ac3,alac,flac,g723_1,g729,libfdk_aac,libopus,mp2,mp3,m4a,pcm_alaw,pcm_mulaw,\
- pcm_f32le,pcm_s16be,pcm_s24be,pcm_s16le,pcm_s24le,pcm_s32le,\
- pcm_u8,tta,vorbis,wavpack,%{extra-aud-dec}
+ ac3,adpcm_g722,alac,flac,g723_1,g729,libfdk_aac,libopus,libspeex,\
+ mp2,mp3,m4a,pcm_alaw,pcm_mulaw,pcm_f16le,pcm_f24le,pcm_f32be,\
+ pcm_f32le,pcm_f64be,pcm_f64le,pcm_s16be,pcm_s16be_planar,pcm_s24be,\
+ pcm_s16le,pcm_s16le_planar,pcm_s24le,pcm_s24le_planar,pcm_s32le,\
+ pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_s8,pcm_s8_planar,\
+ pcm_u8,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,tta,vorbis,wavpack,%{extra-aud-dec}
video-encoders: |
- ass,ffv1,libaom_av1,libopenh264,libvpx_vp8,libvpx_vp9,rawvideo,theora,%{extra-vid-enc}
+ ass,ffv1,libaom_av1,libopenh264,libvpx_vp8,libvpx_vp9,mjpeg_vaapi,rawvideo,\
+ theora,vp8_vaapi,%{extra-vid-enc}
video-decoders: |
- ass,ffv1,libaom_av1,libdav1d,libopenh264,libvpx_vp8,libvpx_vp9,rawvideo,theora,vp8,vp9,%{extra-vid-dec}
+ ass,ffv1,libaom_av1,libdav1d,libopenh264,libvpx_vp8,libvpx_vp9,\
+ rawvideo,theora,vp8,vp9,%{extra-vid-dec}
image-formats: |
- gif,png,tiff,webp,%{extra-image-formats}
+ bmp,gif,jpegls,tiff,webp,%{extra-image-formats}
- hwaccels: '%{extra-hwaccels}'
+ hwaccels: |
+ vp8_vaapi,mjpeg_vaapi,%{extra-hwaccels}
muxers: |
- ac3,ass,flac,gif,matroska,mp3,mpegvideo,ogg,opus,wav,%{extra-muxers}
+ ac3,ass,flac,g722,gif,matroska,mp3,mpegvideo,rtp,ogg,opus,\
+ pcm_s16be,pcm_s16le,wav,webm,%{extra-muxers}
demuxers: |
- aac,ac3,ass,flac,gif,matroska,mov,mp3,mpegvideo,ogg,wav,%{extra-demuxers}
+ aac,ac3,ass,flac,g722,gif,image_jpeg_pipe,image_png_pipe,\
+ image_webp_pipe,matroska,mjpeg,mov,mp3,mpegvideo,ogg,pcm_mulaw,\
+ pcm_alaw,pcm_s16be,pcm_s16le,rtp,wav,%{extra-demuxers}
parsers: |
- aac,ac3,flac,mpegaudio,mpeg4video,opus,vp3,vp8,vorbis,%{extra-parsers}
+ aac,ac3,flac,mjpeg,mpegaudio,mpeg4video,opus,vp3,vp8,vp9,vorbis,%{extra-parsers}
filters: |
- crop,scale,%{extra-filters}
+ crop,scale,overlay,amix,amerge,aresample,format,aformat,fps,transpose,pad,%{extra-filters}
- conf-local: |
- --prefix="%{ffmpeg-prefix}" \
- --libdir="%{ffmpeg-libdir}" \
- --disable-doc \
- --disable-static \
- --enable-optimizations \
- --enable-shared \
- --disable-everything \
- --enable-ffplay \
- --enable-ffprobe \
- --enable-gnutls \
- --enable-libaom \
- --enable-libdav1d \
- --enable-libfdk-aac \
- --enable-libmp3lame \
- --enable-libfontconfig \
- --enable-libfreetype \
- --enable-libopenh264 \
- --enable-libopus \
- --enable-libpulse \
- --enable-libspeex \
- --enable-libtheora \
- --enable-libvorbis \
- --enable-libvpx \
- --enable-libwebp \
- --enable-openal \
- --enable-opengl \
- --enable-sdl2 \
- --enable-encoder=%{audio-encoders} \
- --enable-encoder=%{video-encoders} \
- --enable-decoder=%{audio-decoders} \
- --enable-decoder=%{video-decoders} \
- --enable-encoder=%{image-formats} \
- --enable-decoder=%{image-formats} \
- --enable-hwaccel=%{hwaccels} \
- --enable-parser=%{parsers} \
- --enable-muxer=%{muxers} \
- --enable-demuxer=%{demuxers} \
- --enable-filter=%{filters} \
- --enable-protocol=file \
+ protocols: |
+ crypto,file,pipe,rtp,srtp,rtsp,tcp,udp,unix,%{extra-protocols}
+
+ conf-local: >-
+ --prefix="%{ffmpeg-prefix}"
+ --libdir="%{ffmpeg-libdir}"
+ --disable-debug
+ --disable-doc
+ --disable-static
+ --enable-optimizations
+ --enable-shared
+ --disable-everything
+ --enable-ffplay
+ --enable-ffprobe
+ --enable-gnutls
+ --enable-libaom
+ --enable-libdav1d
+ --enable-libfdk-aac
+ --enable-libmp3lame
+ --enable-libfontconfig
+ --enable-libfreetype
+ --enable-libopus
+ --enable-libpulse
+ --enable-libspeex
+ --enable-libtheora
+ --enable-libvorbis
+ --enable-libvpx
+ --enable-libwebp
+ --enable-openal
+ --enable-opengl
+ --enable-sdl2
+ --enable-vulkan
+ --enable-zlib
+ --enable-libv4l2
+ --enable-libxcb
+ --enable-vdpau
+ --enable-vaapi
+ --enable-encoder=%{audio-encoders}
+ --enable-encoder=%{video-encoders}
+ --enable-decoder=%{audio-decoders}
+ --enable-decoder=%{video-decoders}
+ --enable-encoder=%{image-formats}
+ --enable-decoder=%{image-formats}
+ --enable-hwaccel=%{hwaccels}
+ --enable-parser=%{parsers}
+ --enable-muxer=%{muxers}
+ --enable-demuxer=%{demuxers}
+ --enable-filter=%{filters}
+ --enable-protocol=%{protocols}
--arch="%{ffmpeg-arch}"
conf-extra: ''
@@ -118,6 +141,7 @@
extra-demuxers: 'avi,h264,m4v'
extra-parsers: 'hevc,h264'
extra-filters: ''
+ extra-protocols: ''
public:
bst:
@@ -151,5 +175,5 @@
sources:
- kind: git_tag
url: ffmpeg:ffmpeg.git
- track: release/4.4
- ref: n4.4-79-gde1132a89113b131831d8edde75214372c983f32
+ track: release/5.0
+ ref: n5.0-0-g390d6853d0ef408007feb39c0040682c81c02751
Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -9,7 +9,7 @@
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/gstreamer.bst
- sdk/graphene.bst
-- sdk/gtk+-3.bst
+- freedesktop-sdk.bst:components/gtk3.bst
- freedesktop-sdk.bst:components/pango.bst
- freedesktop-sdk.bst:components/libdrm.bst
- freedesktop-sdk.bst:components/libsoup.bst
Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -9,7 +9,7 @@
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/gstreamer.bst
- sdk/gst-plugins-base.bst
-- sdk/gtk+-3.bst
+- freedesktop-sdk.bst:components/gtk3.bst
- freedesktop-sdk.bst:components/libsoup.bst
- freedesktop-sdk.bst:components/v4l-utils.bst
- qt5/qtdeclarative.bst
Deleted: trunk/Tools/buildstream/elements/sdk/gtk+-3.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk/gtk+-3.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk/gtk+-3.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -1,58 +0,0 @@
-kind: meson
-sources:
-- kind: tar
- url: gnome_downloads:gtk+/3.24/gtk+-3.24.30.tar.xz
- ref: ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9
-- kind: patch
- path: patches/gtk-gcc11-build-fix.patch
-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: >-
- -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+
Modified: trunk/Tools/buildstream/elements/sdk-platform.bst (292687 => 292688)
--- trunk/Tools/buildstream/elements/sdk-platform.bst 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/elements/sdk-platform.bst 2022-04-10 16:50:36 UTC (rev 292688)
@@ -10,7 +10,6 @@
# replaced (patched) elements:
- sdk/adwaita-icon-theme.bst
- sdk/apitrace.bst
-- sdk/bubblewrap.bst
- sdk/capnp.bst
- sdk/cargo-c.bst
- sdk/ccls.bst
@@ -31,7 +30,6 @@
- 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
@@ -75,6 +73,7 @@
- freedesktop-sdk.bst:components/at-spi2-core.bst
- freedesktop-sdk.bst:components/atk.bst
- freedesktop-sdk.bst:components/brotli.bst
+- freedesktop-sdk.bst:components/bubblewrap.bst
- freedesktop-sdk.bst:components/ca-certificates.bst
- freedesktop-sdk.bst:components/cairo.bst
- freedesktop-sdk.bst:components/ccache.bst
@@ -108,6 +107,7 @@
- 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
Deleted: trunk/Tools/buildstream/patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch (292687 => 292688)
--- trunk/Tools/buildstream/patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch 2022-04-10 16:50:36 UTC (rev 292688)
@@ -1,144 +0,0 @@
-From 3d67db03d8c8c513881645d7900de6c7d8a8159f Mon Sep 17 00:00:00 2001
-From: Philippe Normand <ph...@igalia.com>
-Date: Sat, 19 Mar 2022 17:16:11 +0000
-Subject: [PATCH] shared-mime-info: Backport meson 0.60 build fix
-
-https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162
----
- elements/components/shared-mime-info.bst | 2 +
- ...tom-itstool-to-builtin-msgfmt-for-cr.patch | 113 ++++++++++++++++++
- 2 files changed, 115 insertions(+)
- create mode 100644 patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
-
-diff --git a/elements/components/shared-mime-info.bst b/elements/components/shared-mime-info.bst
-index 0aa629d50..2cdad570a 100644
---- a/elements/components/shared-mime-info.bst
-+++ b/elements/components/shared-mime-info.bst
-@@ -22,3 +22,5 @@ sources:
- track-extra:
- - '2.0'
- ref: 2.1-0-g18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70
-+- kind: patch
-+ path: patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
-diff --git a/patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch b/patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
-new file mode 100644
-index 000000000..6b104e081
---- /dev/null
-+++ b/patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
-@@ -0,0 +1,113 @@
-+From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
-+From: Eli Schwartz <eschwa...@archlinux.org>
-+Date: Mon, 8 Nov 2021 18:22:47 -0500
-+Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
-+ translated XML
-+
-+gettext upstream has supported this for a very long time (since 0.19.7
-+via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-+and itstool is (mostly) a legacy of the time before gettext had proper
-+support for these sorts of use cases.
-+
-+This is similar to the state of intltool, which is described at
-+https://wiki.gnome.org/MigratingFromIntltoolToGettext
-+
-+During the port from autotools to meson, the legacy use of itstool was
-+faithfully translated to meson in the only way possible: by jumping
-+through hoops to run ninja inside ninja in order to generate the .mo
-+files for itstool, because meson's i18n module used a flawed design and
-+there was no "real" target to create those files, only a .PHONY
-+run_target which other rules cannot depend on.
-+
-+Although meson 0.60.0 added support for real targets for the built .mo
-+files, this changed the rules for output filenames, breaking the script.
-+
-+But msgfmt does not care, and anyways comes with builtin meson functions
-+for convenient use with XML files. So let's take this opportunity to
-+drop legacy dependencies and use the modern, builtin tooling, which
-+fixes this bug as a side effect.
-+
-+Fixes #170
-+---
-+ .gitlab-ci.yml | 2 --
-+ README.md | 2 +-
-+ data/freedesktop_generate.sh | 12 ------------
-+ data/meson.build | 16 +++++-----------
-+ meson.build | 1 -
-+ 5 files changed, 6 insertions(+), 27 deletions(-)
-+ delete mode 100755 data/freedesktop_generate.sh
-+
-+diff --git a/README.md b/README.md
-+index c23d9d5..b2fb0ac 100644
-+--- a/README.md
-++++ b/README.md
-+@@ -19,7 +19,7 @@ $ ninja -v -C _build install
-+ ```
-+
-+ It requires the glib development package to be installed as well as
-+-gettext and itstool.
-++gettext.
-+ This database is translated at Transifex.
-+
-+
-+diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
-+deleted file mode 100755
-+index 62ccffa..0000000
-+--- a/data/freedesktop_generate.sh
-++++ /dev/null
-+@@ -1,12 +0,0 @@
-+-#!/bin/sh -e
-+-
-+-src_root="$1"
-+-build_root="$2"
-+-
-+-ninja -C "${build_root}" shared-mime-info-gmo
-+-
-+-itstool \
-+- --its "${src_root}/data/its/shared-mime-info.its" \
-+- --join "${src_root}/data/freedesktop.org.xml.in" \
-+- -o "${build_root}/data/freedesktop.org.xml" \
-+- "${build_root}/po/"*".gmo"
-+diff --git a/data/meson.build b/data/meson.build
-+index 24361c9..09ed7a9 100644
-+--- a/data/meson.build
-++++ b/data/meson.build
-+@@ -1,18 +1,12 @@
-+
-+ install_man('update-mime-database.1')
-+
-+-freedesktop_org_xml = custom_target('freedesktop.org.xml',
-+- input : files(
-+- 'freedesktop.org.xml.in',
-+- 'its/shared-mime-info.its',
-+- 'its/shared-mime-info.loc',
-+- ),
-++freedesktop_org_xml = i18n.merge_file(
-++ input: 'freedesktop.org.xml.in',
-+ output: 'freedesktop.org.xml',
-+- command: [
-+- find_program('freedesktop_generate.sh'),
-+- meson.source_root(),
-+- meson.build_root()
-+- ],
-++ data_dirs: '.',
-++ po_dir: '../po',
-++ type: 'xml',
-+ install: true,
-+ install_dir: get_option('datadir') / 'mime' / 'packages',
-+ )
-+diff --git a/meson.build b/meson.build
-+index 0d08c8a..60f17ae 100644
-+--- a/meson.build
-++++ b/meson.build
-+@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
-+ ###############################################################################
-+ # Find tools
-+
-+-itstool = find_program('itstool')
-+ xmllint = find_program('xmllint')
-+ xmlto = find_program('xmlto', required: false)
-+
-+--
-+2.35.1
-+
---
-2.35.1
-
Deleted: trunk/Tools/buildstream/patches/gtk-gcc11-build-fix.patch (292687 => 292688)
--- trunk/Tools/buildstream/patches/gtk-gcc11-build-fix.patch 2022-04-10 16:47:18 UTC (rev 292687)
+++ trunk/Tools/buildstream/patches/gtk-gcc11-build-fix.patch 2022-04-10 16:50:36 UTC (rev 292688)
@@ -1,91 +0,0 @@
-From b4e110920aa18e6cc149ccbbfcd90b5143526e6d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mcla...@redhat.com>
-Date: Mon, 11 Jan 2021 22:04:52 +0000
-Subject: [PATCH] Merge branch 'wip/kalev/gcc-11' into 'master'
-
-Avoid diagnostics for gcc-11 false positive out of bounds accesses
-
-See merge request GNOME/gtk!3064
-
-(cherry picked from commit 5044031b53988627c2937c6b5f8919a37e18f21f)
-
-c514c41d Avoid diagnostics for gcc-11 false positive out of bounds accesses
----
- gtk/gtktextchild.c | 14 ++++++++++++++
- gtk/gtktextsegment.c | 7 +++++++
- 2 files changed, 21 insertions(+)
-
-diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
-index 2ff7de2394..cbbcf91d66 100644
---- a/gtk/gtktextchild.c
-+++ b/gtk/gtktextchild.c
-@@ -129,6 +129,12 @@ const GtkTextLineSegmentClass gtk_text_pixbuf_type = {
- GtkTextLineSegment *
- _gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
- {
-+ /* gcc-11 issues a diagnostic here because the size allocated
-+ for SEG does not cover the entire size of a GtkTextLineSegment
-+ and gcc has no way to know that the union will only be used
-+ for limited types and the additional space is not needed. */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Warray-bounds"
- GtkTextLineSegment *seg;
-
- seg = g_slice_alloc (PIXBUF_SEG_SIZE);
-@@ -148,6 +154,7 @@ _gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
- g_object_ref (pixbuf);
-
- return seg;
-+#pragma GCC diagnostic pop
- }
-
-
-@@ -224,6 +231,12 @@ const GtkTextLineSegmentClass gtk_text_child_type = {
- GtkTextLineSegment *
- _gtk_widget_segment_new (GtkTextChildAnchor *anchor)
- {
-+ /* gcc-11 issues a diagnostic here because the size allocated
-+ for SEG does not cover the entire size of a GtkTextLineSegment
-+ and gcc has no way to know that the union will only be used
-+ for limited types and the additional space is not needed. */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Warray-bounds"
- GtkTextLineSegment *seg;
-
- seg = g_slice_alloc (WIDGET_SEG_SIZE);
-@@ -247,6 +260,7 @@ _gtk_widget_segment_new (GtkTextChildAnchor *anchor)
- g_object_ref (anchor);
-
- return seg;
-+#pragma GCC diagnostic pop
- }
-
- void
-diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
-index 8539db5297..8e00b1ddc9 100644
---- a/gtk/gtktextsegment.c
-+++ b/gtk/gtktextsegment.c
-@@ -426,6 +426,12 @@ char_segment_check_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
- GtkTextLineSegment*
- _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
- {
-+ /* gcc-11 issues a diagnostic here because the size allocated
-+ for SEG does not cover the entire size of a GtkTextLineSegment
-+ and gcc has no way to know that the union will only be used
-+ for limited types and the additional space is not needed. */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Warray-bounds"
- GtkTextLineSegment *seg;
-
- seg = g_slice_alloc (TSEG_SIZE);
-@@ -441,6 +447,7 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
- seg->body.toggle.inNodeCounts = 0;
-
- return seg;
-+#pragma GCC diagnostic pop
- }
-
- void
---
-2.31.1
-
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
