2.36.5

3 files changed, 10 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 516c0db32965..92fe8c2bc313 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkit2gtk-imgpaste
 	pkgdesc = Web content engine for GTK
-	pkgver = 2.36.4
-	pkgrel = 2
+	pkgver = 2.36.5
+	pkgrel = 1
 	url = https://webkitgtk.org
 	arch = x86_64
 	license = custom
@@ -65,18 +65,16 @@ pkgbase = webkit2gtk-imgpaste
 	provides = webkit2gtk
 	conflicts = webkit2gtk
 	options = !lto
-	source = https://webkitgtk.org/releases/webkitgtk-2.36.4.tar.xz
-	source = https://webkitgtk.org/releases/webkitgtk-2.36.4.tar.xz.asc
+	source = https://webkitgtk.org/releases/webkitgtk-2.36.5.tar.xz
+	source = https://webkitgtk.org/releases/webkitgtk-2.36.5.tar.xz.asc
 	source = PasteBoardGtk.patch
 	source = EnlargeObjectSize.patch
-	source = 7916fda00b347ff263fbfe72c065032d1d9b523c.patch
 	validpgpkeys = D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3
 	validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B
-	sha256sums = b6bebe1f85a479d968c19e44a4704622ef8cef61636ad1b2406b77d16ae2e2a8
+	sha256sums = d5532fa884c943dc48f1911473dd663aba407a3b35caa7b04bac1419b41e5908
 	sha256sums = SKIP
 	sha256sums = 909eb44783d093c89400494a8b57eee3a5b926e1a5b5f1e922e1dff1a6dc3c7b
 	sha256sums = a5d2149d55190a15bc806bfddd85f43b6c714722b04ce0c1e476f9cb58985bac
-	sha256sums = 9b1bcb54553274701f7574b1449a29f3a2d569bfbbaaa5d81526270d1c512f3e
 
 pkgname = webkit2gtk-imgpaste
 	depends = cairo
diff --git a/7916fda00b347ff263fbfe72c065032d1d9b523c.patch b/7916fda00b347ff263fbfe72c065032d1d9b523c.patch
deleted file mode 100644
index d4daad41c2ef..000000000000
--- a/7916fda00b347ff263fbfe72c065032d1d9b523c.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 7916fda00b347ff263fbfe72c065032d1d9b523c Mon Sep 17 00:00:00 2001
-From: Fujii Hironori <Hironori.Fujii@sony.com>
-Date: Tue, 7 Jun 2022 11:42:55 +0000
-Subject: [PATCH] Merge r295034 - WebKitTestRunner shouldn't link object files
- of JavaScriptCore and WebCore https://bugs.webkit.org/show_bug.cgi?id=241002
-
-Reviewed by Don Olmstead.
-
-243269@main removed `WebKit` from `WebKitTestRunner_FRAMEWORKS` for
-WPE. But, it should be there not to link object files of
-JavaScriptCore and WebCore to WebKitTestRunner. In WPE builds,
-JavaScriptCore and WebCore API are exported from WebKit shared
-library. WebKit consumers shouldn't link with object files of
-JavaScriptCore and WebCore.
-
-However, adding `WebKit` to `WebKitTestRunner_FRAMEWORKS` introduced a
-new problem that the object file of LowLevelInterpreter.cpp was linked
-into WebKitTestRunner. This problem was fixed by changing
-LowLevelInterpreterLib to a STATIC library.
-
-* Source/JavaScriptCore/CMakeLists.txt:
-* Tools/WebKitTestRunner/CMakeLists.txt:
-* Tools/WebKitTestRunner/PlatformGTK.cmake:
-* Tools/WebKitTestRunner/PlatformWin.cmake:
-
-Canonical link: https://commits.webkit.org/247617.88@webkitgtk/2.36
-git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.36@295340 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/JavaScriptCore/CMakeLists.txt     | 12 +++---------
- Tools/WebKitTestRunner/CMakeLists.txt    |  1 +
- Tools/WebKitTestRunner/PlatformGTK.cmake |  4 ----
- Tools/WebKitTestRunner/PlatformWin.cmake |  4 ----
- 4 files changed, 4 insertions(+), 17 deletions(-)
-
-diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
-index 238208eb1137..95a1300ce1b3 100644
---- a/Source/JavaScriptCore/CMakeLists.txt
-+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -456,7 +456,7 @@ if (MSVC AND NOT ENABLE_C_LOOP)
-         COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm
-         VERBATIM)
-     list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)
--    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp)
-+    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp)
- else ()
-     # As there's poor toolchain support for using `.file` directives in
-     # inline asm (i.e. there's no way to avoid clashes with the `.file`
-@@ -465,7 +465,7 @@ else ()
-     # an object file. We only need to do this for LowLevelInterpreter.cpp
-     # and cmake doesn't allow us to introduce a compiler wrapper for a
-     # single source file, so we need to create a separate target for it.
--    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp
-+    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp
-         ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
- endif ()
- 
-@@ -1496,13 +1496,7 @@ if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
-         COMPILE_OPTIONS "-fno-lto")
- endif ()
- 
--# When building JavaScriptCore as an object library, we need to make sure the
--# lowlevelinterpreter lib objects get propogated.
--if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
--    list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
--else ()
--    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
--endif ()
-+list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib)
- 
- WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
- list(APPEND JavaScriptCore_SOURCES
diff --git a/PKGBUILD b/PKGBUILD
index b0fa29e971a2..44279f9c7e22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=webkit2gtk-imgpaste
-pkgver=2.36.4
-pkgrel=2
+pkgver=2.36.5
+pkgrel=1
 pkgdesc="Web content engine for GTK"
 url="https://webkitgtk.org"
 arch=(x86_64)
@@ -26,19 +26,16 @@ optdepends=('geoclue: Geolocation support'
 options=(!lto)
 source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc}
         PasteBoardGtk.patch
-        EnlargeObjectSize.patch
-	7916fda00b347ff263fbfe72c065032d1d9b523c.patch)
-sha256sums=('b6bebe1f85a479d968c19e44a4704622ef8cef61636ad1b2406b77d16ae2e2a8'
+        EnlargeObjectSize.patch)
+sha256sums=('d5532fa884c943dc48f1911473dd663aba407a3b35caa7b04bac1419b41e5908'
             'SKIP'
             '909eb44783d093c89400494a8b57eee3a5b926e1a5b5f1e922e1dff1a6dc3c7b'
-            'a5d2149d55190a15bc806bfddd85f43b6c714722b04ce0c1e476f9cb58985bac'
-            '9b1bcb54553274701f7574b1449a29f3a2d569bfbbaaa5d81526270d1c512f3e')
+            'a5d2149d55190a15bc806bfddd85f43b6c714722b04ce0c1e476f9cb58985bac')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'  # Carlos Garcia Campos <cgarcia@igalia.com>
               '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <aperez@igalia.com>
 
 prepare() {
   cd webkitgtk-$pkgver
-  patch --reverse --strip=1 --input="${srcdir}/7916fda00b347ff263fbfe72c065032d1d9b523c.patch"
   patch --forward --strip=0 --input="${srcdir}/PasteBoardGtk.patch"
   patch --forward --strip=0 --input="${srcdir}/EnlargeObjectSize.patch"
 }