Skip to content
Permalink
Browse files
[Flatpak SDK] Dependencies update - July 2021 round
https://bugs.webkit.org/show_bug.cgi?id=228275

Patch by Philippe Normand <pnormand@igalia.com> on 2021-07-28
Reviewed by Adrian Perez de Castro.

* elements/freedesktop-sdk.bst: Update to latest 20.08 junction version.
* elements/qt5/qtbase.bst: Switch to KDE 5.15 branch.
* elements/qt5/qtdeclarative.bst: Ditto.
* elements/qt5/qtquickcontrols.bst: Ditto.
* elements/qt5/qtquickcontrols2.bst: Ditto.
* elements/qt5/qtwayland.bst: Ditto.
* elements/qt5/qtx11extras.bst: Ditto.
* elements/sdk-build-depends/rapidjson.bst: Update to latest git snapshot.
* elements/sdk-platform.bst: Add virtualenv, needed for WPT tests.
* elements/sdk/ccls.bst: Update to latest release.
* elements/sdk/clangd.bst: Bump to version 12.
* elements/sdk/ffmpeg.bst: Bump to version 4.4.
* elements/sdk/openjpeg.bst: Bump to version 2.4.
* elements/sdk/rr.bst: Update to latest git snapshot.
* elements/sdk/x264.bst: Ditto. Snapshot tarballs were discontinued years ago.
* patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch: Removed.
* patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch: Removed.
* patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch: Added.
* patches/qtdeclarative-use-python3.patch: Removed.
* project.conf:

Canonical link: https://commits.webkit.org/240024@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280380 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
philn authored and webkit-commit-queue committed Jul 28, 2021
1 parent a4fbea8 commit 2cf99c4a7d4fb944ebb1f2b7cb4ddd864be6d141
Showing 22 changed files with 191 additions and 207 deletions.
@@ -1,3 +1,31 @@
2021-07-28 Philippe Normand <pnormand@igalia.com>

[Flatpak SDK] Dependencies update - July 2021 round
https://bugs.webkit.org/show_bug.cgi?id=228275

Reviewed by Adrian Perez de Castro.

* elements/freedesktop-sdk.bst: Update to latest 20.08 junction version.
* elements/qt5/qtbase.bst: Switch to KDE 5.15 branch.
* elements/qt5/qtdeclarative.bst: Ditto.
* elements/qt5/qtquickcontrols.bst: Ditto.
* elements/qt5/qtquickcontrols2.bst: Ditto.
* elements/qt5/qtwayland.bst: Ditto.
* elements/qt5/qtx11extras.bst: Ditto.
* elements/sdk-build-depends/rapidjson.bst: Update to latest git snapshot.
* elements/sdk-platform.bst: Add virtualenv, needed for WPT tests.
* elements/sdk/ccls.bst: Update to latest release.
* elements/sdk/clangd.bst: Bump to version 12.
* elements/sdk/ffmpeg.bst: Bump to version 4.4.
* elements/sdk/openjpeg.bst: Bump to version 2.4.
* elements/sdk/rr.bst: Update to latest git snapshot.
* elements/sdk/x264.bst: Ditto. Snapshot tarballs were discontinued years ago.
* patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch: Removed.
* patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch: Removed.
* patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch: Added.
* patches/qtdeclarative-use-python3.patch: Removed.
* project.conf:

2021-07-09 Carlos Garcia Campos <cgarcia@igalia.com>

[Flatpak SDK] Update to libsoup3 2.99.9
@@ -5,7 +5,7 @@ sources:
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
# Changed to track git commit from upstream bst
track: 'release/20.08'
ref: freedesktop-sdk-20.08.13-29-g096698709baa9286c4d8a1143a1b094eca3ff844
ref: freedesktop-sdk-20.08.14-44-g58e021412f056f614a5f277c5852416fc3758edf
- kind: patch
path: patches/nettle-no-debug.diff
- kind: patch
@@ -2,7 +2,7 @@ kind: manual

depends:
- sdk/gtk+-3.bst
- freedesktop-sdk.bst:components/perl.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
# plus, perl seems to be needed as a build-dep for almost everything that depends on qtbase
@@ -60,14 +60,13 @@ public:
- "%{libdir}/*.so"

sources:
- kind: tar
url: qt:5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
ref: 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
- kind: git_tag
url: kde:qtbase
track: kde/5.15
ref: v5.15.0-870-g663d240a18f5acac82fd2bd0fd4a33c4f47b260a
- kind: patch
path: patches/qtbase-avoid-hardcoding-kernel-version.patch
- kind: patch
path: patches/qtbase-use-wayland-on-gnome.patch
- kind: patch
path: patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch
- kind: patch
path: patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch
path: patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch
@@ -4,8 +4,7 @@ depends:
- qt5/qtbase.bst

sources:
- kind: tar
url: qt:5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz
ref: 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
- kind: patch
path: patches/qtdeclarative-use-python3.patch
- kind: git_tag
url: kde:qtdeclarative
track: kde/5.15
ref: v5.15.0-201-g6683c414c5cc6ab46197c41bb1361c518ca84d3e
@@ -4,6 +4,7 @@ depends:
- qt5/qtdeclarative.bst

