All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Devoogdt <thomas@devoogdt.com>
To: buildroot@buildroot.org
Cc: Adrian Perez de Castro <aperez@igalia.com>,
	Thomas Devoogdt <thomas.devoogdt@gmail.com>
Subject: [Buildroot] [PATCH] package/webkitgtk: bump to version 2.37.1
Date: Mon,  5 Sep 2022 14:25:22 +0200	[thread overview]
Message-ID: <20220905122522.731095-1-thomas@devoogdt.com> (raw)

From: Thomas Devoogdt <thomas.devoogdt@gmail.com>

Update to a new major release which brings in improvements and a few new
features. Release notes:

https://webkitgtk.org/2022/07/12/webkitgtk2.37.1-released.html

The build option ENABLE_GTKDOC has been replaced by
ENABLE_DOCUMENTATION.
https://github.com/WebKit/WebKit/commit/b0ae032850bb6b2672051bab8032fc9f9ef5eb97

Cmake 3.20 is now required!
https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f

A small patch (cherry-pick) was required to get it compiled.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
 ...ld-fixes-early-ish-July-2022-edition.patch | 111 ++++++++++++++++++
 package/webkitgtk/webkitgtk.hash              |   8 +-
 package/webkitgtk/webkitgtk.mk                |   3 +-
 3 files changed, 116 insertions(+), 6 deletions(-)
 create mode 100644 package/webkitgtk/0001-Non-unified-build-fixes-early-ish-July-2022-edition.patch

