Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: - https://github.com/electron/electron/releases/tag/v19.0.16 - https://github.com/electron/electron/releases/tag/v19.0.17 - https://github.com/electron/electron/releases/tag/v19.1.0 - https://github.com/electron/electron/releases/tag/v19.1.1 - https://github.com/electron/electron/releases/tag/v19.1.2 - https://github.com/electron/electron/releases/tag/v19.1.3 - https://github.com/electron/electron/releases/tag/v19.1.4 - https://github.com/electron/electron/releases/tag/v19.1.5 - https://github.com/electron/electron/releases/tag/v19.1.6 - https://github.com/electron/electron/releases/tag/v19.1.7 - https://github.com/electron/electron/releases/tag/v19.1.8 - https://github.com/electron/electron/releases/tag/v19.1.9
- Loading branch information
Showing
22 changed files
with
171 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ELECTRON_VER= 19.0.15 | ||
ELECTRON_VER= 19.1.9 | ||
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
devel/electron19/files/patch-electron_lib_common_api_clipboard.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
devel/electron19/files/patch-electron_script_lib_get-version.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
--- electron/script/lib/get-version.js.orig 2023-01-15 07:43:40 UTC | ||
+++ electron/script/lib/get-version.js | ||
@@ -11,12 +11,10 @@ module.exports.getElectronVersion = () => { | ||
// The only difference in the "git describe" technique is that technically a commit can "change" it's version | ||
// number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3 | ||
// and after the tag is made rebuilding the same commit will result in it being 1.2.4 | ||
- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], { | ||
- cwd: path.resolve(__dirname, '..', '..') | ||
- }); | ||
+ const output = spawnSync('basename', [path.resolve(__dirname, '..', '..', '..', '..')]); | ||
if (output.status !== 0) { | ||
console.error(output.stderr); | ||
throw new Error('Failed to get current electron version'); | ||
} | ||
- return output.stdout.toString().trim().replace(/^v/g, ''); | ||
+ return output.stdout.toString().trim().replace(/^electron-/g, ''); | ||
}; |
29 changes: 29 additions & 0 deletions
29
devel/electron19/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2023-01-13 05:24:55 UTC | ||
+++ electron/shell/browser/api/electron_api_desktop_capturer.cc | ||
@@ -36,7 +36,7 @@ | ||
#include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" | ||
#include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" | ||
#include "ui/display/win/display_info.h" | ||
-#elif BUILDFLAG(IS_LINUX) | ||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) | ||
#if defined(USE_OZONE_PLATFORM_X11) | ||
#include "base/logging.h" | ||
#include "ui/base/x/x11_display_util.h" | ||
@@ -48,7 +48,7 @@ | ||
#endif // defined(USE_OZONE_PLATFORM_X11) | ||
#endif // BUILDFLAG(IS_WIN) | ||
|
||
-#if BUILDFLAG(IS_LINUX) | ||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) | ||
// Private function in ui/base/x/x11_display_util.cc | ||
std::map<x11::RandR::Output, int> GetMonitors(int version, | ||
x11::RandR* randr, | ||
@@ -295,7 +295,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi | ||
for (auto& source : screen_sources) { | ||
source.display_id = base::NumberToString(source.media_list_source.id.id); | ||
} | ||
-#elif BUILDFLAG(IS_LINUX) | ||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) | ||
#if defined(USE_OZONE_PLATFORM_X11) | ||
// On Linux, with X11, the source id is the numeric value of the | ||
// display name atom and the display id is either the EDID or the |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
devel/electron19/files/patch-electron_shell_browser_api_electron__api__web__contents.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
devel/electron19/files/patch-electron_shell_browser_electron__browser__client.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
devel/electron19/files/patch-electron_shell_browser_net_system__network__context__manager.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.