]> git.pld-linux.org Git - packages/emacs.git/commitdiff
- fix:
authorJan Rękorajski <baggins@pld-linux.org>
Tue, 8 May 2012 12:28:20 +0000 (12:28 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9754
https://bugzilla.redhat.com/show_bug.cgi?id=752936
https://bugzilla.redhat.com/show_bug.cgi?id=751154

Changed files:
    emacs-xgselect_init.patch -> 1.1
    emacs.spec -> 1.117

emacs-xgselect_init.patch [new file with mode: 0644]
emacs.spec

diff --git a/emacs-xgselect_init.patch b/emacs-xgselect_init.patch
new file mode 100644 (file)
index 0000000..f3168e0
--- /dev/null
@@ -0,0 +1,13 @@
+diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c
+--- emacs-23.3/src/xgselect.c.xgselect_init    2011-01-08 18:45:14.000000000 +0100
++++ emacs-23.3/src/xgselect.c  2011-11-11 13:00:53.211765255 +0100
+@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti
+   do {
+     if (n_gfds > gfds_size) 
+       {
++        if (gfds_size == 0)
++          xgselect_initialize ();
++
+         while (n_gfds > gfds_size) 
+           gfds_size *= 2;
+         xfree (gfds);
index 03c6cc1549cf078f87ab3538f02d1678f2c4166c..230b003443bf7cd2450f2bae9ac37f4ad20d37f5 100644 (file)
@@ -34,7 +34,8 @@ Source6:      %{name}-athena.desktop
 Source7:       %{name}-gtk.desktop
 Source8:       %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
-Patch1:                %{name}-fontconfig.patch
+Patch0:                %{name}-fontconfig.patch
+Patch1:                %{name}-xgselect_init.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -381,6 +382,7 @@ exit 1
 %endif
 
 %setup -q -n %{name}-%{ver}
+%patch0 -p1
 %patch1 -p1
 
 %build
This page took 0.075298 seconds and 4 git commands to generate.