.
OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=31
This commit is contained in:
parent
37b96a94f9
commit
9050c93491
47
xemacs-tinfo.dif
Normal file
47
xemacs-tinfo.dif
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
--- configure.ac
|
||||||
|
+++ configure.ac 2011-11-22 14:21:37.303146192 +0000
|
||||||
|
@@ -4946,15 +4946,30 @@ if test "$with_tty" = "yes" ; then
|
||||||
|
AC_DEFINE(HAVE_TTY)
|
||||||
|
|
||||||
|
dnl Autodetect ncurses.
|
||||||
|
+ cf_tgetent=""
|
||||||
|
if test -z "$with_ncurses"; then
|
||||||
|
- AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no)
|
||||||
|
+ with_ncurses=no;
|
||||||
|
+ for lib in tinfo ncurses ncursesw ; do
|
||||||
|
+ AC_CHECK_LIB($lib, tgetent, [with_ncurses=yes; cf_tgetent="$lib"; break])
|
||||||
|
+ done
|
||||||
|
fi
|
||||||
|
if test "$with_ncurses" = "yes"; then
|
||||||
|
+ if test x$cf_tgetent = x ; then
|
||||||
|
+ for lib in tinfo ncurses ncursesw ; do
|
||||||
|
+ AC_CHECK_LIB($lib, tgetent, [cf_tgetent="$lib"; break])
|
||||||
|
+ done
|
||||||
|
+ fi
|
||||||
|
AC_DEFINE(HAVE_NCURSES)
|
||||||
|
- AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
|
||||||
|
- AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
|
||||||
|
+ if test "$cf_tgetent" = ncursesw; then
|
||||||
|
+ AC_DEFINE(HAVE_NCURSESW)
|
||||||
|
+ AC_CHECK_HEADER(ncursesw/curses.h, curses_h_file=ncursesw/curses.h)
|
||||||
|
+ AC_CHECK_HEADER(ncursesw/term.h, term_h_file=ncursesw/term.h)
|
||||||
|
+ else
|
||||||
|
+ AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
|
||||||
|
+ AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
|
||||||
|
+ fi
|
||||||
|
XE_ADD_OBJS(terminfo.o)
|
||||||
|
- XE_PREPEND(-lncurses, LIBS)
|
||||||
|
+ XE_PREPEND(-l$cf_tgetent, LIBS)
|
||||||
|
|
||||||
|
if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
|
||||||
|
dnl Try again, and check for the bogus ncurses/ include bug.
|
||||||
|
--- src/config.h.in
|
||||||
|
+++ src/config.h.in 2011-11-22 14:21:50.939646812 +0000
|
||||||
|
@@ -580,6 +580,7 @@ things are arranged in config.h.in. In
|
||||||
|
|
||||||
|
/* Compile in support for ncurses? */
|
||||||
|
#undef HAVE_NCURSES
|
||||||
|
+#undef HAVE_NCURSESW
|
||||||
|
/* Full #include file paths for ncurses' curses.h and term.h. */
|
||||||
|
#undef CURSES_H_FILE
|
||||||
|
#undef TERM_H_FILE
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 22 14:24:50 UTC 2011 - werner@suse.de
|
||||||
|
|
||||||
|
- Add patch to use libtinfo if available
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 3 20:11:46 UTC 2011 - coolo@novell.com
|
Fri Jun 3 20:11:46 UTC 2011 - coolo@novell.com
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ Requires: xemacs-info xemacs-packages ctags
|
|||||||
Conflicts: gnuserv
|
Conflicts: gnuserv
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 21.5.29.b604d235f028
|
Version: 21.5.29.b604d235f028
|
||||||
Release: 10
|
Release: 12
|
||||||
Summary: XEmacs
|
Summary: XEmacs
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
# Howto get the Mercurial tree of XEmacs:
|
# Howto get the Mercurial tree of XEmacs:
|
||||||
@ -75,6 +75,7 @@ Patch32: do-not-create-backups-in-temp-directories.patch
|
|||||||
Patch33: set-locale-to-c-when-not-supported-by-x.patch
|
Patch33: set-locale-to-c-when-not-supported-by-x.patch
|
||||||
Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch
|
Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch
|
||||||
Patch38: unitialized-variables.patch
|
Patch38: unitialized-variables.patch
|
||||||
|
Patch39: xemacs-tinfo.dif
|
||||||
Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch
|
Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch
|
||||||
Patch42: build-fix-ccl-load-problem.patch
|
Patch42: build-fix-ccl-load-problem.patch
|
||||||
Patch43: set-language-unicode-precedence-list.patch
|
Patch43: set-language-unicode-precedence-list.patch
|
||||||
@ -164,6 +165,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
|
|||||||
%patch33 -p1
|
%patch33 -p1
|
||||||
#%patch34 -p1
|
#%patch34 -p1
|
||||||
%patch38 -p1
|
%patch38 -p1
|
||||||
|
%patch39 -p0
|
||||||
#%patch40 -p1
|
#%patch40 -p1
|
||||||
#%patch41 -p1
|
#%patch41 -p1
|
||||||
#%patch42 -p1
|
#%patch42 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user