From 07d978b05ba596727372a92758dc84e101052263 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: May 18 2016 07:20:56 +0000 Subject: update to 25.0.94 --- diff --git a/.gitignore b/.gitignore index 2c55ed1..386a993 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /emacs-24.5.tar.xz /emacs-25.0.92.tar.xz /emacs-25.0.93.tar.xz +/emacs-25.0.94.tar.xz diff --git a/emacs-small-window.patch b/emacs-small-window.patch deleted file mode 100644 index bdcf5ad..0000000 --- a/emacs-small-window.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 1439e26..a96bf99 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,8 +4,8 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 25.0.93 -Release: 2%{?dist} +Version: 25.0.94 +Release: 1%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -25,8 +25,6 @@ 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 @@ -169,7 +167,6 @@ 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 @@ -432,6 +429,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Wed May 18 2016 Jan Synáček - 1:25.0.94-1 +- update to 25.0.94 + * Tue May 3 2016 Jan Synáček - 1:25.0.93-2 - emacs starts in a very small window (#1332451) diff --git a/sources b/sources index 4c2de01..acfdf6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55fac9d323528ae018746ac5bc4bc591 emacs-25.0.93.tar.xz +f014b1590f588df9248f6926637a71c6 emacs-25.0.94.tar.xz