aboutsummaryrefslogtreecommitdiffstats
path: root/community/chromium/chromium-61.0.3163.79-gtk2fix.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-08-08 13:34:16 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-09-15 13:37:11 +0000
commitd183e852a762296b473c33e9ce106f52a4359dae (patch)
tree2f92f891d7ff1fc4b4aa0551bd7b28218b30b9d3 /community/chromium/chromium-61.0.3163.79-gtk2fix.patch
parent0d4667363c89e53a83538d90acdc612739d061db (diff)
downloadaports-d183e852a762296b473c33e9ce106f52a4359dae.tar.bz2
aports-d183e852a762296b473c33e9ce106f52a4359dae.tar.xz
community/chromium: upgrade to 61.0.3163.79
to fix tab crashes, use patch from https://github.com/lluixhi/musl-extras/issues/10#issuecomment-328272349 use various patches from fedora
Diffstat (limited to 'community/chromium/chromium-61.0.3163.79-gtk2fix.patch')
-rw-r--r--community/chromium/chromium-61.0.3163.79-gtk2fix.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/community/chromium/chromium-61.0.3163.79-gtk2fix.patch b/community/chromium/chromium-61.0.3163.79-gtk2fix.patch
new file mode 100644
index 0000000000..4847d51a52
--- /dev/null
+++ b/community/chromium/chromium-61.0.3163.79-gtk2fix.patch
@@ -0,0 +1,23 @@
+diff -up chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc
+--- chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix 2017-09-07 15:40:40.904966476 -0400
++++ chrome/browser/ui/libgtkui/gtk_ui.cc 2017-09-07 15:42:23.829987464 -0400
+@@ -1052,11 +1052,19 @@ float GtkUi::GetRawDeviceScaleFactor() {
+ if (display::Display::HasForceDeviceScaleFactor())
+ return display::Display::GetForcedDeviceScaleFactor();
+
++#if GTK_MAJOR_VERSION == 2
++ GtkSettings* gtk_settings = gtk_settings_get_default();
++ gint gtk_dpi = -1;
++ g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, nullptr);
++ const float scale_factor = gtk_dpi / (1024 * kDefaultDPI);
++#else
+ GdkScreen* screen = gdk_screen_get_default();
+ gint scale = gtk_widget_get_scale_factor(fake_window_);
+ gdouble resolution = gdk_screen_get_resolution(screen);
+ const float scale_factor =
+ resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
++#endif
++
+ // Blacklist scaling factors <120% (crbug.com/484400) and round
+ // to 1 decimal to prevent rendering problems (crbug.com/485183).
+ return scale_factor < 1.2f ? 1.0f : roundf(scale_factor * 10) / 10;