Date: Saturday, November 19, 2016 @ 12:57:21 Author: heftig Revision: 281344
3.22.4-1 Modified: gtk3/trunk/PKGBUILD Deleted: gtk3/trunk/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch -----------------------------------------------------------------+ 0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch | 83 ---------- PKGBUILD | 7 2 files changed, 2 insertions(+), 88 deletions(-) Deleted: 0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch =================================================================== --- 0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch 2016-11-19 12:54:11 UTC (rev 281343) +++ 0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch 2016-11-19 12:57:21 UTC (rev 281344) @@ -1,83 +0,0 @@ -From 0d945f06faee49788191e3e28f797f72959b3583 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Mon, 10 Oct 2016 16:34:28 +0200 -Subject: [PATCH] gdkscreen-x11: Fix screen and monitor size calculation - -The monitors are already in scaled pixels, so scaling again when retrieving -the screen size is wrong. - -With GDK_SCALE unset, the initial monitor sizes are unscaled, and when the -xsettings client sets a scale > 1, the monitor sizes should be updated. - -The end result is that the monitor sizes start out wrong, and get -corrected on the first xrandr event, while the screen size starts out -right and becomes wrong after the event. - -This patch fixes Firefox misplacing menus and popovers when the xrandr -configuration changes while it is running. - -Fix for the X11 side of - -https://bugzilla.gnome.org/show_bug.cgi?id=772202 ---- - gdk/x11/gdkscreen-x11.c | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 7738a47adfed1484..28a43a69bedbe955 100644 ---- a/gdk/x11/gdkscreen-x11.c -+++ b/gdk/x11/gdkscreen-x11.c -@@ -49,6 +49,7 @@ - static void gdk_x11_screen_dispose (GObject *object); - static void gdk_x11_screen_finalize (GObject *object); - static void init_randr_support (GdkScreen *screen); -+static void process_monitors_change (GdkScreen *screen); - - enum - { -@@ -82,13 +83,13 @@ gdk_x11_screen_get_display (GdkScreen *screen) - gint - gdk_x11_screen_get_width (GdkScreen *screen) - { -- return GDK_X11_SCREEN (screen)->width / GDK_X11_SCREEN (screen)->window_scale; -+ return GDK_X11_SCREEN (screen)->width; - } - - gint - gdk_x11_screen_get_height (GdkScreen *screen) - { -- return GDK_X11_SCREEN (screen)->height / GDK_X11_SCREEN (screen)->window_scale; -+ return GDK_X11_SCREEN (screen)->height; - } - - static gint -@@ -906,10 +907,8 @@ void - _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen, - gint scale) - { -- GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display); - GList *toplevels, *l; - GdkWindow *root; -- int i; - - if (x11_screen->window_scale == scale) - return; -@@ -928,14 +927,7 @@ _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen, - _gdk_x11_window_set_window_scale (window, scale); - } - -- for (i = 0; i < x11_display->monitors->len; i++) -- { -- GdkMonitor *monitor = GDK_MONITOR (x11_display->monitors->pdata[i]); -- -- gdk_monitor_set_scale_factor (monitor, scale); -- } -- -- g_signal_emit_by_name (GDK_SCREEN (x11_screen), "monitors-changed"); -+ process_monitors_change (GDK_SCREEN (x11_screen)); - } - - /* --- -2.10.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-19 12:54:11 UTC (rev 281343) +++ PKGBUILD 2016-11-19 12:57:21 UTC (rev 281344) @@ -4,7 +4,7 @@ pkgbase=gtk3 pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends) -pkgver=3.22.3 +pkgver=3.22.4 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit" arch=(i686 x86_64) @@ -14,15 +14,13 @@ adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa) makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups) license=(LGPL) -_commit=99fed96b4470cf02f8fa522551d2a05e01a1bf8a # tags/3.22.3^0 +_commit=4569bb372f838a9a68c9b134ef18865abe77001c # tags/3.22.4^0 source=("git://git.gnome.org/gtk+#commit=$_commit" - 0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch settings.ini gtk-query-immodules-3.0.hook gtk-update-icon-cache.hook gtk-update-icon-cache.script) sha256sums=('SKIP' - 'f722a70cb1affac8bd054a43b726f57aba21d664144fcaf6d58f18e5bef78189' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308' @@ -36,7 +34,6 @@ prepare() { mkdir print-backends cd gtk+ - patch -Np1 -i ../0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch NOCONFIGURE=1 ./autogen.sh }
