diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron35/files/patch-ui_display_screen.h | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-ui_display_screen.h')
| -rw-r--r-- | devel/electron35/files/patch-ui_display_screen.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/devel/electron35/files/patch-ui_display_screen.h b/devel/electron35/files/patch-ui_display_screen.h deleted file mode 100644 index 55fa40807263..000000000000 --- a/devel/electron35/files/patch-ui_display_screen.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/display/screen.h.orig 2025-01-27 17:37:37 UTC -+++ ui/display/screen.h -@@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen { - // (both of which may or may not be `nearest_id`). - display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Object which suspends the platform-specific screensaver for the duration of - // its existence. - class ScreenSaverSuspender { -@@ -243,7 +243,7 @@ class DISPLAY_EXPORT Screen { - int64_t display_id_for_new_windows_; - int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - uint32_t screen_saver_suspension_count_ = 0; - #endif // BUILDFLAG(IS_LINUX) - }; |
