Skip to content

Commit 98e770e

Browse files
ThomasMaternThomasMatern
committed
Upgrade to 73.1.13
1 parent 87f20df commit 98e770e

6 files changed

Lines changed: 108 additions & 58 deletions

File tree

‎patches/prebuilt_1870.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

patches/prebuilt_1895.patch renamed to patches/prebuilt_73.1.13.patch

File renamed without changes.

‎src/version/cef_api_hash_win.h‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
// Copyright (c) 2019 Marshall A. Greenblatt. All rights reserved.
2+
//
3+
// Redistribution and use in source and binary forms, with or without
4+
// modification, are permitted provided that the following conditions are
5+
// met:
6+
//
7+
// * Redistributions of source code must retain the above copyright
8+
// notice, this list of conditions and the following disclaimer.
9+
// * Redistributions in binary form must reproduce the above
10+
// copyright notice, this list of conditions and the following disclaimer
11+
// in the documentation and/or other materials provided with the
12+
// distribution.
13+
// * Neither the name of Google Inc. nor the name Chromium Embedded
14+
// Framework nor the names of its contributors may be used to endorse
15+
// or promote products derived from this software without specific prior
16+
// written permission.
17+
//
18+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
//
30+
// ---------------------------------------------------------------------------
31+
//
32+
// This file was generated by the CEF translator tool. If making changes by
33+
// hand only do so within the body of existing method and function
34+
// implementations. See the translator.README.txt file in the tools directory
35+
// for more information.
36+
//
37+
// $hash=e35c4017e9fd0e6371e7abbcaf1b9498a33693f9$
38+
//
39+
40+
#ifndef CEF_INCLUDE_API_HASH_H_
41+
#define CEF_INCLUDE_API_HASH_H_
42+
43+
#include "include/internal/cef_export.h"
44+
45+
// The API hash is created by analyzing CEF header files for C API type
46+
// definitions. The hash value will change when header files are modified in a
47+
// way that may cause binary incompatibility with other builds. The universal
48+
// hash value will change if any platform is affected whereas the platform hash
49+
// values will change only if that particular platform is affected.
50+
#define CEF_API_HASH_UNIVERSAL "21bd75ba6765d8eac60d72b761dca4deeab6c2b8"
51+
#if defined(OS_WIN)
52+
#define CEF_API_HASH_PLATFORM "b312ae5d3d4346ffaa12ab66d55fe0b31dd719fe"
53+
#elif defined(OS_MACOSX)
54+
#define CEF_API_HASH_PLATFORM "0ea51921923a950b004c34289e3deaa454eadc58"
55+
#elif defined(OS_LINUX)
56+
#define CEF_API_HASH_PLATFORM "964b1ff8bc6acdf35d275112d03faa78b1f3556b"
57+
#endif
58+
59+
#ifdef __cplusplus
60+
extern "C" {
61+
#endif
62+
63+
///
64+
// Returns CEF API hashes for the libcef library. The returned string is owned
65+
// by the library and should not be freed. The |entry| parameter describes which
66+
// hash value will be returned:
67+
// 0 - CEF_API_HASH_PLATFORM
68+
// 1 - CEF_API_HASH_UNIVERSAL
69+
// 2 - CEF_COMMIT_HASH (from cef_version.h)
70+
///
71+
CEF_EXPORT const char* cef_api_hash(int entry);
72+
73+
#ifdef __cplusplus
74+
}
75+
#endif
76+
#endif // CEF_INCLUDE_API_HASH_H_

‎src/version/cef_version_win.h‎

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_VERSION "3.3626.1895.g7001d56"
39-
#define CEF_VERSION_MAJOR 3
40-
#define CEF_COMMIT_NUMBER 1895
41-
#define CEF_COMMIT_HASH "7001d56090315a4207abac1dd9358219fd76b155"
38+
#define CEF_VERSION "73.1.13+g6e3c989+chromium-73.0.3683.75"
39+
#define CEF_VERSION_MAJOR 73
40+
#define CEF_VERSION_MINOR 1
41+
#define CEF_VERSION_PATCH 13
42+
#define CEF_COMMIT_NUMBER 1934
43+
#define CEF_COMMIT_HASH "6e3c9897beda11a2b76956ba0b3737409a15e9fb"
4244
#define COPYRIGHT_YEAR 2019
4345

44-
#define CHROME_VERSION_MAJOR 72
46+
#define CHROME_VERSION_MAJOR 73
4547
#define CHROME_VERSION_MINOR 0
46-
#define CHROME_VERSION_BUILD 3626
47-
#define CHROME_VERSION_PATCH 121
48+
#define CHROME_VERSION_BUILD 3683
49+
#define CHROME_VERSION_PATCH 75
4850

4951
#define DO_MAKE_STRING(p) #p
5052
#define MAKE_STRING(p) DO_MAKE_STRING(p)
@@ -57,42 +59,19 @@
5759
extern "C" {
5860
#endif
5961

60-
// The API hash is created by analyzing CEF header files for C API type
61-
// definitions. The hash value will change when header files are modified
62-
// in a way that may cause binary incompatibility with other builds. The
63-
// universal hash value will change if any platform is affected whereas the
64-
// platform hash values will change only if that particular platform is
65-
// affected.
66-
#define CEF_API_HASH_UNIVERSAL "161352dfc6601b5f28b409b6035c95ec4d21f7a0"
67-
#if defined(OS_WIN)
68-
#define CEF_API_HASH_PLATFORM "864498db9f12dd977766dc74abc56f198b39e2ce"
69-
#elif defined(OS_MACOSX)
70-
#define CEF_API_HASH_PLATFORM "32247df6e90b9555e16862e75885d7e157852156"
71-
#elif defined(OS_LINUX)
72-
#define CEF_API_HASH_PLATFORM "a6fa42b9e296d27d524fc561060368e0209cef8b"
73-
#endif
74-
7562
// Returns CEF version information for the libcef library. The |entry|
7663
// parameter describes which version component will be returned:
7764
// 0 - CEF_VERSION_MAJOR
78-
// 1 - CEF_COMMIT_NUMBER
79-
// 2 - CHROME_VERSION_MAJOR
80-
// 3 - CHROME_VERSION_MINOR
81-
// 4 - CHROME_VERSION_BUILD
82-
// 5 - CHROME_VERSION_PATCH
65+
// 1 - CEF_VERSION_MINOR
66+
// 2 - CEF_VERSION_PATCH
67+
// 3 - CEF_COMMIT_NUMBER
68+
// 4 - CHROME_VERSION_MAJOR
69+
// 5 - CHROME_VERSION_MINOR
70+
// 6 - CHROME_VERSION_BUILD
71+
// 7 - CHROME_VERSION_PATCH
8372
///
8473
CEF_EXPORT int cef_version_info(int entry);
8574

86-
///
87-
// Returns CEF API hashes for the libcef library. The returned string is owned
88-
// by the library and should not be freed. The |entry| parameter describes which
89-
// hash value will be returned:
90-
// 0 - CEF_API_HASH_PLATFORM
91-
// 1 - CEF_API_HASH_UNIVERSAL
92-
// 2 - CEF_COMMIT_HASH
93-
///
94-
CEF_EXPORT const char* cef_api_hash(int entry);
95-
9675
#ifdef __cplusplus
9776
}
9877
#endif

‎tools/automate.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,14 @@ def setup_options(docopt_args):
181181
# branch. Otherwise get cef branch/commit from src/version/.
182182
if not Options.cef_branch:
183183
# Use branch/commit from the src/version/cef_version_*.h file
184-
Options.cef_branch = get_cefpython_version()["CHROME_VERSION_BUILD"]
185-
Options.cef_commit = get_cefpython_version()["CEF_COMMIT_HASH"]
186-
Options.cef_version = get_cefpython_version()["CEF_VERSION"]
187-
Options.cef_commit_number = get_cefpython_version()["CEF_COMMIT_NUMBER"]
184+
versions = get_cefpython_version()
185+
Options.cef_branch = versions["CHROME_VERSION_BUILD"]
186+
Options.cef_commit = versions["CEF_COMMIT_HASH"]
187+
Options.cef_version = versions["CEF_VERSION"]
188+
Options.cef_version_major = versions["CEF_VERSION_MAJOR"]
189+
Options.cef_version_minor = versions["CEF_VERSION_MINOR"]
190+
Options.cef_version_patch = versions["CEF_VERSION_PATCH"]
191+
Options.cef_commit_number = versions["CEF_COMMIT_NUMBER"]
188192

189193
# --gyp-msvs-version
190194
if not Options.gyp_msvs_version:
@@ -372,7 +376,10 @@ def update_cef_patches():
372376

373377
def patch_prebuilt():
374378
patch_root = Options.cef_binary
375-
patch_file = os.path.join(Options.cefpython_dir, 'patches', 'prebuilt_{}.patch'.format(Options.cef_commit_number))
379+
patch_name = 'prebuilt_{}.{}.{}.patch'.format(Options.cef_version_major,
380+
Options.cef_version_minor,
381+
Options.cef_version_patch)
382+
patch_file = os.path.join(Options.cefpython_dir, 'patches', patch_name)
376383
if os.path.exists(patch_file):
377384
p = patch.fromfile(patch_file)
378385
p.apply(root=patch_root)

‎tools/common.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,10 @@ def get_version_from_command_line_args(caller_script, ignore_error=False):
445445

446446
def get_cefpython_version():
447447
"""Get CEF version from the 'src/version/' directory."""
448-
header_file = os.path.join(SRC_DIR, "version",
449-
"cef_version_"+OS_POSTFIX+".h")
450-
return get_version_from_file(header_file)
448+
version = get_version_from_file(os.path.join(SRC_DIR, "version", "cef_version_"+OS_POSTFIX+".h"))
449+
api = get_version_from_file(os.path.join(SRC_DIR, "version", "cef_api_hash_" + OS_POSTFIX + ".h"))
450+
version.update(api)
451+
return version
451452

452453

453454
def get_version_from_file(header_file):

0 commit comments

Comments
 (0)