Attachment #103222 for bug #143113

View | Details | Raw Unified | Return to bug 143113
Collapse All | Expand All

Lines 39-44 Link Here

(-)b/editors/emacs/Makefile (+1 lines)
39		39
40	EMACS_VER= 23.1	40	EMACS_VER= 23.1
41	GNU_CONFIGURE= yes	41	GNU_CONFIGURE= yes
		42	USE_AUTOTOOLS= autoconf:262
42	USE_GMAKE= yes	43	USE_GMAKE= yes
43	USE_BZIP2= yes	44	USE_BZIP2= yes
44		45

Added Link Here

(-)b/editors/emacs/files/patch-ChangeLog (+11 lines)
1	--- ChangeLog.orig 2009-07-29 18:10:35.000000000 +0300
2	+++ ChangeLog 2010-01-23 11:35:20.591761496 +0200
3	@@ -1,3 +1,8 @@
4	+2010-01-18 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
5	+
6	+ * configure.in: Check for utmp.h availability, since some
7	+ systems don't have one (e.g. FreeBSD 9.X and later versions).
8	+
9	2009-07-29 Chong Yidong <cyd@stupidchicken.com>
10
11	* Version 23.1 released.

Added Link Here

(-)b/editors/emacs/files/patch-configure.in (+11 lines)
1	--- configure.in.orig 2009-07-29 18:09:49.000000000 +0300
2	+++ configure.in 2010-01-23 11:34:48.296987092 +0200
3	@@ -1014,7 +1014,7 @@
4	linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
5	termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
6	sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
7	- sys/utsname.h pwd.h)
8	+ sys/utsname.h pwd.h utmp.h)
9
10	AC_MSG_CHECKING(if personality LINUX32 can be set)
11	AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],




--- src/ChangeLog.orig	2009-07-29 19:55:12.000000000 +0300
+++ src/ChangeLog	2010-01-23 11:35:44.446334596 +0200
@@ -1,3 +1,9 @@
+2010-01-18  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+	* filelock.c: Include utmp.h only when HAVE_UTMP_H is true,
+	since some systems don't have one (e.g. FreeBSD 9.X and later
+	versions).
+
 2009-07-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 23.1 released.




--- src/filelock.c.orig	2009-06-21 07:38:14.000000000 +0300
+++ src/filelock.c	2010-01-23 11:34:48.414989942 +0200
@@ -62,7 +62,9 @@
 
 #ifdef CLASH_DETECTION
 
+#ifdef HAVE_UTMP_H
 #include <utmp.h>
+#endif
 
 #if !defined (S_ISLNK) && defined (S_IFLNK)
 #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)

Return to bug 143113

Added Link Here

(-)b/editors/emacs/files/patch-src-ChangeLog (+12 lines)
1	--- src/ChangeLog.orig 2009-07-29 19:55:12.000000000 +0300
2	+++ src/ChangeLog 2010-01-23 11:35:44.446334596 +0200
3	@@ -1,3 +1,9 @@
4	+2010-01-18 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
5	+
6	+ * filelock.c: Include utmp.h only when HAVE_UTMP_H is true,
7	+ since some systems don't have one (e.g. FreeBSD 9.X and later
8	+ versions).
9	+
10	2009-07-29 Chong Yidong <cyd@stupidchicken.com>
11
12	* Version 23.1 released.

Added Link Here

(-)b/editors/emacs/files/patch-src-filelock.c (+12 lines)
1	--- src/filelock.c.orig 2009-06-21 07:38:14.000000000 +0300
2	+++ src/filelock.c 2010-01-23 11:34:48.414989942 +0200
3	@@ -62,7 +62,9 @@
4
5	#ifdef CLASH_DETECTION
6
7	+#ifdef HAVE_UTMP_H
8	#include <utmp.h>
9	+#endif
10
11	#if !defined (S_ISLNK) && defined (S_IFLNK)
12	#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)