From 8c8deea63aaa501f2ec62827b9f30d377fbfd3a1 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 1 Aug 2017 12:58:56 -0400 Subject: [PATCH] Fix encoding of linux_build.patch --- patch/patches/linux_build.patch | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/patch/patches/linux_build.patch b/patch/patches/linux_build.patch index 26af841f0..acf6c4de3 100644 --- a/patch/patches/linux_build.patch +++ b/patch/patches/linux_build.patch @@ -1,17 +1,17 @@ -diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc -index 7df1d0c..3dd3209 100644 ---- chrome/browser/ui/libgtkui/gtk_ui.cc -+++ chrome/browser/ui/libgtkui/gtk_ui.cc -@@ -320,8 +320,12 @@ float GetRawDeviceScaleFactor() { - return display::Display::GetForcedDeviceScaleFactor(); - - GdkScreen* screen = gdk_screen_get_default(); -+#if GTK_MAJOR_VERSION == 3 - gint scale = gdk_screen_get_monitor_scale_factor( - screen, gdk_screen_get_primary_monitor(screen)); -+#else -+ gint scale = 1; -+#endif - gdouble resolution = gdk_screen_get_resolution(screen); - return resolution <= 0 ? scale : resolution * scale / kDefaultDPI; - } +diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc +index 7df1d0c..3dd3209 100644 +--- chrome/browser/ui/libgtkui/gtk_ui.cc ++++ chrome/browser/ui/libgtkui/gtk_ui.cc +@@ -320,8 +320,12 @@ float GetRawDeviceScaleFactor() { + return display::Display::GetForcedDeviceScaleFactor(); + + GdkScreen* screen = gdk_screen_get_default(); ++#if GTK_MAJOR_VERSION == 3 + gint scale = gdk_screen_get_monitor_scale_factor( + screen, gdk_screen_get_primary_monitor(screen)); ++#else ++ gint scale = 1; ++#endif + gdouble resolution = gdk_screen_get_resolution(screen); + return resolution <= 0 ? scale : resolution * scale / kDefaultDPI; + }