Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 15 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-tools_gn_src_gn_version.h b/devel/electron39/files/patch-tools_gn_src_gn_version.h
new file mode 100644
index 000000000000..a3c6f07d4a48
--- /dev/null
+++ b/devel/electron39/files/patch-tools_gn_src_gn_version.h
@@ -0,0 +1,15 @@
+--- tools/gn/src/gn/version.h.orig	2021-09-14 02:05:25 UTC
++++ tools/gn/src/gn/version.h
+@@ -22,9 +22,9 @@ class Version {
+ 
+   static std::optional<Version> FromString(std::string s);
+ 
+-  int major() const { return major_; }
+-  int minor() const { return minor_; }
+-  int patch() const { return patch_; }
++  int gmajor() const { return major_; }
++  int gminor() const { return minor_; }
++  int gpatch() const { return patch_; }
+ 
+   bool operator==(const Version& other) const;
+   bool operator<(const Version& other) const;