From 110fefdfb5999b990f6b094616a7efa88ef9e4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Tue, 11 Jun 2024 11:54:09 +0200 Subject: [PATCH] Update to CEF 125.0.22 Fixed build issue in uCEFLinuxFunctions --- README.md | 14 +++++++------- packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFLinuxFunctions.pas | 4 ++-- source/uCEFVersion.inc | 2 +- update_CEF4Delphi.json | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 899835da..b9ee390a 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the LICENSE.md file. -CEF4Delphi uses CEF 125.0.21 which includes Chromium 125.0.6422.142. +CEF4Delphi uses CEF 125.0.22 which includes Chromium 125.0.6422.142. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.21%2Bgc8b1a8c%2Bchromium-125.0.6422.142_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.21%2Bgc8b1a8c%2Bchromium-125.0.6422.142_windows64.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.21%2Bgc8b1a8c%2Bchromium-125.0.6422.142_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.21%2Bgc8b1a8c%2Bchromium-125.0.6422.142_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.21%2Bgc8b1a8c%2Bchromium-125.0.6422.142_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.21%2Bgc8b1a8c%2Bchromium-125.0.6422.142_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.22%2Bgc410c95%2Bchromium-125.0.6422.142_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.22%2Bgc410c95%2Bchromium-125.0.6422.142_windows64.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.22%2Bgc410c95%2Bchromium-125.0.6422.142_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.22%2Bgc410c95%2Bchromium-125.0.6422.142_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.22%2Bgc410c95%2Bchromium-125.0.6422.142_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_125.0.22%2Bgc410c95%2Bchromium-125.0.6422.142_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 12.1 and it has been tested in Delphi 6, Delphi XE, Delphi 10, Delphi 11 and Lazarus 3.4/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 14e4042a..8bb512bb 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFLinuxFunctions.pas b/source/uCEFLinuxFunctions.pas index fdfa6c70..5d078376 100644 --- a/source/uCEFLinuxFunctions.pas +++ b/source/uCEFLinuxFunctions.pas @@ -24,7 +24,7 @@ uses {$IFDEF LINUX} procedure GdkEventKeyToCEFKeyEvent(GdkEvent: PGdkEventKey; var aCEFKeyEvent : TCEFKeyEvent); function KeyboardCodeFromXKeysym(keysym : uint32) : integer; -{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or (LCL_FULLVERSION<3000000)} +{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or (DEFINED(LCLGTK3) and (LCL_FULLVERSION<3000000))} function GetCefStateModifiers(state : uint32) : integer; {$ENDIF} {$IF DEFINED(LCLGTK3) and (LCL_FULLVERSION>3000000)} @@ -453,7 +453,7 @@ begin end; end; -{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or (LCL_FULLVERSION<3000000)} +{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or (DEFINED(LCLGTK3) and (LCL_FULLVERSION<3000000))} function GetCefStateModifiers(state : uint32) : integer; begin Result := EVENTFLAG_NONE; diff --git a/source/uCEFVersion.inc b/source/uCEFVersion.inc index e6885480..b4d0b8a0 100644 --- a/source/uCEFVersion.inc +++ b/source/uCEFVersion.inc @@ -1,6 +1,6 @@ CEF_SUPPORTED_VERSION_MAJOR = 125; CEF_SUPPORTED_VERSION_MINOR = 0; - CEF_SUPPORTED_VERSION_RELEASE = 21; + CEF_SUPPORTED_VERSION_RELEASE = 22; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = CEF_SUPPORTED_VERSION_MAJOR; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 72b28656..3c5faf8a 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 610, + "InternalVersion" : 611, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "125.0.21" + "Version" : "125.0.22" } ], "UpdatePackageData" : {