SOURCES: emacs-ncurses-tinfo.patch (NEW), emacs-enable-font-backen...

[qrczak]

Author: qrczak                       Date: Tue Feb  6 09:31:49 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Updated to 20070201 snapshot
- emacs-ncurses-tinfo.patch: link tinfo instead of ncurses to make it
  work in a terminal
- emacs-enable-font-backend.patch: --enable-font-backend is the default,
  use --disable-font-backend to override
- --with xft / --without xft should give consistent results no matter
  whether Xft and freetype are installed

---- Files affected:
SOURCES:
   emacs-ncurses-tinfo.patch (NONE -> 1.1)  (NEW), emacs-enable-font-backend.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/emacs-ncurses-tinfo.patch
diff -u /dev/null SOURCES/emacs-ncurses-tinfo.patch:1.1
--- /dev/null	Tue Feb  6 10:31:49 2007
+++ SOURCES/emacs-ncurses-tinfo.patch	Tue Feb  6 10:31:44 2007
@@ -0,0 +1,45 @@
+--- emacs/configure.in.~1.351.2.41.~	2007-01-30 23:22:40.000000000 +0100
++++ emacs/configure.in	2007-02-04 18:21:21.000000000 +0100
+@@ -2615,7 +2615,7 @@
+ # That is because we have not set up to link ncurses in lib-src.
+ # It's better to believe a function is not available
+ # than to expect to find it in ncurses.
+-AC_CHECK_LIB(ncurses, tparm)
++AC_CHECK_LIB(tinfo, tparm)
+ 
+ # Do we need the Hesiod library to provide the support routines?
+ if test "$with_hesiod" = yes ; then
+--- emacs/src/dispnew.c.~1.318.2.33.~	2007-01-26 07:15:07.000000000 +0100
++++ emacs/src/dispnew.c	2007-02-04 18:23:44.000000000 +0100
+@@ -102,7 +102,7 @@
+ #endif
+ #endif /* not __GNU_LIBRARY__ */
+ 
+-#if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
++#if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBTINFO)
+ #include <term.h>		/* for tgetent */
+ #endif
+ 
+@@ -6775,7 +6775,7 @@
+ #else
+       Vwindow_system_version = make_number (10);
+ #endif
+-#if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
++#if defined (GNU_LINUX) && defined (HAVE_LIBTINFO)
+       /* In some versions of ncurses,
+ 	 tputs crashes if we have not called tgetent.
+ 	 So call tgetent.  */
+--- emacs/src/s/gnu-linux.h.~1.88.2.10.~	2007-01-26 07:15:24.000000000 +0100
++++ emacs/src/s/gnu-linux.h	2007-02-04 18:24:44.000000000 +0100
+@@ -279,9 +279,9 @@
+ /* Paul Abrahams <abrahams at equinox.shaysnet.com> says this is needed.  */
+ #define LIB_MOTIF -lXm -lXpm
+ 
+-#ifdef HAVE_LIBNCURSES
++#ifdef HAVE_LIBTINFO
+ #define TERMINFO
+-#define LIBS_TERMCAP -lncurses
++#define LIBS_TERMCAP -ltinfo
+ #endif
+ 
+ #define HAVE_SYSVIPC

================================================================
Index: SOURCES/emacs-enable-font-backend.patch
diff -u /dev/null SOURCES/emacs-enable-font-backend.patch:1.1
--- /dev/null	Tue Feb  6 10:31:49 2007
+++ SOURCES/emacs-enable-font-backend.patch	Tue Feb  6 10:31:44 2007
@@ -0,0 +1,25 @@
+--- emacs/src/emacs.c.~1.328.4.41.~	2007-01-26 07:15:03.000000000 +0100
++++ emacs/src/emacs.c	2007-02-05 20:35:25.000000000 +0100
+@@ -1408,10 +1408,10 @@
+     = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
+ 
+ #ifdef USE_FONT_BACKEND
+-  enable_font_backend = 0;
+-  if (argmatch (argv, argc, "-enable-font-backend", "--enable-font-backend",
++  enable_font_backend = 1;
++  if (argmatch (argv, argc, "-disable-font-backend", "--disable-font-backend",
+ 		4, NULL, &skip_args))
+-    enable_font_backend = 1;
++    enable_font_backend = 0;
+ #endif	/* USE_FONT_BACKEND */
+ 
+ #ifdef HAVE_X_WINDOWS
+@@ -1816,7 +1816,7 @@
+   { "-unibyte", "--unibyte", 81, 0 },
+   { "-no-multibyte", "--no-multibyte", 80, 0 },
+   { "-nl", "--no-loadup", 70, 0 },
+-  { "-enable-font-backend", "--enable-font-backend", 65, 0 },
++  { "-disable-font-backend", "--disable-font-backend", 65, 0 },
+   /* -d must come last before the options handled in startup.el.  */
+   { "-d", "--display", 60, 1 },
+   { "-display", 0, 60, 1 },
================================================================