package/cog: import patch to fix the build with WebKit 2.22

Signed-off-by: Adrian Perez de Castro <[email protected]>

Author: aperezdc

package/cog/0.6.0/0001-Hack-Cog-to-make-it-buildable-with-WPE-WebKit-2.22.patch

@@ -0,0 +1,102 @@
+From 1fe2169be7444781746698b58607611c8ce516be Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <[email protected]>
+Date: Mon, 17 Oct 2022 12:06:48 +0300
+Subject: [PATCH] Hack Cog to make it buildable with WPE WebKit 2.22
+
+---
+ CMakeLists.txt          | 11 +++++------
+ cog.c                   |  9 +++++----
+ core/cog-webkit-utils.h |  4 ----
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b7bf12..96d6861 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,9 +122,8 @@ if (COG_USE_WEBKITGTK)
+ else ()
+     list(APPEND COGCORE_API_HEADERS core/cog-platform.h)
+     list(APPEND COGCORE_SOURCES core/cog-platform.c)
+-    # There is no need to explicitly check wpe-1.0 here because it's a
+-    # dependency already specified in the wpe-webkit.pc file.
+-    pkg_check_modules(WEB_ENGINE REQUIRED wpe-webkit-1.0>=2.23.91)
++    pkg_check_modules(WEB_ENGINE REQUIRED wpe-webkit-0.1)
++    pkg_check_modules(WPE REQUIRED IMPORTED_TARGET wpe-0.2)
+     if ("${WEB_ENGINE_VERSION}" VERSION_GREATER "2.23")
+         add_definitions(-DCOG_BG_COLOR_API_SUPPORTED=1)
+     else ()
+@@ -168,7 +167,7 @@ set_target_properties(cogcore PROPERTIES
+     SOVERSION ${COGCORE_VERSION_MAJOR}
+ )
+ target_include_directories(cogcore PUBLIC core ${COGCORE_INCLUDE_DIRS})
+-target_link_libraries(cogcore ${COGCORE_LDFLAGS})
++target_link_libraries(cogcore PkgConfig::WPE ${COGCORE_LDFLAGS})
+ target_compile_options(cogcore
+     PUBLIC ${COGCORE_CFLAGS}
+     PRIVATE -DG_LOG_DOMAIN=\"Cog\"
+@@ -241,7 +240,7 @@ if (COG_PLATFORM_FDO AND NOT COG_USE_WEBKITGTK)
+     endif ()
+ 
+     pkg_check_modules(COGPLATFORM_FDO_DEPS IMPORTED_TARGET REQUIRED
+-        wpe-webkit-1.0>=2.24.0 wpebackend-fdo-1.0>=1.3.1 egl xkbcommon)
++        wpe-webkit-0.1 wpebackend-fdo-1.0>=1.3.1 egl xkbcommon)
+ 
+     target_link_libraries(cogplatform-fdo PRIVATE
+         cogcore PkgConfig::WAYLAND PkgConfig::COGPLATFORM_FDO_DEPS)
+@@ -297,7 +296,7 @@ endif ()  # !COG_USE_WEBKITGTK
+ # libcogplaform-drm
+ 
+ if (COG_PLATFORM_DRM AND NOT COG_USE_WEBKITGTK)
+-    pkg_check_modules(COGPLATFORM_DRM_DEPS REQUIRED wpe-webkit-1.0>=2.24.0 wpebackend-fdo-1.0>=1.3.1 libdrm>=2.4.71 gbm>=13.0 egl libinput libudev wayland-server)
++    pkg_check_modules(COGPLATFORM_DRM_DEPS REQUIRED wpe-webkit-0.1 wpebackend-fdo-1.0>=1.3.1 libdrm>=2.4.71 gbm>=13.0 egl libinput libudev wayland-server)
+ 
+     set(COGPLATFORM_DRM_INCLUDE_DIRS
+         ${COGPLATFORM_DRM_DEPS_INCLUDE_DIRS}
+diff --git a/cog.c b/cog.c
+index 07def04..b536137 100644
+--- a/cog.c
++++ b/cog.c
+@@ -13,13 +13,14 @@
+ 
+ #if !COG_USE_WEBKITGTK
+ # include "cog-platform.h"
+-#if defined(WPE_CHECK_VERSION) && WPE_CHECK_VERSION(1, 3, 0)
+-# define HAVE_DEVICE_SCALING 1
+-#else
+ # define HAVE_DEVICE_SCALING 0
+-#endif /* WPE_CHECK_VERSION */
+ #endif /* !COG_USE_WEBKITGTK */
+ 
++#define webkit_get_major_version() 2
++#define webkit_get_minor_version() 22
++#define webkit_get_micro_version() 0
++
++
+ enum webprocess_fail_action {
+     WEBPROCESS_FAIL_UNKNOWN = 0,
+     WEBPROCESS_FAIL_ERROR_PAGE,
+diff --git a/core/cog-webkit-utils.h b/core/cog-webkit-utils.h
+index 08747de..1a0c23f 100644
+--- a/core/cog-webkit-utils.h
++++ b/core/cog-webkit-utils.h
+@@ -21,8 +21,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#if !WEBKIT_CHECK_VERSION(2, 23, 0)
+-
+ /* Define cleanup functions to enable using g_auto* with WebKit types. */
+ 
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitWebContext, g_object_unref)
+@@ -31,8 +29,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitSettings, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitURISchemeRequest, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitWebsiteDataManager, g_object_unref)
+ 
+-#endif /* WEBKIT_CHECK_VERSION */
+-
+ #endif /* COG_USE_WEBKITGTK */
+ 
+ 
+-- 
+2.38.0
+