webkitgtk: update to 2.22.3
PATCH 1/4 webkitgtk: update to 2.22.3
Remove upstreamed patches.
Add a tweak to 0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch for Javascriptcore gir file (previously it was pre-compiled in tarballs).
Rebase 0001-Fix-build-with-musl.patch
Signed-off-by Alexander Kanavin <[email protected]>
---
...-has-no-member-named-lightVector-on-.patch | 37 ----------------
.../webkitgtk/0001-Fix-build-with-musl.patch | 36 +++++++--------
...trospection-files-add-CMAKE_C_FLAGS-.patch | 26 ++++++++---
.../0001-webkitgtk-fix-CVE-2017-17821.patch | 44 -------------------
.../0012-soup-Forward-declare-URL-class.patch | 31 -------------
...ebkitgtk_2.20.5.bb => webkitgtk_2.22.3.bb} | 7 +--
6 files changed, 40 insertions(+), 141 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.20.5.bb => webkitgtk_2.22.3.bb} (94%)meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From a5d4e038268ae23486fecc1966fd2e16a7f40ce8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Wed, 25 Jul 2018 00:23:48 -0700 -Subject: [PATCH] Fix PaintingData' has no member named 'lightVector' on - ARM_NEON - -* platform/graphics/cpu/arm/filters/FELightingNEON.h: -(WebCore::FELighting::platformApplyNeon): - -Upstream-Status: Submitted -https://bugs.webkit.org/show_bug.cgi?id=187991 - -Signed-off-by: Hongxu Jia <[email protected]> ---- - Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index 42af922..b542a4c 100644 ---- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -@@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - neonData.flags |= FLAG_CONE_EXPONENT_IS_1; - } else { - ASSERT(m_lightSource->type() == LS_DISTANT); -- floatArguments.lightX = paintingData.lightVector.x(); -- floatArguments.lightY = paintingData.lightVector.y(); -- floatArguments.lightZ = paintingData.lightVector.z(); -+ floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); -+ floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); -+ floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); - floatArguments.padding2 = 1; - } - --- -2.10.2 -
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +18 -18
@@ -1,4 +1,4 @@ -From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001 +From 322966273a8e085829261a397af37de0fbf51aad Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 6 Oct 2017 17:00:08 +0300 Subject: [PATCH] Fix build with musl
@@ -7,69 +7,69 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <[email protected]> --- - Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- Source/WTF/wtf/Platform.h | 2 +- - 2 files changed, 18 insertions(+), 2 deletions(-) + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h -index bf0bdc7..84b8a8a 100644 +index 836d755..7665d25 100644 --- a/Source/JavaScriptCore/runtime/MachineContext.h +++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) +@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) #if CPU(X86) return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) +@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) +@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) +@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) +@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 551c047..e50b05a 100644 +index a841946..1e5c7dd 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h -@@ -683,7 +683,7 @@ +@@ -701,7 +701,7 @@ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 #endif --#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) +-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) #define HAVE_MACHINE_CONTEXT 1 #endif
meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +20 -6
@@ -1,4 +1,4 @@ -From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001 +From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 28 Oct 2015 14:18:57 +0200 Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
@@ -11,14 +11,28 @@ Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <[email protected]> --- - Source/WebKit/PlatformGTK.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Source/JavaScriptCore/PlatformGTK.cmake | 2 +- + Source/WebKit/PlatformGTK.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake +index 0b2968d2..2742ad80 100644 +--- a/Source/JavaScriptCore/PlatformGTK.cmake ++++ b/Source/JavaScriptCore/PlatformGTK.cmake +@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + DEPENDS JavaScriptCore +- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= ++ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} + --quiet diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index dc6b306..a074a80 100644 +index e36e4c35..943f9794 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION) +@@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION) OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir DEPENDS WebKit DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -27,7 +41,7 @@ index dc6b306..a074a80 100644 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} --quiet -@@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION) +@@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION) OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 20 May 2018 14:28:27 -0700 -Subject: [PATCH] soup: Forward declare URL class - -This helps getting away with compiler errors seen with clang - -/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: -error: unknown type name 'URL' - static std::optional<ResourceError> checkTLSErrors(const URL&, -GTlsCertificate*, GTlsCertificateFlags); - ^ -Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit] - -Signed-off-by: Khem Raj <[email protected]> ---- - Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h -index 03bd72ba..7ca8792d 100644 ---- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h -+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h -@@ -43,6 +43,7 @@ namespace WebCore { - - class CertificateInfo; - class ResourceError; -+class URL; - struct SoupNetworkProxySettings; - - class SoupNetworkSession {
meta/recipes-sato/webkit/webkitgtk_2.22.3.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.20.5.bb +2 -5
@@ -20,13 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ file://detect-gstreamer-gl.patch \ - file://0012-soup-Forward-declare-URL-class.patch \ - file://0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch \ - file://0001-webkitgtk-fix-CVE-2017-17821.patch \ " -SRC_URI[md5sum] = "72a05f6a4dc1c78b079590a8fd280401" -SRC_URI[sha256sum] = "15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990" +SRC_URI[md5sum] = "6dae6837c884a25413fb1d4527c9894a" +SRC_URI[sha256sum] = "9dfd542902953be9af8ff32bd37fe662ca3d75f7348514ebac15c6252a6ccd72" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.17.1
PATCH 2/4 epiphany: update to 3.30.2
libdazzle is a new requirement
Signed-off-by Alexander Kanavin <[email protected]>
---
.../epiphany/{epiphany_3.28.3.1.bb => epiphany_3.30.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.28.3.1.bb => epiphany_3.30.2.bb} (80%)meta/recipes-gnome/epiphany/epiphany_3.30.2.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb +3 -3
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib" + glib-2.0 glib-2.0-native json-glib libdazzle" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "31a4a443e8e22f085a10f80b7e41d5f3" -SRC_URI[archive.sha256sum] = "690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7" +SRC_URI[archive.md5sum] = "1b7c072880562c33f52a3347a94bfe6c" +SRC_URI[archive.sha256sum] = "8c7ef1e51b9fa825a43a603265ce8b06cacc42229e9337c8611c357bc65a8104" EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
Signature · 1 line
2.17.1
PATCH 3/4 libdazzle: add recipe
In reply to Alexander KanavinThis is a new requirement of epiphany web browser.
Signed-off-by Alexander Kanavin <[email protected]>
--- .../recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb new file +17 -0
@@ -0,0 +1,17 @@ +SUMMARY = "The libdazzle library is a companion library to GObject and Gtk+." +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase upstream-version-is-even vala gobject-introspection + +DEPENDS = "glib-2.0-native glib-2.0 gtk+3" + +SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" +SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5" + +GI_ENABLE_FLAG = "-Dwith_introspection=true" +GI_DISABLE_FLAG = "-Dwith_introspection=false" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} "
Signature · 1 line
2.17.1
PATCH 4/4 gtk+3: update to 3.24.1
In reply to Alexander KanavinSigned-off-by Alexander Kanavin <[email protected]>
---
...-Add-disable-opengl-configure-option.patch | 103 +++++++++---------
.../{gtk+3_3.22.30.bb => gtk+3_3.24.1.bb} | 4 +-
2 files changed, 52 insertions(+), 55 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.30.bb => gtk+3_3.24.1.bb} (83%)meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +50 -53
@@ -1,7 +1,7 @@ -From de36df70d87ba3453ed4f2b92e990021c67238f5 Mon Sep 17 00:00:00 2001 +From 9e243474eea4330b593e0f6dd418b61b79699d8b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 21 Jun 2016 15:11:39 +0300 -Subject: [PATCH 3/4] Add --disable-opengl configure option +Subject: [PATCH] Add --disable-opengl configure option --disable-opengl will remove the dependency on libepoxy and on the OpenGL APIs. This is useful for those who want to keep using gtk+3
@@ -21,32 +21,32 @@ Upstream-Status: Inappropriate [Evil eye expected from upstream] Signed-off-by: Jussi Kukkonen <[email protected]> --- - configure.ac | 13 +++++-- - demos/gtk-demo/glarea.c | 14 ++++++++ - docs/tools/Makefile.am | 9 +++-- - docs/tools/widgets.c | 4 ++- - gdk/gdkdisplay.c | 4 ++- - gdk/gdkgl.c | 10 ++++++ - gdk/gdkglcontext.c | 6 ++++ - gdk/gdkwindow.c | 13 +++++++ - gdk/x11/Makefile.am | 30 +++++++++++++--- - gdk/x11/gdkdisplay-x11.c | 6 +++- - gdk/x11/gdkscreen-x11.c | 5 +++ - gdk/x11/gdkwindow-x11.c | 4 +++ - gdk/x11/gdkx-autocleanups.h | 2 ++ + configure.ac | 13 ++++- + demos/gtk-demo/glarea.c | 14 ++++++ + docs/tools/Makefile.am | 9 +++- + docs/tools/widgets.c | 4 +- + gdk/gdkdisplay.c | 4 +- + gdk/gdkgl.c | 10 ++++ + gdk/gdkglcontext.c | 6 +++ + gdk/gdkwindow.c | 13 +++++ + gdk/x11/Makefile.am | 30 +++++++++-- + gdk/x11/gdkdisplay-x11.c | 6 ++- + gdk/x11/gdkscreen-x11.c | 5 ++ + gdk/x11/gdkwindow-x11.c | 4 ++ + gdk/x11/gdkx-autocleanups.h | 2 + gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 - - gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++ + gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++ gtk/Makefile.am | 3 +- - gtk/gtkglarea.c | 20 ++++++++++- - gtk/inspector/general.c | 6 ++++ - tests/Makefile.am | 10 ++++-- - testsuite/gtk/objects-finalize.c | 2 ++ + gtk/gtkglarea.c | 20 +++++++- + gtk/inspector/general.c | 6 +++ + tests/Makefile.am | 10 ++-- + testsuite/gtk/objects-finalize.c | 2 + 20 files changed, 202 insertions(+), 18 deletions(-) rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) create mode 100644 gdk/x11/gdkx-without-gl-context.h diff --git a/configure.ac b/configure.ac -index 0a48875..6f0a3a6 100644 +index a91b29c..561d3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders,
@@ -65,7 +65,7 @@ index 0a48875..6f0a3a6 100644 AC_ARG_ENABLE(glx, [AS_HELP_STRING([--enable-glx], [When enabled Gdk will try to initialize GLX])]) -@@ -1372,7 +1381,7 @@ CFLAGS="$saved_cflags" +@@ -1381,7 +1390,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
@@ -74,7 +74,7 @@ index 0a48875..6f0a3a6 100644 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -@@ -1406,7 +1415,7 @@ fi +@@ -1415,7 +1424,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
@@ -224,12 +224,12 @@ index 40225e9..c55e1de 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 8e7b8c2..b579b22 100644 +index 933e204..1767508 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c -@@ -22,7 +22,9 @@ - - #include "gdkinternals.h" +@@ -26,7 +26,9 @@ + # include "win32/gdkwin32.h" + #endif +#ifdef HAVE_OPENGL #include <epoxy/gl.h>
@@ -237,7 +237,7 @@ index 8e7b8c2..b579b22 100644 #include <math.h> #include <string.h> -@@ -36,6 +38,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, +@@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, g_object_ref (window), g_object_unref); }
@@ -245,7 +245,7 @@ index 8e7b8c2..b579b22 100644 static const char * get_vertex_type_name (int type) { -@@ -208,6 +211,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) +@@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) glUseProgram (paint_data->current_program->program); } }
@@ -253,7 +253,7 @@ index 8e7b8c2..b579b22 100644 void gdk_gl_texture_quads (GdkGLContext *paint_context, -@@ -216,6 +220,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, GdkTexturedQuad *quads, gboolean flip_colors) {
@@ -261,7 +261,7 @@ index 8e7b8c2..b579b22 100644 GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); GdkGLContextProgram *program; GdkWindow *window = gdk_gl_context_get_window (paint_context); -@@ -289,6 +294,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, glDisableVertexAttribArray (program->position_location); glDisableVertexAttribArray (program->uv_location);
@@ -269,7 +269,7 @@ index 8e7b8c2..b579b22 100644 } /* x,y,width,height describes a rectangle in the gl render buffer -@@ -337,6 +343,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, +@@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, int width, int height) {
@@ -277,7 +277,7 @@ index 8e7b8c2..b579b22 100644 GdkGLContext *paint_context; cairo_surface_t *image; cairo_matrix_t matrix; -@@ -707,6 +714,7 @@ out: +@@ -718,6 +725,7 @@ out: if (clip_region) cairo_region_destroy (clip_region);
@@ -285,7 +285,7 @@ index 8e7b8c2..b579b22 100644 } /* This is always called with the paint context current */ -@@ -714,6 +722,7 @@ void +@@ -725,6 +733,7 @@ void gdk_gl_texture_from_surface (cairo_surface_t *surface, cairo_region_t *region) {
@@ -293,14 +293,14 @@ index 8e7b8c2..b579b22 100644 GdkGLContext *paint_context; cairo_surface_t *image; double device_x_offset, device_y_offset; -@@ -814,4 +823,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, +@@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, glDisable (GL_SCISSOR_TEST); glDeleteTextures (1, &texture_id); +#endif } diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index c79dca0..8a7bec2 100644 +index dfbed63..556f0a3 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -85,7 +85,9 @@
@@ -337,7 +337,7 @@ index c79dca0..8a7bec2 100644 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); gboolean has_npot, has_texture_rectangle; -@@ -847,6 +852,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) +@@ -853,6 +858,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) priv->use_texture_rectangle ? "yes" : "no")); priv->extensions_checked = TRUE;
@@ -346,7 +346,7 @@ index c79dca0..8a7bec2 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index c0e0a7d..437ab03 100644 +index 6b231f0..904b86d 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -45,7 +45,9 @@
@@ -478,7 +478,7 @@ index 6289f3a..cbbac79 100644 + -include $(top_srcdir)/git.mk diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index e9a263f..2829a31 100644 +index 659b9fa..b15536b 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -37,7 +37,9 @@
@@ -491,7 +491,7 @@ index e9a263f..2829a31 100644 #include "gdk-private.h" #include <glib.h> -@@ -3169,7 +3171,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) +@@ -3194,7 +3196,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
@@ -503,10 +503,10 @@ index e9a263f..2829a31 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 7bf9979..cd1cc9d 100644 +index 272cecd..2bb34ac 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c -@@ -1643,3 +1643,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) +@@ -1675,3 +1675,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) { return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); }
@@ -516,7 +516,7 @@ index 7bf9979..cd1cc9d 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 3d6fd3b..2bd5c87 100644 +index c6205e4..df2334f 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@
@@ -529,7 +529,7 @@ index 3d6fd3b..2bd5c87 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5801,7 +5803,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5804,7 +5806,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -633,10 +633,10 @@ index 0000000..c9e2617 + +#endif /* __GDK_X_H__ */ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 842c2f9..0921bc7 100644 +index 5594429..2259bb3 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1416,14 +1416,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. +@@ -1434,14 +1434,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins. && cp xgen-gptbc gtkprivatetypebuiltins.c \ && rm -f xgen-gptbc
@@ -650,10 +650,10 @@ index 842c2f9..0921bc7 100644 - $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \ + $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; s/^.*gdk_x11_gl.*$$/#ifdef HAVE_OPENGL\n&\n#endif/; }' >> xgen-gtf \ && cp xgen-gtf $@ && rm -f xgen-gtf - gtktestutils.c: gtktypefuncs.c + $(srcdir)/gtktestutils.c: gtktypefuncs.c diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 094378e..f7c7f47 100644 +index ea383c0..bb4eb64 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -28,7 +28,9 @@
@@ -796,7 +796,7 @@ index c241ec8..24576dd 100644 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/tests/Makefile.am b/tests/Makefile.am -index e2db6e4..e51cf34 100644 +index 7c5ca99..e4a4546 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \
@@ -808,7 +808,7 @@ index e2db6e4..e51cf34 100644 testgrid \ testgtk \ testheaderbar \ -@@ -170,12 +168,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \ +@@ -172,12 +170,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \ testactionbar \ testwindowsize \ testpopover \
@@ -842,6 +842,3 @@ index 0b3a519..07b096f 100644 #endif /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ all_types[i] != GDK_TYPE_PIXBUF_LOADER && --- -2.14.1 -
meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb +2 -2
@@ -7,8 +7,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ " -SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0" -SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" +SRC_URI[md5sum] = "9dfe16f486573815f242fa400763feb7" +SRC_URI[sha256sum] = "68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.17.1