sources:
- kind: tar
url: qt:5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz
ref: 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
- kind: git_tag
url: kde:qtquickcontrols
track: kde/5.15
ref: v5.15.0-14-gcf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420
@@ -4,6 +4,7 @@ depends:
- qt5/qtdeclarative.bst

sources:
- kind: tar
url: qt:5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz
ref: 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
- kind: git_tag
url: kde:qtquickcontrols2
track: kde/5.15
ref: v5.15.0-57-ga2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3
@@ -5,6 +5,7 @@ depends:
- sdk/libdrm.bst

sources:
- kind: tar
url: qt:5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz
ref: 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
- kind: git_tag
url: kde:qtwayland
track: kde/5.15
ref: v5.15.0-58-gd4c41797b61a5a8da47c5821711aca72e756dcbf
@@ -4,6 +4,7 @@ depends:
- qt5/qtbase.bst

sources:
- kind: tar
url: qt:5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz
ref: c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
- kind: git_tag
url: kde:qtx11extras
track: kde/5.15
ref: v5.15.0-7-g3898f5484fd4864b047729bfeda9a1222f32364f
@@ -10,6 +10,6 @@ sources:
- kind: git_tag
url: github_com:Tencent/rapidjson
track: master
ref: v1.1.0-565-gce81bc9edfe773667a7a4454ba81dac72ed4364c
ref: v1.1.0-654-g48fbd8cd202ca54031fe799db2ad44ffa8e77c13
- kind: patch
path: patches/rapidjson-0001-Fix-build-warnings-emitted-by-GCC-10-on-Aarch64.patch
@@ -198,6 +198,7 @@ depends:
- freedesktop-sdk.bst:components/python3-sitecustomize.bst
- freedesktop-sdk.bst:components/python3-six.bst
- freedesktop-sdk.bst:components/python3-usercustomize.bst
- freedesktop-sdk.bst:components/python3-virtualenv.bst
- freedesktop-sdk.bst:components/python3.bst
- freedesktop-sdk.bst:components/sdl2-image.bst
- freedesktop-sdk.bst:components/sdl2-mixer.bst
@@ -1,8 +1,8 @@
kind: autotools
sources:
- kind: tar
url: gnome_downloads:adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz
ref: ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a
url: gnome_downloads:adwaita-icon-theme/40/adwaita-icon-theme-40.1.1.tar.xz
ref: 0b6c436ed6ad9887a88ada1f72a0197b1eb73b020d8d344abab4c7fa7250f8f6
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
@@ -3,8 +3,8 @@ kind: cmake
sources:
- kind: git_tag
url: github_com:MaskRay/ccls.git
track: '0.20201025'
ref: 0.20201025-0-g1fec76c804a386e57af543baf5a337779eb78e81
track: '0.20210330'
ref: 0.20210330-0-g0ada56ef3bb785b9b56eeebb70dff2aad60b3f39

build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
@@ -1,8 +1,8 @@
kind: manual
sources:
- kind: zip
url: github_files:clangd/clangd/releases/download/11.0.0/clangd-linux-11.0.0.zip
ref: 10047e2f974cd35a145e672eb5747b6cb27902181ae78c148d6e697a9da562d8
url: github_files:clangd/clangd/releases/download/12.0.0/clangd-linux-12.0.0.zip
ref: f9d09eb9f4f34cde78bdbcf9283a887734828c9893943abebe014a5630bce4d3

depends:
- freedesktop-sdk.bst:bootstrap-import.bst
@@ -151,5 +151,5 @@ config:
sources:
- kind: git_tag
url: ffmpeg:ffmpeg.git
track: release/4.2
ref: n4.2.3-5-g221e490d42bc1c20c61aee385d5bfe003a1a8c87
track: release/4.4
ref: n4.4-79-gde1132a89113b131831d8edde75214372c983f32
@@ -1,8 +1,8 @@
kind: cmake
sources:
- kind: tar
url: github_com:uclouvain/openjpeg/archive/v2.3.1.tar.gz
ref: 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9
url: github_com:uclouvain/openjpeg/archive/v2.4.0.tar.gz
ref: 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
depends:
@@ -16,4 +16,4 @@ sources:
- kind: git_tag
url: github_com:rr-debugger/rr
track: master
ref: 5.4.0-19-g7a520b7beea74a051abb5bf020155148264857ab
ref: 5.4.0-293-g8a15f2acdd39d799001c98107e72c2bed4ec63e9
@@ -7,9 +7,10 @@ depends:
- freedesktop-sdk.bst:bootstrap-import.bst

sources:
- kind: tar
url: http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20140212-2245-stable.tar.bz2
ref: 5d98e9e4faf6dd55e7193ed379aff477b8acbda6777758956ef7e5f05067be18
- kind: git_tag
url: vlc:videolan/x264
track: master
ref: ae03d92b52bb7581df2e75d571989cb1ecd19cbd
variables:
conf-local: >-
--enable-shared

This file was deleted.

This file was deleted.

0 comments on commit 2cf99c4

Please sign in to comment.