From 7dd9d6525aa45ebd22d58cb3980c63d8c7341d2c Mon Sep 17 00:00:00 2001 From: Ilmari Lauhakangas Date: Sun, 8 Dec 2024 13:45:52 +0200 Subject: [PATCH] Drop windows7.patch.1 from pdfium Change-Id: Idb458e3e65bc22d148cc68e496aa0dda32fec2a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178079 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas Reviewed-by: Mike Kaganski --- external/pdfium/UnpackedTarball_pdfium.mk | 2 -- external/pdfium/windows7.patch.1 | 34 ----------------------- 2 files changed, 36 deletions(-) delete mode 100644 external/pdfium/windows7.patch.1 diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index 6c5bce9b2e29..4a47b35bd6f3 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -10,8 +10,6 @@ pdfium_patches := # Fixes build on our baseline. pdfium_patches += build.patch.1 -# Avoids Windows 8 build dependency. -pdfium_patches += windows7.patch.1 pdfium_patches += c++20-comparison.patch pdfium_patches += constexpr-template.patch diff --git a/external/pdfium/windows7.patch.1 b/external/pdfium/windows7.patch.1 deleted file mode 100644 index 9c82a8a34d49..000000000000 --- a/external/pdfium/windows7.patch.1 +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/core/fxcrt/win/win_util.cc b/core/fxcrt/win/win_util.cc -index 43e9151d1..76657ac0a 100644 ---- a/core/fxcrt/win/win_util.cc -+++ b/core/fxcrt/win/win_util.cc -@@ -10,28 +10,7 @@ - namespace pdfium { - - bool IsUser32AndGdi32Available() { -- static auto is_user32_and_gdi32_available = []() { -- // If win32k syscalls aren't disabled, then user32 and gdi32 are available. -- -- typedef decltype( -- GetProcessMitigationPolicy)* GetProcessMitigationPolicyType; -- GetProcessMitigationPolicyType get_process_mitigation_policy_func = -- reinterpret_cast(GetProcAddress( -- GetModuleHandle(L"kernel32.dll"), "GetProcessMitigationPolicy")); -- -- if (!get_process_mitigation_policy_func) -- return true; -- -- PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY policy = {}; -- if (get_process_mitigation_policy_func(GetCurrentProcess(), -- ProcessSystemCallDisablePolicy, -- &policy, sizeof(policy))) { -- return policy.DisallowWin32kSystemCalls == 0; -- } -- -- return true; -- }(); -- return is_user32_and_gdi32_available; -+ return true; - } - - } // namespace pdfium