Title: [264597] trunk/Tools
- Revision
- 264597
- Author
- [email protected]
- Date
- 2020-07-20 06:37:05 -0700 (Mon, 20 Jul 2020)
Log Message
[Flatpak SDK] Update to FDO 19.08.12 release
https://bugs.webkit.org/show_bug.cgi?id=214184
Patch by Philippe Normand <[email protected]> on 2020-07-20
Reviewed by Žan Doberšek.
Bump to the latest 19.08 release, which ships GCC 9.3.0. Hence we can remove the
corresponding downstream patch. And the Bluez patch which was left around but not longer
applied in the FDO junction. Also integrate a non-related WPEBackend-FDO git master ref bump.
* buildstream/elements/freedesktop-sdk.bst:
* buildstream/patches/fdo-0001-Update-gcc-to-9.3.0.patch: Removed.
* buildstream/patches/fdo/0003-Add-Bluez.patch: Removed.
* buildstream/elements/sdk/wpebackend-fdo.bst:
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (264596 => 264597)
--- trunk/Tools/ChangeLog 2020-07-20 12:37:46 UTC (rev 264596)
+++ trunk/Tools/ChangeLog 2020-07-20 13:37:05 UTC (rev 264597)
@@ -1,3 +1,19 @@
+2020-07-20 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Update to FDO 19.08.12 release
+ https://bugs.webkit.org/show_bug.cgi?id=214184
+
+ Reviewed by Žan Doberšek.
+
+ Bump to the latest 19.08 release, which ships GCC 9.3.0. Hence we can remove the
+ corresponding downstream patch. And the Bluez patch which was left around but not longer
+ applied in the FDO junction. Also integrate a non-related WPEBackend-FDO git master ref bump.
+
+ * buildstream/elements/freedesktop-sdk.bst:
+ * buildstream/patches/fdo-0001-Update-gcc-to-9.3.0.patch: Removed.
+ * buildstream/patches/fdo/0003-Add-Bluez.patch: Removed.
+ * buildstream/elements/sdk/wpebackend-fdo.bst:
+
2020-07-19 Sam Weinig <[email protected]>
Rename Color::transparent to Color::transparentBlack to more clearly state what it is
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (264596 => 264597)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2020-07-20 12:37:46 UTC (rev 264596)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2020-07-20 13:37:05 UTC (rev 264597)
@@ -6,12 +6,10 @@
# Changed to track git commit from upstream bst
track: '19.08'
track-tags: true
- ref: freedesktop-sdk-19.08.11-0-gac942905b94dfeda1b2d0d45d8ca3f8110e0ebe3
+ ref: freedesktop-sdk-19.08.12-0-ga7778d9c98b5fbff712c2c8b17e3e804df9baaab
- kind: patch
path: patches/nettle-no-debug.diff
- kind: patch
- path: patches/fdo-0001-Update-gcc-to-9.3.0.patch
-- kind: patch
path: patches/fdo/0001-Pango-Bump-to-1.45-master.patch
- kind: patch
path: patches/fdo/0001-dav1d-Bump-to-0.7.0.patch
Modified: trunk/Tools/buildstream/elements/sdk/wpebackend-fdo.bst (264596 => 264597)
--- trunk/Tools/buildstream/elements/sdk/wpebackend-fdo.bst 2020-07-20 12:37:46 UTC (rev 264596)
+++ trunk/Tools/buildstream/elements/sdk/wpebackend-fdo.bst 2020-07-20 13:37:05 UTC (rev 264597)
@@ -3,7 +3,7 @@
- kind: git_tag
url: github_com:Igalia/WPEBackend-fdo.git
track: master
- ref: 1.3.1-54-g1f58ebdf632fdf90f691949d90c8338a8d7073c7
+ ref: 1.3.1-68-g343146b98c365306f3718d50a4a52537de5e3dcc
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
depends:
Deleted: trunk/Tools/buildstream/patches/fdo/0003-Add-Bluez.patch (264596 => 264597)
--- trunk/Tools/buildstream/patches/fdo/0003-Add-Bluez.patch 2020-07-20 12:37:46 UTC (rev 264596)
+++ trunk/Tools/buildstream/patches/fdo/0003-Add-Bluez.patch 2020-07-20 13:37:05 UTC (rev 264597)
@@ -1,85 +0,0 @@
-From 59b898e02f7c3e2c223b859848b94e26c8b0ff80 Mon Sep 17 00:00:00 2001
-From: Valentin David <[email protected]>
-Date: Mon, 3 Feb 2020 14:37:18 +0100
-Subject: [PATCH 3/4] Add Bluez
-
-This is a build dependency for PipeWire. PipeWire requires a bit more
-than what
-`components/bluez-headers.bst`. `components/bluez-headers.bst` remains
-in order to avoid a circular dependency with `components/python3.bst`.
----
- elements/components/bluez-headers.bst | 11 ++++++-----
- elements/components/bluez.bst | 24 ++++++++++++++++++++++++
- elements/include/bluez.yml | 5 +++++
- 3 files changed, 35 insertions(+), 5 deletions(-)
- create mode 100644 elements/components/bluez.bst
- create mode 100644 elements/include/bluez.yml
-
-diff --git a/elements/components/bluez-headers.bst b/elements/components/bluez-headers.bst
-index 331e6216..5ac38b13 100644
---- a/elements/components/bluez-headers.bst
-+++ b/elements/components/bluez-headers.bst
-@@ -1,4 +1,8 @@
- kind: manual
-+description: |
-+ This element provides just the headers required to build
-+ Python. Because Bluez depends on Python, we cannot build Python without
-+ this element. Full elements is `components/bluez.bst`.
-
- build-depends:
- - bootstrap-import.bst
-@@ -8,8 +12,5 @@ config:
- - |
- install -D -m644 -t "%{install-root}%{includedir}/bluetooth" lib/*.h
-
--sources:
--- kind: git_tag
-- url: kernel:bluetooth/bluez.git
-- track: master
-- ref: 5.51-0-g6de4bdb957cdc85d89851420ab06ca8e226f8d4e
-+(@): elements/include/bluez.yml
-+
-diff --git a/elements/components/bluez.bst b/elements/components/bluez.bst
-new file mode 100644
-index 00000000..55ec909b
---- /dev/null
-+++ b/elements/components/bluez.bst
-@@ -0,0 +1,24 @@
-+kind: autotools
-+
-+depends:
-+- bootstrap-import.bst
-+- components/glib.bst
-+- components/dbus.bst
-+- components/libical.bst
-+
-+build-depends:
-+- public-stacks/buildsystem-autotools.bst
-+- components/systemd.bst
-+
-+variables:
-+ conf-local: >-
-+ --enable-library
-+
-+public:
-+ bst:
-+ split-rules:
-+ devel:
-+ (>):
-+ - '%{libdir}/libbluetooth.so'
-+
-+(@): elements/include/bluez.yml
-diff --git a/elements/include/bluez.yml b/elements/include/bluez.yml
-new file mode 100644
-index 00000000..1efd068d
---- /dev/null
-+++ b/elements/include/bluez.yml
-@@ -0,0 +1,5 @@
-+sources:
-+- kind: git_tag
-+ url: kernel:bluetooth/bluez.git
-+ track: master
-+ ref: 5.52-0-ge002fd43636090ac246f80f5de6195055384dfed
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/fdo-0001-Update-gcc-to-9.3.0.patch (264596 => 264597)
--- trunk/Tools/buildstream/patches/fdo-0001-Update-gcc-to-9.3.0.patch 2020-07-20 12:37:46 UTC (rev 264596)
+++ trunk/Tools/buildstream/patches/fdo-0001-Update-gcc-to-9.3.0.patch 2020-07-20 13:37:05 UTC (rev 264597)
@@ -1,26 +0,0 @@
-From 5cc0bc04e488de424af2dc63e72e89a1e1b89603 Mon Sep 17 00:00:00 2001
-From: Seppo Yli-Olli <[email protected]>
-Date: Sat, 14 Mar 2020 21:54:32 +0200
-Subject: [PATCH] Update gcc to 9.3.0
-
----
- elements/bootstrap/include/gcc-source.yml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/elements/bootstrap/include/gcc-source.yml b/elements/bootstrap/include/gcc-source.yml
-index 54b9001d..f111c238 100644
---- a/elements/bootstrap/include/gcc-source.yml
-+++ b/elements/bootstrap/include/gcc-source.yml
-@@ -1,7 +1,7 @@
- sources:
- - kind: tar
-- url: ftp_gnu_org:gcc/gcc-9.2.0/gcc-9.2.0.tar.xz
-- ref: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
-+ url: ftp_gnu_org:gcc/gcc-9.3.0/gcc-9.3.0.tar.xz
-+ ref: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
- - kind: tar
- url: ftp_gnu_org:gmp/gmp-6.1.2.tar.xz
- directory: gmp
---
-2.26.1
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
