This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
daa3c70828
commit
2b6d4bbfa8
@ -1,191 +0,0 @@
|
||||
--- ../xterm.old/Imakefile 2002-12-14 23:15:55.000000000 +0100
|
||||
+++ programs/xterm/Imakefile 2002-12-14 23:25:58.000000000 +0100
|
||||
@@ -13,8 +13,12 @@
|
||||
/* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */
|
||||
SCROLLBAR_RIGHT = -DSCROLLBAR_RIGHT
|
||||
|
||||
+/* We use a xtermcfg.h */
|
||||
+USECONFIGH = -DHAVE_CONFIG_H
|
||||
+
|
||||
/* Define UTF8support to compile-in support for UTF-8 */
|
||||
#define UTF8support
|
||||
+#define UseUtempter
|
||||
|
||||
/*
|
||||
* Fixes to allow compile with X11R5
|
||||
@@ -121,3 +121,3 @@
|
||||
PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
|
||||
- DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
|
||||
+ DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) $(USECONFIGH)
|
||||
INCLUDES = -I. $(XRFINCLUDES)
|
||||
--- /dev/null 2002-12-13 03:40:58.000000000 +0000
|
||||
+++ programs/xterm/xtermcfg.h 2002-12-15 14:18:04.000000000 +0000
|
||||
@@ -0,0 +1,150 @@
|
||||
+/* xtermcfg.h. Generated automatically by configure. */
|
||||
+/*
|
||||
+ * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.41 2002/08/17 19:52:27 dickey Exp $
|
||||
+ */
|
||||
+
|
||||
+/************************************************************
|
||||
+
|
||||
+Copyright 1997-2001,2002 by Thomas E. Dickey
|
||||
+
|
||||
+ All Rights Reserved
|
||||
+
|
||||
+Permission to use, copy, modify, and distribute this software and its
|
||||
+documentation for any purpose and without fee is hereby granted,
|
||||
+provided that the above copyright notice appear in all copies and that
|
||||
+both that copyright notice and this permission notice appear in
|
||||
+supporting documentation, and that the name of the above listed
|
||||
+copyright holder(s) not be used in advertising or publicity pertaining
|
||||
+to distribution of the software without specific, written prior
|
||||
+permission.
|
||||
+
|
||||
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
|
||||
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
|
||||
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
+
|
||||
+********************************************************/
|
||||
+
|
||||
+#ifndef included_xtermcfg_h
|
||||
+#define included_xtermcfg_h 1
|
||||
+
|
||||
+/* This is a template for <xtermcfg.h> */
|
||||
+
|
||||
+/* #undef ALLOWLOGFILEEXEC */ /* CF_ARG_ENABLE(enable-logfile-exec) */
|
||||
+/* #undef ALLOWLOGGING */ /* CF_ARG_ENABLE(enable-logging) */
|
||||
+#define CC_HAS_PROTOS 1 /* CF_ANSI_CC */
|
||||
+/* #undef DECL_ERRNO */ /* CF_ERRNO */
|
||||
+/* #undef DFT_COLORMODE */ /* AC_ARG_WITH(default-color-mode) */
|
||||
+#define DFT_DECID "100" /* AC_ARG_WITH(default-terminal-id) */
|
||||
+#define DFT_TERMTYPE "xterm" /* AC_ARG_WITH(default-term-type) */
|
||||
+#define HAVE_GETLOGIN 1 /* AC_CHECK_FUNCS(getlogin) */
|
||||
+#define HAVE_LANGINFO_CODESET 1 /* AM_LANGINFO_CODESET */
|
||||
+#define HAVE_LASTLOG_H 1 /* CF_LASTLOG */
|
||||
+/* #undef HAVE_LIB_NEXTAW */ /* CF_X_ATHENA(--with-neXtaw) */
|
||||
+#define HAVE_LIB_XAW 1 /* CF_X_ATHENA */
|
||||
+/* #undef HAVE_LIB_XAW3D */ /* CF_X_ATHENA(--with-Xaw3d) */
|
||||
+/* #undef HAVE_NCURSES_TERM_H */ /* AC_CHECK_HEADERS(ncurses/term.h) */
|
||||
+#define HAVE_PATHS_H 1 /* CF_LASTLOG */
|
||||
+#define HAVE_STDLIB_H 1 /* AC_CHECK_HEADERS(stdlib.h) */
|
||||
+#define HAVE_STRERROR 1 /* AC_CHECK_FUNCS(strerror) */
|
||||
+/* #undef HAVE_SYS_TIME_H */ /* AC_HEADER_TIME */
|
||||
+#define HAVE_SYS_WAIT_H 1 /* AC_HEADER_SYS_WAIT */
|
||||
+#define HAVE_TCGETATTR 1 /* AC_CHECK_FUNCS(tcgetattr) */
|
||||
+#define HAVE_TERMCAP_H 1 /* AC_CHECK_HEADERS(termcap.h) */
|
||||
+#define HAVE_TERMIOS_H 1 /* AC_CHECK_HEADERS(termios.h) */
|
||||
+/* #undef HAVE_TERMIO_C_ISPEED */ /* CF_TERMIO_C_ISPEED */
|
||||
+#define HAVE_UNISTD_H 1 /* AC_CHECK_HEADERS(unistd.h) */
|
||||
+#define HAVE_UTMP 1 /* CF_UTMP */
|
||||
+#define HAVE_UTMP_UT_HOST 1 /* CF_UTMP_UT_HOST */
|
||||
+#define HAVE_UTMP_UT_SESSION 1 /* CF_UTMP_UT_SESSION */
|
||||
+#define HAVE_UTMP_UT_XSTATUS 1 /* CF_UTMP_UT_XSTATUS */
|
||||
+#define HAVE_UTMP_UT_XTIME 1 /* CF_UTMP_UT_XTIME */
|
||||
+#define HAVE_WAITPID 1 /* AC_CHECK_FUNCS(waitpid) */
|
||||
+#define HAVE_X11_DECKEYSYM_H 1 /* AC_CHECK_HEADERS(X11/DECkeysym.h) */
|
||||
+#define HAVE_X11_SUNKEYSYM_H 1 /* AC_CHECK_HEADERS(X11/Sunkeysym.h) */
|
||||
+#define HAVE_X11_XPOLL_H 1 /* AC_CHECK_HEADERS(X11/Xpoll.h) */
|
||||
+/* #undef HAVE_XKBSTDBELL */ /* AC_CHECK_FUNCS(XkbStdBell) */
|
||||
+/* #undef NO_ACTIVE_ICON */ /* CF_ARG_DISABLE(active-icon) */
|
||||
+#define OPT_256_COLORS 1 /* CF_ARG_ENABLE(256-color) */
|
||||
+/* #undef OPT_88_COLORS */ /* CF_ARG_ENABLE(88-color) */
|
||||
+/* #undef OPT_AIX_COLORS */ /* CF_ARG_DISABLE(16-color) */
|
||||
+/* #undef OPT_BLINK_CURS */ /* CF_ARG_DISABLE(blink-cursor) */
|
||||
+/* #undef OPT_BOX_CHARS */ /* CF_ARG_DISABLE(boxchars) */
|
||||
+/* #undef OPT_COLOR_CLASS */ /* CF_ARG_DISABLE(color-class) */
|
||||
+/* #undef OPT_DEC_CHRSET */ /* CF_ARG_DISABLE(doublechars) */
|
||||
+#define OPT_DEC_LOCATOR 1 /* CF_ARG_ENABLE(dec-locator) */
|
||||
+/* #undef OPT_HIGHLIGHT_COLOR */ /* CF_ARG_DISABLE(highlighting) */
|
||||
+#define OPT_HP_FUNC_KEYS 1 /* CF_ARG_ENABLE(hp-fkeys) */
|
||||
+/* #undef OPT_I18N_SUPPORT */ /* CF_ARG_DISABLE(i18n) */
|
||||
+/* #undef OPT_INITIAL_ERASE */ /* CF_ARG_DISABLE(initial-erase) */
|
||||
+/* #undef OPT_INPUT_METHOD */ /* CF_ARG_DISABLE(input-method) */
|
||||
+/* #undef OPT_ISO_COLORS */ /* CF_ARG_DISABLE(ansi-color) */
|
||||
+#define OPT_LUIT_PROG 1 /* CF_ARG_ENABLE(luit) */
|
||||
+/* #undef OPT_MAXIMIZE */ /* CF_ARG_DISABLE(maximize) */
|
||||
+#define OPT_MINI_LUIT 1 /* CF_ARG_ENABLE(mini-luit) */
|
||||
+/* #undef OPT_NUM_LOCK */ /* CF_ARG_DISABLE(num-lock) */
|
||||
+/* #undef OPT_PC_COLORS */ /* CF_ARG_DISABLE(pc-color) */
|
||||
+/* #undef OPT_SAME_NAME */
|
||||
+#define OPT_SCO_FUNC_KEYS 1 /* CF_ARG_ENABLE(sco-fkeys) */
|
||||
+/* #undef OPT_TCAP_QUERY */
|
||||
+/* #undef OPT_TEK4014 */ /* CF_ARG_DISABLE(tek4014) */
|
||||
+/* #undef OPT_TOOLBAR */ /* CF_ARG_ENABLE(toolbar) */
|
||||
+/* #undef OPT_TRACE */ /* CF_ARG_ENABLE(trace) */
|
||||
+/* #undef OPT_VT52_MODE */ /* CF_ARG_DISABLE(vt52) */
|
||||
+#define OPT_WIDE_CHARS 1 /* CF_ARG_OPTION(wide-chars) */
|
||||
+/* #undef OPT_XMC_GLITCH */ /* CF_ARG_ENABLE(xmc-glitch) */
|
||||
+/* #undef OPT_ZICONBEEP */ /* CF_ARG_DISABLE(ziconbeep) */
|
||||
+/* #undef OWN_TERMINFO_DIR */ /* AC_ARG_WITH(own-terminfo) */
|
||||
+#define SCROLLBAR_RIGHT 1 /* CF_ARG_ENABLE(rightbar) */
|
||||
+/* #undef SVR4 */ /* CF_SVR4, imake */
|
||||
+/* #undef SYSV */ /* CF_SYSV, imake */
|
||||
+#define TIME_WITH_SYS_TIME 1 /* AC_HEADER_TIME */
|
||||
+#define TTY_GROUP_NAME "tty" /* CF_TTY_GROUP */
|
||||
+#define USE_LASTLOG 1 /* CF_LASTLOG */
|
||||
+/* #undef USE_MY_MEMMOVE */ /* CF_FUNC_MEMMOVE */
|
||||
+/* #undef USE_OK_BCOPY */ /* CF_FUNC_MEMMOVE */
|
||||
+#define USE_POSIX_WAIT 1 /* CF_POSIX_WAIT */
|
||||
+#define USE_SYSV_UTMP 1 /* CF_UTMP */
|
||||
+/* #undef USE_SYS_SELECT_H */ /* CF_TYPE_FD_SET */
|
||||
+/* #undef USE_TERMCAP */ /* CF_FUNC_TGETENT */
|
||||
+#define USE_TERMINFO 1 /* CF_FUNC_TGETENT */
|
||||
+#define USE_TTY_GROUP 1 /* CF_TTY_GROUP */
|
||||
+#define USE_UTEMPTER 1 /* CF_UTEMPTER */
|
||||
+/* #undef UTMPX_FOR_UTMP */ /* CF_UTMP */
|
||||
+#define XRENDERFONT 1 /* CF_X_FREETYPE */
|
||||
+/* #undef const */ /* AC_CONST */
|
||||
+/* #undef size_t */ /* AC_TYPE_SIZE_T */
|
||||
+/* #undef time_t */ /* AC_CHECK_TYPE(time_t, long) */
|
||||
+/* #undef ut_name */ /* CF_UTMP */
|
||||
+#define ut_xstatus ut_exit.e_exit /* CF_UTMP_UT_XSTATUS */
|
||||
+/* #undef ut_xtime */ /* CF_UTMP_UT_XTIME */
|
||||
+
|
||||
+/* #undef GCC_PRINTF */
|
||||
+/* #undef GCC_UNUSED */
|
||||
+
|
||||
+#ifdef USE_OK_BCOPY
|
||||
+#define memmove(d,s,n) bcopy(s,d,n)
|
||||
+#endif
|
||||
+
|
||||
+#ifdef USE_MY_MEMMOVE
|
||||
+#define memmove(d,s,n) my_memmove(d,s,n)
|
||||
+extern char * my_memmove(char * s1, char * s2, size_t n);
|
||||
+#endif
|
||||
+
|
||||
+#ifndef HAVE_STRERROR
|
||||
+#define strerror(n) my_strerror(n)
|
||||
+extern char *my_strerror(int n);
|
||||
+#endif
|
||||
+
|
||||
+#ifndef HAVE_X11_XPOLL_H
|
||||
+#define NO_XPOLL_H /* X11R6.1 & up use Xpoll.h for select() definitions */
|
||||
+#endif
|
||||
+
|
||||
+#ifndef HAVE_XKBSTDBELL
|
||||
+#define NO_XKBSTDBELL /* IRIX 6.2 incorrectly defines XKB in imake */
|
||||
+#endif
|
||||
+
|
||||
+#endif /* included_xtermcfg_h */
|
||||
--- main.h.orig 2004-08-15 11:04:36.139302948 +0000
|
||||
+++ programs/xterm/main.h 2004-08-15 11:05:25.696950729 +0000
|
||||
@@ -73,15 +73,7 @@
|
||||
#define PROJECTROOT "/usr/X11R6"
|
||||
#endif
|
||||
|
||||
-/*
|
||||
- * The configure script quotes PROJECTROOT's value.
|
||||
- * imake does not quote PROJECTROOT's value.
|
||||
- */
|
||||
-#ifdef HAVE_CONFIG_H
|
||||
-#define DEFLOCALEFILTER2(x) x
|
||||
-#else
|
||||
#define DEFLOCALEFILTER2(x) #x
|
||||
-#endif
|
||||
|
||||
#define DEFLOCALEFILTER1(x) DEFLOCALEFILTER2(x)
|
||||
#define DEFLOCALEFILTER DEFLOCALEFILTER1(PROJECTROOT) "/bin/luit"
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 17 13:13:12 CET 2007 - sndirsch@suse.de
|
||||
|
||||
- enabled double-width support; switched to configure (Bug #246573)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 12 14:33:36 CET 2007 - sndirsch@suse.de
|
||||
|
||||
|
||||
41
xterm.spec
41
xterm.spec
@ -18,7 +18,7 @@ Group: System/X11/Utilities
|
||||
Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
|
||||
Autoreqprov: on
|
||||
Version: 224
|
||||
Release: 1
|
||||
Release: 3
|
||||
Summary: The basic X terminal program
|
||||
Source: %name.tar.gz
|
||||
Source1: luitx
|
||||
@ -30,7 +30,6 @@ Source6: terminal.png
|
||||
Source7: vttest.tar.gz
|
||||
Source8: 20x20ja.bdf.bz2
|
||||
Source9: 20x20ko.bdf.bz2
|
||||
Patch: p_xterm-config.diff
|
||||
Patch1: p_xterm-settings.diff
|
||||
Patch2: p_xterm-sigwinch.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -151,18 +150,24 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -n xterm-%version -b7
|
||||
%patch -p2 -b .xterm-config
|
||||
%patch1 -p0 -b .xterm-settings
|
||||
%patch2 -p0 -b .xterm-sigwinch
|
||||
cp $RPM_SOURCE_DIR/*bdf.bz2 .
|
||||
bunzip2 *.bdf.bz2
|
||||
|
||||
%build
|
||||
xmkmf -a
|
||||
make CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
%configure --enable-256-color \
|
||||
--enable-dec-locator \
|
||||
--enable-hp-fkeys \
|
||||
--enable-luit \
|
||||
--enable-mini-luit \
|
||||
--enable-sco-fkeys \
|
||||
--enable-wide-chars \
|
||||
--with-utempter \
|
||||
--with-app-defaults=/usr/share/X11/app-defaults
|
||||
make
|
||||
pushd ../vttest-20050107
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
./configure --prefix=/usr --mandir=%{_mandir}
|
||||
%configure
|
||||
make
|
||||
popd
|
||||
for i in *.bdf
|
||||
@ -171,8 +176,16 @@ do
|
||||
done
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/usr/bin
|
||||
make install.man DESTDIR=$RPM_BUILD_ROOT MANDIR=%_mandir/man1
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
if [ -d /usr/share/fonts ]; then
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/etc/
|
||||
install -m 644 terminfo $RPM_BUILD_ROOT/usr/lib/X11/etc/xterm.terminfo
|
||||
install -m 644 termcap $RPM_BUILD_ROOT/usr/lib/X11/etc/xterm.termcap
|
||||
else
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/
|
||||
install -m 644 terminfo $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/xterm.terminfo
|
||||
install -m 644 termcap $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/xterm.termcap
|
||||
fi
|
||||
pushd ../vttest-20050107
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
popd
|
||||
@ -191,7 +204,7 @@ else
|
||||
install -m 644 *.pcf.gz $RPM_BUILD_ROOT/usr/share/fonts/misc/
|
||||
fi
|
||||
%suse_update_desktop_file -i xterm TerminalEmulator
|
||||
if [ -d $RPM_BUILD_ROOT/usr/lib/X11/etc ]; then
|
||||
if [ -d $RPM_BUILD_ROOT/usr/share/fonts/misc ]; then
|
||||
cat > files.xterm << EOF
|
||||
%dir /usr/lib/X11/etc
|
||||
%dir /usr/share/fonts/misc/
|
||||
@ -236,13 +249,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/usr/bin/uxterm
|
||||
/usr/bin/Backarrow2Delete
|
||||
/usr/bin/Backarrow2BackSpace
|
||||
/usr/share/man/man1/xterm.1x.gz
|
||||
/usr/share/man/man1/resize.1x.gz
|
||||
/usr/share/man/man1/xterm.1.gz
|
||||
/usr/share/man/man1/resize.1.gz
|
||||
%{_mandir}/man1/vttest.1.gz
|
||||
/usr/share/applications/xterm.desktop
|
||||
/usr/share/pixmaps/terminal.png
|
||||
|
||||
%changelog -n xterm
|
||||
%changelog
|
||||
* Sat Feb 17 2007 - sndirsch@suse.de
|
||||
- enabled double-width support; switched to configure (Bug #246573)
|
||||
* Mon Feb 12 2007 - sndirsch@suse.de
|
||||
- updated to xterm-224 (2007/02/11)
|
||||
* simplify code for set/reset mode for blinking cursor (patch by
|
||||
|
||||
Loading…
Reference in New Issue
Block a user