Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 14/24] webkitgtk: update 2.30.4 -> 2.30.5
Date: Sun, 28 Feb 2021 16:36:52 +0100	[thread overview]
Message-ID: <20210228153702.498275-14-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20210228153702.498275-1-alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 14 +++++++-------
 .../{webkitgtk_2.30.4.bb => webkitgtk_2.30.5.bb}   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.30.4.bb => webkitgtk_2.30.5.bb} (98%)

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
index aa9a06701a..0c31c5fa21 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -1,4 +1,4 @@
-From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001
+From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 29 Aug 2016 16:38:11 +0300
 Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
@@ -11,12 +11,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index a074a80..8c6ebb5 100644
+index a069c5f6..ea2f542b 100644
 --- a/Source/WebKit/PlatformGTK.cmake
 +++ b/Source/WebKit/PlatformGTK.cmake
-@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION)
-     string(REGEX MATCHALL "-L[^ ]*"
-         INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION)
+         set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
+     endif ()
  
 -    add_custom_command(
 -        OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -26,7 +26,7 @@ index a074a80..8c6ebb5 100644
          DEPENDS WebKit
          DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
          COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
-@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION)
+@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION)
      add_custom_command(
          OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
          DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -35,7 +35,7 @@ index a074a80..8c6ebb5 100644
          COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
              LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
              ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION)
+@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION)
  
      add_custom_command(
          OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.30.4.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.30.5.bb
index a16a676d7a..2928b8e55b 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb
@@ -19,7 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://include_array.patch \
            file://include_xutil.patch \
            "
-SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24"
+SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-- 
2.29.2


  parent reply	other threads:[~2021-02-28 15:37 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-28 15:36 [PATCH 01/24] webkit/wpe: only check even versions Alexander Kanavin
2021-02-28 15:36 ` [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6 Alexander Kanavin
2021-02-28 18:35   ` [OE-core] " Khem Raj
2021-02-28 19:08     ` Alexander Kanavin
2021-02-28 19:20       ` Khem Raj
2021-02-28 19:23         ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 03/24] dnf: upgrade 4.5.2 -> 4.6.0 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 04/24] ccache: update 4.1 -> 4.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 05/24] dosfstools: " Alexander Kanavin
2021-02-28 18:40   ` [OE-core] " Khem Raj
2021-02-28 19:10     ` Alexander Kanavin
2021-02-28 19:20       ` Khem Raj
2021-03-01 14:32         ` Colin Finck
2021-03-01 16:57           ` [OE-core] " Alexander Kanavin
2021-03-02 13:25             ` Colin Finck
2021-03-02 13:36               ` [OE-core] " Alexander Kanavin
2021-03-03 16:16                 ` Martin Jansa
2021-03-03 16:34                   ` Khem Raj
2021-03-03 16:58                     ` Martin Jansa
2021-03-03 17:09                       ` Colin Finck
2021-03-03 17:01                     ` Colin Finck
2021-03-03 16:28                 ` Steve Sakoman
2021-02-28 15:36 ` [PATCH 06/24] e2fsprogs: update 1.45.7 -> 1.46.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 07/24] elfutils: update 0.182 -> 0.183 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0 Alexander Kanavin
2021-02-28 19:04   ` [OE-core] " Khem Raj
2021-02-28 19:07     ` Alexander Kanavin
2021-02-28 19:30       ` Khem Raj
2021-03-01 11:53         ` Alexander Kanavin
2021-03-08 22:29           ` Richard Purdie
2021-03-09 19:50             ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 09/24] librepo: update 1.12.1 -> 1.13.0 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 10/24] meson: update 0.56.2 -> 0.57.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 11/24] perl: update 5.32.0 -> 5.32.1 Alexander Kanavin
2021-03-01  8:03   ` [OE-core] " Khem Raj
2021-03-01 22:40     ` Khem Raj
2021-03-02  9:19       ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 12/24] pango: update 1.48.0 -> 1.48.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 13/24] vulkan-samples: update to latest revision Alexander Kanavin
2021-02-28 15:36 ` Alexander Kanavin [this message]
2021-02-28 15:36 ` [PATCH 15/24] libgcrypt: update 1.8.7 -> 1.9.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 16/24] libical: update 3.0.8 -> 3.0.9 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 17/24] pinentry: update 1.1.0 -> 1.1.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 18/24] procps: update 3.3.16 -> 3.3.17 Alexander Kanavin
2021-02-28 19:10   ` [OE-core] " Khem Raj
2021-03-08 22:47     ` Richard Purdie
2021-03-09 12:04       ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 19/24] libmd: add a recipe Alexander Kanavin
2021-02-28 15:36 ` [PATCH 20/24] libbsd: udpate 0.10.0 -> 0.11.3 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 21/24] syslinux: use NO_INLINE_FUNCS in CFLAGS Alexander Kanavin
2021-02-28 15:37 ` [PATCH 22/24] scripts/lib/wic/partition.py: do not set FAT size Alexander Kanavin
2021-02-28 19:16   ` [OE-core] " Khem Raj
2021-02-28 19:21     ` Alexander Kanavin
2021-02-28 15:37 ` [PATCH 23/24] openssl: address ptest failures caused by perl 5.32.1 Alexander Kanavin
2021-02-28 15:37 ` [PATCH 24/24] ptest-perl/run-ptest: address " Alexander Kanavin

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=20210228153702.498275-14-alex.kanavin@gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox