Skip to content

Commit 37233aa

Browse files
ThomasMaternThomasMatern
committed
Add ability to patch spotify prebuilt packages. Upgrade to 3.3578.1870
1 parent 063fa36 commit 37233aa

4 files changed

Lines changed: 40 additions & 12 deletions

File tree

‎patches/prebuilt_1870.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/tests/cefclient/browser/osr_window_win.h b/tests/cefclient/browser/osr_window_win.h
2+
index 3b2ed53..1775665 100644
3+
--- a/tests/cefclient/browser/osr_window_win.h
4+
+++ b/tests/cefclient/browser/osr_window_win.h
5+
@@ -169,7 +169,7 @@ class OsrWindowWin
6+
7+
const OsrRendererSettings settings_;
8+
HWND hwnd_;
9+
- std::unique_ptr<OsrRenderHandlerWin> render_handler_;
10+
+ scoped_ptr<OsrRenderHandlerWin> render_handler_;
11+
12+
// Class that encapsulates IMM32 APIs and controls IMEs attached to a window.
13+
scoped_ptr<OsrImeHandlerWin> ime_handler_;

‎src/version/cef_version_win.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018 Marshall A. Greenblatt. All rights reserved.
1+
// Copyright (c) 2019 Marshall A. Greenblatt. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions are
@@ -35,16 +35,16 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_VERSION "3.3538.1852.gcb937fc"
38+
#define CEF_VERSION "3.3578.1870.gc974488"
3939
#define CEF_VERSION_MAJOR 3
40-
#define CEF_COMMIT_NUMBER 1852
41-
#define CEF_COMMIT_HASH "cb937fc9cd02a5b5f4d5aea2d880e05fbab621bf"
42-
#define COPYRIGHT_YEAR 2018
40+
#define CEF_COMMIT_NUMBER 1870
41+
#define CEF_COMMIT_HASH "c974488bae67171e814b9666de3000867ff7bd76"
42+
#define COPYRIGHT_YEAR 2019
4343

44-
#define CHROME_VERSION_MAJOR 70
44+
#define CHROME_VERSION_MAJOR 71
4545
#define CHROME_VERSION_MINOR 0
46-
#define CHROME_VERSION_BUILD 3538
47-
#define CHROME_VERSION_PATCH 102
46+
#define CHROME_VERSION_BUILD 3578
47+
#define CHROME_VERSION_PATCH 98
4848

4949
#define DO_MAKE_STRING(p) #p
5050
#define MAKE_STRING(p) DO_MAKE_STRING(p)
@@ -63,13 +63,13 @@ extern "C" {
6363
// universal hash value will change if any platform is affected whereas the
6464
// platform hash values will change only if that particular platform is
6565
// affected.
66-
#define CEF_API_HASH_UNIVERSAL "040ce5036de742f2e20741ea315f8943acb52825"
66+
#define CEF_API_HASH_UNIVERSAL "161352dfc6601b5f28b409b6035c95ec4d21f7a0"
6767
#if defined(OS_WIN)
68-
#define CEF_API_HASH_PLATFORM "89b811362d1e7c4c7f63080451f8d2a29f3f123f"
68+
#define CEF_API_HASH_PLATFORM "864498db9f12dd977766dc74abc56f198b39e2ce"
6969
#elif defined(OS_MACOSX)
70-
#define CEF_API_HASH_PLATFORM "41afc46359f3ce0704aef51755b1f10fdf7091ed"
70+
#define CEF_API_HASH_PLATFORM "32247df6e90b9555e16862e75885d7e157852156"
7171
#elif defined(OS_LINUX)
72-
#define CEF_API_HASH_PLATFORM "1e06dc06555ed213fb88f06f5ac77a2bdc1a7198"
72+
#define CEF_API_HASH_PLATFORM "a6fa42b9e296d27d524fc561060368e0209cef8b"
7373
#endif
7474

7575
// Returns CEF version information for the libcef library. The |entry|

‎tools/automate.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import subprocess
8989
import platform
9090
import docopt
91+
import patch
9192
import stat
9293
import glob
9394
import shutil
@@ -116,6 +117,7 @@ class Options(object):
116117
cef_branch = ""
117118
cef_commit = ""
118119
cef_version = ""
120+
cef_commit_number = ""
119121
build_dir = ""
120122
cef_build_dir = ""
121123
ninja_jobs = None
@@ -182,6 +184,7 @@ def setup_options(docopt_args):
182184
Options.cef_branch = get_cefpython_version()["CHROME_VERSION_BUILD"]
183185
Options.cef_commit = get_cefpython_version()["CEF_COMMIT_HASH"]
184186
Options.cef_version = get_cefpython_version()["CEF_VERSION"]
187+
Options.cef_commit_number = get_cefpython_version()["CEF_COMMIT_NUMBER"]
185188

186189
# --gyp-msvs-version
187190
if not Options.gyp_msvs_version:
@@ -367,6 +370,14 @@ def update_cef_patches():
367370
fp.write(new_contents.encode("utf-8"))
368371

369372

373+
def patch_prebuilt():
374+
patch_root = Options.cef_binary
375+
patch_file = os.path.join(Options.cefpython_dir, 'patches', 'prebuilt_{}.patch'.format(Options.cef_commit_number))
376+
if os.path.exists(patch_file):
377+
p = patch.fromfile(patch_file)
378+
p.apply(root=patch_root)
379+
380+
370381
def build_cef_projects():
371382
"""Build cefclient, cefsimple, ceftests, libcef_dll_wrapper."""
372383
print("[automate.py] Build cef projects...")
@@ -426,6 +437,9 @@ def build_cef_projects():
426437
if already_built:
427438
print("[automate.py] Already built: cefclient, cefsimple, ceftests")
428439
else:
440+
if Options.prebuilt_cef:
441+
print("[automate.py] Applying patches to prebuilt cef")
442+
patch_prebuilt()
429443
print("[automate.py] Build cefclient, cefsimple, ceftests")
430444
# Cmake
431445
command = prepare_build_command()

‎tools/requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Cython == 0.28.4
22
docopt >= 0.6.2
3+
patch
34
setuptools
45
wheel
56
Pillow

0 commit comments

Comments
 (0)