* [PATCH 0/6] web/browser update
@ 2015-12-18 15:40 Alexander Kanavin
2015-12-18 15:40 ` [PATCH 1/6] gcr: update to 3.18.0 Alexander Kanavin
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw)
To: openembedded-core
This patchset updates the epiphany browser and webkitgtk engine
to latest upstream versions.
The following changes since commit 04e6fcc99d548660ab89ab06d05b25952fa38817:
mobile-broadband-provider-info: update to tagged release 20151214 (2015-12-18 16:43:30 +0200)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alexander Kanavin (6):
gcr: update to 3.18.0
gnome-desktop3: update to 3.18.2
libsecret: update to 0.18.3
libwebp: update to 0.4.4
epiphany: update to 3.18.2
webkitgtk: update to 2.10.4
.../{epiphany_3.16.3.bb => epiphany_3.18.2.bb} | 4 +-
.../gcr/{gcr_3.16.0.bb => gcr_3.18.0.bb} | 4 +-
...desktop3_3.16.2.bb => gnome-desktop3_3.18.2.bb} | 4 +-
.../{libsecret_0.18.2.bb => libsecret_0.18.3.bb} | 4 +-
.../webp/{libwebp_0.4.3.bb => libwebp_0.4.4.bb} | 6 +-
...fixes-a-command-line-that-is-too-long-ove.patch | 91 ----------------------
...ailure-with-ACCELERATED_2D_CANVAS-when-ca.patch | 35 ---------
meta/recipes-sato/webkit/webkitgtk/gcc5.patch | 26 -------
.../{webkitgtk_2.8.5.bb => webkitgtk_2.10.4.bb} | 20 ++---
9 files changed, 22 insertions(+), 172 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.16.3.bb => epiphany_3.18.2.bb} (84%)
rename meta/recipes-gnome/gcr/{gcr_3.16.0.bb => gcr_3.18.0.bb} (79%)
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.16.2.bb => gnome-desktop3_3.18.2.bb} (83%)
rename meta/recipes-gnome/libsecret/{libsecret_0.18.2.bb => libsecret_0.18.3.bb} (71%)
rename meta/recipes-multimedia/webp/{libwebp_0.4.3.bb => libwebp_0.4.4.bb} (89%)
delete mode 100644 meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch
delete mode 100644 meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc5.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.8.5.bb => webkitgtk_2.10.4.bb} (83%)
--
2.6.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/6] gcr: update to 3.18.0 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin @ 2015-12-18 15:40 ` Alexander Kanavin 2015-12-18 15:40 ` [PATCH 2/6] gnome-desktop3: update to 3.18.2 Alexander Kanavin ` (4 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw) To: openembedded-core Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> --- meta/recipes-gnome/gcr/{gcr_3.16.0.bb => gcr_3.18.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/gcr/{gcr_3.16.0.bb => gcr_3.18.0.bb} (79%) diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.18.0.bb similarity index 79% rename from meta/recipes-gnome/gcr/gcr_3.16.0.bb rename to meta/recipes-gnome/gcr/gcr_3.18.0.bb index e50b3a8..0636afe 100644 --- a/meta/recipes-gnome/gcr/gcr_3.16.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.18.0.bb @@ -11,8 +11,8 @@ inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "d5835680be0b6a838e02a528d5378d9c" -SRC_URI[archive.sha256sum] = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075" +SRC_URI[archive.md5sum] = "b959bac99e17c9bb0990a15c9be11aed" +SRC_URI[archive.sha256sum] = "d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00" FILES_${PN} += " \ ${datadir}/dbus-1 \ -- 2.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/6] gnome-desktop3: update to 3.18.2 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin 2015-12-18 15:40 ` [PATCH 1/6] gcr: update to 3.18.0 Alexander Kanavin @ 2015-12-18 15:40 ` Alexander Kanavin 2015-12-18 15:40 ` [PATCH 3/6] libsecret: update to 0.18.3 Alexander Kanavin ` (3 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw) To: openembedded-core Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> --- .../{gnome-desktop3_3.16.2.bb => gnome-desktop3_3.18.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.16.2.bb => gnome-desktop3_3.18.2.bb} (83%) diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb similarity index 83% rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb index 43546ce..09850d6 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ BPN = "gnome-desktop" inherit gnome pkgconfig upstream-version-is-even -SRC_URI[archive.md5sum] = "ab5bf4cc94ad63639f42adcc1542b1f0" -SRC_URI[archive.sha256sum] = "3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0" +SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d" +SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56" DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification xkeyboard-config iso-codes" -- 2.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/6] libsecret: update to 0.18.3 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin 2015-12-18 15:40 ` [PATCH 1/6] gcr: update to 3.18.0 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 2/6] gnome-desktop3: update to 3.18.2 Alexander Kanavin @ 2015-12-18 15:40 ` Alexander Kanavin 2015-12-18 15:40 ` [PATCH 4/6] libwebp: update to 0.4.4 Alexander Kanavin ` (2 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw) To: openembedded-core Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> --- .../libsecret/{libsecret_0.18.2.bb => libsecret_0.18.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/libsecret/{libsecret_0.18.2.bb => libsecret_0.18.3.bb} (71%) diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.3.bb similarity index 71% rename from meta/recipes-gnome/libsecret/libsecret_0.18.2.bb rename to meta/recipes-gnome/libsecret/libsecret_0.18.3.bb index a1dcc78..5058427 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.3.bb @@ -8,8 +8,8 @@ DEPENDS = "glib-2.0 libgcrypt gettext-native intltool-native" EXTRA_OECONF += "--disable-manpages" -SRC_URI[archive.md5sum] = "23cdf8267d11a26f88f0dbec1e2022ad" -SRC_URI[archive.sha256sum] = "12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443" +SRC_URI[archive.md5sum] = "a21605644a64883ab685aec50d63253e" +SRC_URI[archive.sha256sum] = "f2bf1d0c5ab4640664f3e3c7ef6b086c180e50ff415720b5e22f96750dbf84c9" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET = "arm" -- 2.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/6] libwebp: update to 0.4.4 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin ` (2 preceding siblings ...) 2015-12-18 15:40 ` [PATCH 3/6] libsecret: update to 0.18.3 Alexander Kanavin @ 2015-12-18 15:40 ` Alexander Kanavin 2015-12-18 15:40 ` [PATCH 5/6] epiphany: update to 3.18.2 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 6/6] webkitgtk: update to 2.10.4 Alexander Kanavin 5 siblings, 0 replies; 7+ messages in thread From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw) To: openembedded-core PATENTS file had a few rewordings: https://github.com/webmproject/libwebp/commits/master/PATENTS Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> --- meta/recipes-multimedia/webp/{libwebp_0.4.3.bb => libwebp_0.4.4.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-multimedia/webp/{libwebp_0.4.3.bb => libwebp_0.4.4.bb} (89%) diff --git a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb b/meta/recipes-multimedia/webp/libwebp_0.4.4.bb similarity index 89% rename from meta/recipes-multimedia/webp/libwebp_0.4.3.bb rename to meta/recipes-multimedia/webp/libwebp_0.4.4.bb index 1285bc1..ce317d2 100644 --- a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb +++ b/meta/recipes-multimedia/webp/libwebp_0.4.4.bb @@ -11,11 +11,11 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ - file://PATENTS;md5=ad2580aee35468675c44d7bebba65ca8" + file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" -SRC_URI[md5sum] = "08813525eeeffe7e305b4cbfade8ae9b" -SRC_URI[sha256sum] = "efbe0d58fda936f2ed99d0b837ed7087d064d6838931f282c4618d2a3f7390c4" +SRC_URI[md5sum] = "b737062cf688e502b940b460ddc3015f" +SRC_URI[sha256sum] = "c65d34edb57338e331ba4d622227a2b3179444cfca17d02c34f1ead63f603e86" UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" -- 2.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/6] epiphany: update to 3.18.2 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin ` (3 preceding siblings ...) 2015-12-18 15:40 ` [PATCH 4/6] libwebp: update to 0.4.4 Alexander Kanavin @ 2015-12-18 15:40 ` Alexander Kanavin 2015-12-18 15:40 ` [PATCH 6/6] webkitgtk: update to 2.10.4 Alexander Kanavin 5 siblings, 0 replies; 7+ messages in thread From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw) To: openembedded-core Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> --- .../recipes-gnome/epiphany/{epiphany_3.16.3.bb => epiphany_3.18.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_3.16.3.bb => epiphany_3.18.2.bb} (84%) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.18.2.bb similarity index 84% rename from meta/recipes-gnome/epiphany/epiphany_3.16.3.bb rename to meta/recipes-gnome/epiphany/epiphany_3.18.2.bb index 09633a6..a0d1e67 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.18.2.bb @@ -10,8 +10,8 @@ inherit gnomebase gsettings distro_features_check upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch" -SRC_URI[archive.md5sum] = "3296af4532b8019775f4b40d21a341ae" -SRC_URI[archive.sha256sum] = "d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1" +SRC_URI[archive.md5sum] = "ede1e5e7e420a2f4c6231d185a94250f" +SRC_URI[archive.sha256sum] = "8436170731966bb40b7d8e29dbedfa5d5ddbf78572cf5fd51fce1ac6da5da6c2" EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO}" -- 2.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 6/6] webkitgtk: update to 2.10.4 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin ` (4 preceding siblings ...) 2015-12-18 15:40 ` [PATCH 5/6] epiphany: update to 3.18.2 Alexander Kanavin @ 2015-12-18 15:40 ` Alexander Kanavin 5 siblings, 0 replies; 7+ messages in thread From: Alexander Kanavin @ 2015-12-18 15:40 UTC (permalink / raw) To: openembedded-core Drop backported patches (which means, all the patches). Replace a few hardcoded dependencies with PACKAGECONFIG entries. Add a PACKAGECONFIG entry for libhyphen. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> --- ...fixes-a-command-line-that-is-too-long-ove.patch | 91 ---------------------- ...ailure-with-ACCELERATED_2D_CANVAS-when-ca.patch | 35 --------- meta/recipes-sato/webkit/webkitgtk/gcc5.patch | 26 ------- .../{webkitgtk_2.8.5.bb => webkitgtk_2.10.4.bb} | 20 ++--- 4 files changed, 11 insertions(+), 161 deletions(-) delete mode 100644 meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch delete mode 100644 meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc5.patch rename meta/recipes-sato/webkit/{webkitgtk_2.8.5.bb => webkitgtk_2.10.4.bb} (83%) diff --git a/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch b/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch deleted file mode 100644 index 28b3420..0000000 --- a/meta/recipes-sato/webkit/files/0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 22d5063c551d3c08c0a4ad8b80e08b793d53093d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 10 Sep 2015 16:23:27 +0300 -Subject: [PATCH] This patch fixes a command line that is too long (over 100K!) - and is rejected by /bin/sh. - -Upstream-Status: Backport [should appear in 2.10, http://trac.webkit.org/changeset/184856] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - Source/WebKit2/PlatformGTK.cmake | 11 ++++++----- - Tools/gtk/generate-inspector-gresource-manifest.py | 16 ++++++++++++---- - 2 files changed, 18 insertions(+), 9 deletions(-) - -diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake -index a13af7c..058c241 100644 ---- a/Source/WebKit2/PlatformGTK.cmake -+++ b/Source/WebKit2/PlatformGTK.cmake -@@ -408,7 +408,7 @@ set(WebKit2WebExtension_INSTALLED_HEADERS - ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h - ) - --file(GLOB InspectorFiles -+set(InspectorFiles - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css -@@ -423,13 +423,14 @@ file(GLOB InspectorFiles - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg --) -- --list(APPEND InspectorFiles - ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js - ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js - ) - -+file(GLOB InspectorFilesDependencies -+ ${InspectorFiles} -+) -+ - # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore. - list(INSERT WebKit2_INCLUDE_DIRECTORIES 0 - "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}" -@@ -564,7 +565,7 @@ add_custom_command( - - add_custom_command( - OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml -- DEPENDS ${InspectorFiles} -+ DEPENDS ${InspectorFilesDependencies} - ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py - COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} - VERBATIM -diff --git a/Tools/gtk/generate-inspector-gresource-manifest.py b/Tools/gtk/generate-inspector-gresource-manifest.py -index 0687c4c..03060cf 100755 ---- a/Tools/gtk/generate-inspector-gresource-manifest.py -+++ b/Tools/gtk/generate-inspector-gresource-manifest.py -@@ -16,6 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - import argparse -+import glob - import os - import sys - -@@ -26,10 +27,17 @@ BASE_DIR = 'WebInspectorUI/' - def get_filenames(args): - filenames = [] - -- for filename in args: -- base_dir_index = filename.rfind(BASE_DIR) -- if base_dir_index != -1: -- filenames.append(filename[base_dir_index + len(BASE_DIR):]) -+ for pattern in args: -+ paths = glob.glob(pattern) -+ for filename in paths: -+ base_dir_index = filename.rfind(BASE_DIR) -+ if base_dir_index != -1: -+ name = filename[base_dir_index + len(BASE_DIR):] -+ # The result should use forward slashes, thus make sure any os-specific -+ # separator, added by the glob.glob() call, is properly replaced -+ if os.sep != '/': -+ name = name.replace(os.sep, '/') -+ filenames.append(name) - return filenames - - --- -2.1.4 - diff --git a/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch b/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch deleted file mode 100644 index e95c0e4..0000000 --- a/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ea42d4fa6f3f6dd18c37cb7b6e1faea6afefba4 Mon Sep 17 00:00:00 2001 -From: "clopez@igalia.com" <clopez@igalia.com> -Date: Tue, 15 Sep 2015 21:50:18 +0000 -Subject: [PATCH] [GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has - built with OpenGLESv2 support only. - -When cairo-gl is built with GLX and ACCELERATED_2D_CANVAS if cairo-gl was only -built with OpenGLESv2, cairo-glx is not enabled causing -Source/WebCore/platform/graphics/glx/GLContextGLX.cpp to reference an undeclared -function and cause a compliation error. Adding an extra check resolves this -build failure. - -Upstream-Status: Backport [webkit-2.10.0] - -Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com> ---- - Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp -index 7890d8d..4ed3a43 100644 ---- a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp -+++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp -@@ -266,7 +266,7 @@ cairo_device_t* GLContextGLX::cairoDevice() - if (m_cairoDevice) - return m_cairoDevice; - --#if ENABLE(ACCELERATED_2D_CANVAS) -+#if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS - m_cairoDevice = cairo_glx_device_create(sharedX11Display(), m_context); - #endif - --- -2.6.2 - diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch b/meta/recipes-sato/webkit/webkitgtk/gcc5.patch deleted file mode 100644 index 5951a81..0000000 --- a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -JSObject: Create explicit instantiation of putByIndexBeyondVectorLengthWithoutAttributes - -Reason for change: newer gcc might optimize away the templates -and they wont be available for other .cpp files to use as these -are used in a different .cpp we need to tell compiler to explicitly -instantiate them. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -Index: webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp -=================================================================== ---- webkitgtk-2.8.5.orig/Source/JavaScriptCore/runtime/JSObject.cpp -+++ webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp -@@ -1965,6 +1965,10 @@ void JSObject::putByIndexBeyondVectorLen - } - } - -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.4.bb similarity index 83% rename from meta/recipes-sato/webkit/webkitgtk_2.8.5.bb rename to meta/recipes-sato/webkit/webkitgtk_2.10.4.bb index aa5e6c9..4d5aeb4 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.10.4.bb @@ -12,27 +12,28 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "\ http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \ - file://0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch \ - file://gcc5.patch \ " -SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" -SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20" +SRC_URI[md5sum] = "fb010031c6f61c3a1a00793b112badb5" +SRC_URI[sha256sum] = "dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055" inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even # depends on libxt REQUIRED_DISTRO_FEATURES = "x11" -DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ - gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ + gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gnome-common gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ - ruby-native libsecret libnotify gstreamer1.0-plugins-bad \ + ruby-native libnotify gstreamer1.0-plugins-bad \ " PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)}" + ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ + enchant \ + gtk2 \ + libsecret \ + " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" @@ -42,6 +43,7 @@ PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_G PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" EXTRA_OECMAKE = " \ -DPORT=GTK \ -- 2.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-12-18 15:43 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-18 15:40 [PATCH 0/6] web/browser update Alexander Kanavin 2015-12-18 15:40 ` [PATCH 1/6] gcr: update to 3.18.0 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 2/6] gnome-desktop3: update to 3.18.2 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 3/6] libsecret: update to 0.18.3 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 4/6] libwebp: update to 0.4.4 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 5/6] epiphany: update to 3.18.2 Alexander Kanavin 2015-12-18 15:40 ` [PATCH 6/6] webkitgtk: update to 2.10.4 Alexander Kanavin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox