From 4ec8c3b4b6d8d13eb41467cc8d59981dea47b663 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: May 03 2016 10:32:36 +0000 Subject: emacs starts in a very small window (#1332451) Resolves: #1332451 --- diff --git a/emacs-small-window.patch b/emacs-small-window.patch new file mode 100644 index 0000000..bdcf5ad --- /dev/null +++ b/emacs-small-window.patch @@ -0,0 +1,30 @@ +From afc9e6542aa6f2d0d7986db3d8c2cb654e107443 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 1 Apr 2016 16:55:21 -0700 +Subject: [PATCH] Fix resize incompatibility with GTK+ master + +Problem reported by Matthias Clasen (Bug#23144). +* src/xterm.c (handle_one_xevent) [USE_GTK]: +Do not call xg_frame_resized. +--- + src/xterm.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/xterm.c b/src/xterm.c +index ba9bf50..7108207 100644 +--- a/src/xterm.c ++++ b/src/xterm.c +@@ -7895,10 +7895,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, + /* Force a redisplay sooner or later to update the + frame titles in case this is the second frame. */ + record_asynch_buffer_change (); +- +-#ifdef USE_GTK +- xg_frame_resized (f, -1, -1); +-#endif + } + goto OTHER; + +-- +2.7.4 + diff --git a/emacs.spec b/emacs.spec index c641d08..1439e26 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 25.0.93 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -25,6 +25,8 @@ Patch1: emacs-spellchecker.patch # Fix for default PDF viewer bug #971162 Patch2: emacs-pdf-default.patch Patch3: emacs-system-crypto-policies.patch +# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=afc9e6542aa6f2d0d7986db3d8c2cb654e107443 +Patch4: emacs-small-window.patch BuildRequires: atk-devel BuildRequires: cairo-devel @@ -167,6 +169,7 @@ packages that add functionality to Emacs. %patch1 -p1 -b .spellchecker %patch2 -p1 -b .pdf-default.patch %patch3 -p1 -b .system-crypto-policies +%patch4 -p1 -b .small-window autoconf # We prefer our emacs.desktop file @@ -429,6 +432,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue May 3 2016 Jan Synáček - 1:25.0.93-2 +- emacs starts in a very small window (#1332451) + * Mon Apr 25 2016 Jan Synáček - 1:25.0.93 - update to 25.0.93 and enable webkit support