diff --git a/package/webkitgtk/0001-Non-unified-build-fixes-early-ish-July-2022-edition.patch b/package/webkitgtk/0001-Non-unified-build-fixes-early-ish-July-2022-edition.patch
new file mode 100644
index 0000000000..8e15e37a11
--- /dev/null
+++ b/package/webkitgtk/0001-Non-unified-build-fixes-early-ish-July-2022-edition.patch
@@ -0,0 +1,111 @@
+From b7940becf07f182f3331116d8677b20e99354a46 Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Thu, 14 Jul 2022 01:41:19 -0700
+Subject: [PATCH] Non-unified build fixes, early-ish July 2022 edition
+ https://bugs.webkit.org/show_bug.cgi?id=242688
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Unreviewed non-unified build fixes.
+
+* Source/WebCore/html/ValidityState.h: Add missing HTMLElement.h header.
+* Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp: Add
+  missing FlexFormattingContext.h header.
+* Source/WebCore/page/ResizeObservation.cpp: Add missing Logging.h header.
+* Source/WebCore/rendering/RenderBlock.cpp: Add missing RenderGrid.h header.
+* Source/WebCore/rendering/RenderLayer.cpp: Add missing
+  wtf/IsoMallocInlines.h header.
+
+Canonical link: https://commits.webkit.org/252445@main
+
+(cherry picked from commit fa6290046ee65fc3587f517d0f095f24dbecd85e)
+
+In file included from /home/thomas/buildroot/output/build/webkitgtk-2.37.1/WebCore/DerivedSources/JSValidityState.h:24,
+                 from /home/thomas/buildroot/output/build/webkitgtk-2.37.1/WebCore/DerivedSources/JSValidityState.cpp:22,
+                 from /home/thomas/buildroot/output/build/webkitgtk-2.37.1/WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-143.cpp:6:
+/home/thomas/buildroot/output/build/webkitgtk-2.37.1/Source/WebCore/html/ValidityState.h: In member function ‘WebCore::Element* WebCore::ValidityState::element()’:
+/home/thomas/buildroot/output/build/webkitgtk-2.37.1/Source/WebCore/html/ValidityState.h:35:48: error: cannot convert ‘WebCore::HTMLElement*’ to ‘WebCore::Element*’ in return
+     Element* element() { return &asHTMLElement(); }
+                                                ^
+
+In file included from /home/thomas/buildroot/output/build/webkitgtk-2.37.1/WebCore/DerivedSources/JSValidityState.h:24,
+                 from /home/thomas/buildroot/output/build/webkitgtk-2.37.1/WebCore/DerivedSources/JSValidityState.cpp:22,
+                 from /home/thomas/buildroot/output/build/webkitgtk-2.37.1/WebCore/DerivedSources/unified-sources/UnifiedSource-3a52ce78-143.cpp:6:
+/home/thomas/buildroot/output/build/webkitgtk-2.37.1/Source/WebCore/html/ValidityState.h: In member function ‘WebCore::Node* WebCore::ValidityState::opaqueRootConcurrently()’:
+/home/thomas/buildroot/output/build/webkitgtk-2.37.1/Source/WebCore/html/ValidityState.h:36:60: error: cannot convert ‘WebCore::HTMLElement*’ to ‘WebCore::Node*’ in return
+     Node* opaqueRootConcurrently() { return &asHTMLElement(); }
+                                                            ^
+
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
+---
+ Source/WebCore/html/ValidityState.h                          | 1 +
+ Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp | 1 +
+ Source/WebCore/page/ResizeObservation.cpp                    | 1 +
+ Source/WebCore/rendering/RenderBlock.cpp                     | 1 +
+ Source/WebCore/rendering/RenderLayer.cpp                     | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/Source/WebCore/html/ValidityState.h b/Source/WebCore/html/ValidityState.h
+index 5d3321d1f3b4..f5faaeaec3a3 100644
+--- a/Source/WebCore/html/ValidityState.h
++++ b/Source/WebCore/html/ValidityState.h
+@@ -23,6 +23,7 @@
+ #pragma once
+ 
+ #include "FormAssociatedElement.h"
++#include "HTMLElement.h"
+ 
+ namespace WebCore {
+ 
+diff --git a/Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp b/Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp
+index a3b91e20373d..6142c378001d 100644
+--- a/Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp
++++ b/Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp
+@@ -28,6 +28,7 @@
+ 
+ #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+ 
++#include "FlexFormattingContext.h"
+ #include "FlexRect.h"
+ #include "LayoutContext.h"
+ 
+diff --git a/Source/WebCore/page/ResizeObservation.cpp b/Source/WebCore/page/ResizeObservation.cpp
+index 89fc65634882..246b46c772ad 100644
+--- a/Source/WebCore/page/ResizeObservation.cpp
++++ b/Source/WebCore/page/ResizeObservation.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include "ElementInlines.h"
+ #include "HTMLFrameOwnerElement.h"
++#include "Logging.h"
+ #include "RenderBox.h"
+ #include "SVGElement.h"
+ 
+diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
+index f8c4d1ce5981..0177f376066e 100644
+--- a/Source/WebCore/rendering/RenderBlock.cpp
++++ b/Source/WebCore/rendering/RenderBlock.cpp
+@@ -58,6 +58,7 @@
+ #include "RenderDeprecatedFlexibleBox.h"
+ #include "RenderFlexibleBox.h"
+ #include "RenderFragmentedFlow.h"
++#include "RenderGrid.h"
+ #include "RenderInline.h"
+ #include "RenderIterator.h"
+ #include "RenderLayer.h"
+diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
+index c9d6ce9c514d..e568fdeffb71 100644
+--- a/Source/WebCore/rendering/RenderLayer.cpp
++++ b/Source/WebCore/rendering/RenderLayer.cpp
+@@ -138,6 +138,7 @@
+ #include "WheelEventTestMonitor.h"
+ #include <stdio.h>
+ #include <wtf/HexNumber.h>
++#include <wtf/IsoMallocInlines.h>
+ #include <wtf/MonotonicTime.h>
+ #include <wtf/StdLibExtras.h>
+ #include <wtf/text/CString.h>
+-- 
+2.37.2
+
diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 7c6d7d65b5..5d6b223291 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,7 +1,7 @@
-# From https://webkitgtk.org/releases/webkitgtk-2.36.7.tar.xz.sums
-md5  466351cf35e4f742590919380b5dee93  webkitgtk-2.36.7.tar.xz
-sha1  36078148b6e0ef002f0279b25b1caf173f851ac8  webkitgtk-2.36.7.tar.xz
-sha256  0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743  webkitgtk-2.36.7.tar.xz
+# From https://webkitgtk.org/releases/webkitgtk-2.37.1.tar.xz.sums
+md5  11a5a291784349cc26b892bfdadeff87  webkitgtk-2.37.1.tar.xz
+sha1  c61cc88556653dc8295fd6c463dc02b3357fb2c0  webkitgtk-2.37.1.tar.xz
+sha256  c53326b1751f8c6da3db2f4bfa91c1801755893e287d0e1f6c07344589d4a6a7  webkitgtk-2.37.1.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index d1c517452d..e8fe613a8f 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.36.7
+WEBKITGTK_VERSION = 2.37.1
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
@@ -20,7 +20,6 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_API_TESTS=OFF \
 	-DENABLE_GAMEPAD=OFF \
 	-DENABLE_GEOLOCATION=OFF \
-	-DENABLE_GTKDOC=OFF \
 	-DENABLE_MINIBROWSER=ON \
 	-DENABLE_SPELLCHECK=ON \
 	-DPORT=GTK \
-- 
2.37.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2022-09-05 12:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-05 12:25 Thomas Devoogdt [this message]
2022-09-05 13:20 ` [Buildroot] [PATCH] package/webkitgtk: bump to version 2.37.1 Adrian Perez de Castro
2022-09-05 13:47   ` Thomas Petazzoni via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220905122522.731095-1-thomas@devoogdt.com \
    --to=thomas@devoogdt.com \
    --cc=aperez@igalia.com \
    --cc=buildroot@buildroot.org \
    --cc=thomas.devoogdt@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.