Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked
in at 2014-08-01 14:34:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2014-07-18
06:40:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2014-08-01
14:34:33.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Jul 31 10:39:19 UTC 2014 - pce...@suse.com
+
+- Patch #310 - 2014/07/25
+ * update package/freebsd files based on xterm #309 port
+ * adapt changes from Minux3.2 which ported xterm #197, to allow
+ building on that platform both using imake as well as using
+ the configure script
+ * update precompose.c based on Unicode 7.0
+ * build-fix for --with-Xaw3dxft option (report by Emanuel Haupt)
+
+-------------------------------------------------------------------
Old:
----
xterm-309.tgz
xterm-309.tgz.asc
New:
----
xterm-310.tgz
xterm-310.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.VIqvd3/_old 2014-08-01 14:34:35.000000000 +0200
+++ /var/tmp/diff_new_pack.VIqvd3/_new 2014-08-01 14:34:35.000000000 +0200
@@ -52,7 +52,7 @@
%if 0%{?suse_version} > 1210
Requires: luit
%endif
-Version: 309
+Version: 310
Release: 0
Summary: The basic X terminal program
License: MIT
++++++ xterm-309.tgz -> xterm-310.tgz ++++++
++++ 11661 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/Imakefile new/xterm-310/Imakefile
--- old/xterm-309/Imakefile 2014-04-11 21:36:41.000000000 +0200
+++ new/xterm-310/Imakefile 2014-07-23 00:29:17.000000000 +0200
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $
+XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -140,7 +140,7 @@
# endif
#endif
-#if !defined(OS2Architecture) && !defined(__GNU__)
+#if !defined(OS2Architecture) && !defined(__GNU__) &&
!defined(Minix3Architecture)
#if defined(UseUtempter)
UTMPDEF = -DUSE_UTEMPTER
#else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/MANIFEST new/xterm-310/MANIFEST
--- old/xterm-309/MANIFEST 2014-06-28 16:34:28.000000000 +0200
+++ new/xterm-310/MANIFEST 2014-07-15 01:36:58.000000000 +0200
@@ -1,4 +1,4 @@
-MANIFEST for xterm-309, version xterm-309
+MANIFEST for xterm-310, version xterm-310
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/graphics_sixel.c new/xterm-310/graphics_sixel.c
--- old/xterm-309/graphics_sixel.c 2014-05-03 00:53:20.000000000 +0200
+++ new/xterm-310/graphics_sixel.c 2014-07-15 23:07:44.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: graphics_sixel.c,v 1.8 2014/05/02 22:53:20 tom Exp $ */
+/* $XTermId: graphics_sixel.c,v 1.9 2014/07/15 21:07:44 tom Exp $ */
/*
* Copyright 2014 by Ross Combs
@@ -214,7 +214,6 @@
* Interpret sixel graphics sequences.
*
* Resources:
- * http://en.wikipedia.org/wiki/Sixel
* http://vt100.net/docs/vt3xx-gp/chapter14.html
* ftp://ftp.cs.utk.edu/pub/shuford/terminal/sixel_graphics_news.txt
* ftp://ftp.cs.utk.edu/pub/shuford/terminal/all_about_sixels.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/main.c new/xterm-310/main.c
--- old/xterm-309/main.c 2014-07-13 00:50:07.000000000 +0200
+++ new/xterm-310/main.c 2014-07-25 00:47:09.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.760 2014/07/12 22:50:07 Steve.Wall Exp $ */
+/* $XTermId: main.c,v 1.762 2014/07/24 22:47:09 tom Exp $ */
/*
* Copyright 2002-2013,2014 by Thomas E. Dickey
@@ -2509,7 +2509,7 @@
}
#endif
#endif
-#if defined(USE_ANY_SYSV_TERMIO) || defined(__MVS__)
+#if defined(USE_ANY_SYSV_TERMIO) || defined(__MVS__) || defined(__minix)
if (0 > (mode = fcntl(screen->respond, F_GETFL, 0)))
SysError(ERROR_F_GETFL);
#ifdef O_NDELAY
@@ -5372,3 +5372,17 @@
return (rps.status);
}
#endif
+
+#ifdef __minix
+int
+setpgrp(void)
+{
+ return 0;
+}
+
+void
+_longjmp(jmp_buf _env, int _val)
+{
+ longjmp(_env, _val);
+}
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/package/debian/changelog new/xterm-310/package/debian/changelog
--- old/xterm-309/package/debian/changelog 2014-06-28 16:34:28.000000000
+0200
+++ new/xterm-310/package/debian/changelog 2014-07-15 01:36:58.000000000
+0200
@@ -1,3 +1,9 @@
+xterm-dev (310) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 14 Jul 2014 19:36:58
-0400
+
xterm-dev (309) unstable; urgency=low
* maintenance updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/package/freebsd/Makefile new/xterm-310/package/freebsd/Makefile
--- old/xterm-309/package/freebsd/Makefile 2014-06-28 16:34:28.000000000
+0200
+++ new/xterm-310/package/freebsd/Makefile 2014-07-26 01:40:38.000000000
+0200
@@ -5,94 +5,96 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 309
+PORTVERSION= 310
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
PKGNAMESUFFIX= -dev
EXTRACT_SUFX= .tgz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src1 \
+ bsd-xterm-icons-${ICONVERSION}${EXTRACT_SUFX}:src2
-MAINTAINER= dic...@invisible-island.net
-COMMENT= Terminal emulator for the X Window System (development)
+MAINTAINER= eha...@freebsd.org
+COMMENT= Terminal emulator for the X Window System
CONFLICTS= x11iraf-[0-9]*
-USE_XORG= xaw xft
-WANT_GNOME= desktopfileutils
+USE_XORG= xft
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --with-utempter --enable-narrowproto --enable-256-color
+CONFIGURE_ARGS+= --with-utempter --enable-narrowproto
CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE GNOME DABBREV TOOLBAR
+ICONVERSION= 1
+
+OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME
LOGGING TOOLBAR
+OPTIONS_RADIO= 3D
+OPTIONS_RADIO_3D= XAW3D XAW3DXFT NEXTAW
TOOLBAR_DESC= Enable support menu/toolbar
DABBREV_DESC= Enable support for dabbrev-expand
DECTERM_DESC= Enable DECterm Locator support
LUIT_DESC= Use LUIT for locale convertion from/to UTF-8
+SIXEL_DESC= Enable Sixel graphics support
WCHAR_DESC= Enable wide-character support
+256COLOR_DESC= Enable 256-color support
+LOGGING_DESC= Enable logging terminal I/O to a file
+XAW3D_DESC= Link with Xaw 3d library
+XAW3DXFT_DESC= Link with Xaw 3d xft (extended fonts) library
+NEXTAW_DESC= Link with neXT Athena library
+
+OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
+
+256COLOR_CONFIGURE_ENABLE= 256-color
+LUIT_BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit
+LUIT_CONFIGURE_ENABLE= luit
+WCHAR_CONFIGURE_ENABLE= wide-chars
+DECTERM_CONFIGURE_ENABLE= dec-locator
+PCRE_CONFIGURE_WITH= pcre
+PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
+DABBREV_CONFIGURE_ENABLE= dabbrev
+SIXEL_CONFIGURE_ENABLE= sixel-graphics
+GNOME_USES= desktop-file-utils
+LOGGING_CONFIGURE_ENABLE= logging
+TOOLBAR_CONFIGURE_ENABLE= toolbar
+XAW3D_CONFIGURE_WITH= Xaw3d
+XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3DXFT_CONFIGURE_WITH= Xaw3dxft
+XAW3DXFT_LIB_DEPENDS=
libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft
+NEXTAW_CONFIGURE_WITH= neXtaw
+NEXTAW_LIB_DEPENDS= libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
PKG_CLASS= XTermDev
.include <bsd.port.options.mk>
CONFIGURE_ARGS+= --program-suffix=${PKGNAMESUFFIX}
--with-app-class=${PKG_CLASS} --without-xterm-symlink
-
-.if ${PORT_OPTIONS:MLUIT}
-CONFIGURE_ARGS+= --enable-luit
-BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit
-.endif
-
-.if ${PORT_OPTIONS:MWCHAR}
-CONFIGURE_ARGS+= --enable-wide-chars
-.endif
-
-.if ${PORT_OPTIONS:MDECTERM}
-CONFIGURE_ARGS+= --enable-dec-locator
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-CONFIGURE_ARGS+= --with-pcre
-LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
-.endif
-
-.if ${PORT_OPTIONS:MDABBREV}
-CONFIGURE_ARGS+= --enable-dabbrev
-.endif
-
-.if ${PORT_OPTIONS:MTOOLBAR}
-CONFIGURE_ARGS+= --enable-toolbar
-.endif
-
-.if ${PORT_OPTIONS:MGNOME}
-USE_GNOME= desktopfileutils
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
MAN1= resize${PKGNAMESUFFIX}.1 koi8rxterm${PKGNAMESUFFIX}.1
uxterm${PKGNAMESUFFIX}.1 xterm${PKGNAMESUFFIX}.1
-.include <bsd.port.pre.mk>
+.if ! ${PORT_OPTIONS:MXAW3D} && ! ${PORT_OPTIONS:MXAW3DXFT} && !
${PORT_OPTIONS:MNEXTAW}
+USE_XORG+= xaw
+.endif
.if ${OSVERSION} < 900004
-LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
+LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
.endif
+post-extract:
+ @${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
+ ${WRKDIR}/bsd-xterm-icons-1/*.xpm \
+ ${WRKSRC}/icons/
+
post-install:
-.for f in koi8rxterm resize uxterm xterm
- @${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
+.for f in koi8rxterm${PKGNAMESUFFIX} resize${PKGNAMESUFFIX}
uxterm${PKGNAMESUFFIX} xterm${PKGNAMESUFFIX}
+ @${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor
-.if ${PORT_OPTIONS:MGNOME}
- @${MKDIR} ${PREFIX}/share/applications/
- @${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/
- @-update-desktop-database
-.endif
+ @${INSTALL_DATA} ${WRKSRC}/xterm.desktop \
+
${STAGEDIR}${PREFIX}/share/applications/xterm${PKGNAMESUFFIX}.desktop
.if ${PORT_OPTIONS:MWCHAR}
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/package/freebsd/pkg-plist new/xterm-310/package/freebsd/pkg-plist
--- old/xterm-309/package/freebsd/pkg-plist 2012-10-24 00:47:53.000000000
+0200
+++ new/xterm-310/package/freebsd/pkg-plist 2014-07-26 01:39:51.000000000
+0200
@@ -8,6 +8,10 @@
lib/X11/app-defaults/UXTermDev-color
lib/X11/app-defaults/XTermDev
lib/X11/app-defaults/XTermDev-color
+man/man1/resize-dev.1.gz
+man/man1/koi8rxterm-dev.1.gz
+man/man1/uxterm-dev.1.gz
+man/man1/xterm-dev.1.gz
share/applications/xterm-dev.desktop
share/pixmaps/filled-xterm-dev_32x32.xpm
share/pixmaps/filled-xterm-dev_48x48.xpm
@@ -17,6 +21,3 @@
share/pixmaps/xterm-dev-color_48x48.xpm
share/pixmaps/xterm-dev_32x32.xpm
share/pixmaps/xterm-dev_48x48.xpm
-@dirrmtry share/applications
-%%GNOME%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null ||
/usr/bin/true
-%%GNOME%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null ||
/usr/bin/true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/package/xterm.spec new/xterm-310/package/xterm.spec
--- old/xterm-309/package/xterm.spec 2014-07-13 17:29:11.000000000 +0200
+++ new/xterm-310/package/xterm.spec 2014-07-15 01:36:58.000000000 +0200
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.74 2014/07/13 15:29:11 tom Exp $
+# $XTermId: xterm.spec,v 1.75 2014/07/14 23:36:58 tom Exp $
Summary: X terminal emulator (development version)
%global my_middle xterm
%global my_suffix -dev
%global fullname %{my_middle}%{my_suffix}
%global my_class XTermDev
Name: %{fullname}
-Version: 309
+Version: 310
Release: 1
License: X11
Group: User Interface/X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/precompose.c new/xterm-310/precompose.c
--- old/xterm-309/precompose.c 2013-02-03 18:06:01.000000000 +0100
+++ new/xterm-310/precompose.c 2014-07-15 23:18:45.000000000 +0200
@@ -4,8 +4,7 @@
* DO NOT EDIT BY HAND! This is generated by the script
* unicode/make-precompose.sh
*/
-/* $XTermId: precompose.c,v 1.9 2013/02/03 17:06:01 tom Exp $ */
-/* $XFree86$ */
+/* $XTermId: precompose.c,v 1.10 2014/07/15 21:18:45 tom Exp $ */
#include <precompose.h>
@@ -1019,6 +1018,13 @@
{ 0x110AB, 0x110A5, 0x110BA},
{ 0x1112E, 0x11131, 0x11127},
{ 0x1112F, 0x11132, 0x11127},
+{ 0x1134B, 0x11347, 0x1133E},
+{ 0x1134C, 0x11347, 0x11357},
+{ 0x114BC, 0x114B9, 0x114B0},
+{ 0x114BB, 0x114B9, 0x114BA},
+{ 0x114BE, 0x114B9, 0x114BD},
+{ 0x115BA, 0x115B8, 0x115AF},
+{ 0x115BB, 0x115B9, 0x115AF},
{ 0x1D15E, 0x1D157, 0x1D165},
{ 0x1D15F, 0x1D158, 0x1D165},
{ 0x1D160, 0x1D15F, 0x1D16E},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/resize.c new/xterm-310/resize.c
--- old/xterm-309/resize.c 2014-04-26 01:39:42.000000000 +0200
+++ new/xterm-310/resize.c 2014-07-25 00:47:09.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: resize.c,v 1.130 2014/04/25 23:39:42 tom Exp $ */
+/* $XTermId: resize.c,v 1.132 2014/07/24 22:47:09 tom Exp $ */
/*
* Copyright 2003-2013,2014 by Thomas E. Dickey
@@ -264,13 +264,13 @@
readstring(FILE *fp, char *buf, const char *str)
{
int last, c;
-#if !defined(USG)
+#if !defined(USG) && !defined(__minix)
/* What is the advantage of setitimer() over alarm()? */
struct itimerval it;
#endif
signal(SIGALRM, resize_timeout);
-#if defined(USG)
+#if defined(USG) || defined(__minix)
alarm(TIMEOUT);
#else
memset((char *) &it, 0, sizeof(struct itimerval));
@@ -292,7 +292,7 @@
while ((*buf++ = (char) getc(fp)) != last) {
;
}
-#if defined(USG)
+#if defined(USG) || defined(__minix)
alarm(0);
#else
memset((char *) &it, 0, sizeof(struct itimerval));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/unicode/precompose.c.head new/xterm-310/unicode/precompose.c.head
--- old/xterm-309/unicode/precompose.c.head 2004-11-30 22:08:35.000000000
+0100
+++ new/xterm-310/unicode/precompose.c.head 2014-07-15 23:18:32.000000000
+0200
@@ -5,7 +5,6 @@
* unicode/make-precompose.sh
*/
/* @XTermId@ */
-/* @XFree86@ */
#include <precompose.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/version.h new/xterm-310/version.h
--- old/xterm-309/version.h 2014-07-13 23:54:02.000000000 +0200
+++ new/xterm-310/version.h 2014-07-26 02:04:51.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.393 2014/07/13 21:54:02 tom Exp $ */
+/* $XTermId: version.h,v 1.395 2014/07/26 00:04:51 tom Exp $ */
/*
* Copyright 1998-2013,2014 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 309
-#define XTERM_DATE 2014-07-13
+#define XTERM_PATCH 310
+#define XTERM_DATE 2014-07-25
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/xterm.h new/xterm-310/xterm.h
--- old/xterm-309/xterm.h 2014-06-28 22:53:20.000000000 +0200
+++ new/xterm-310/xterm.h 2014-07-25 00:47:09.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.743 2014/06/28 20:53:20 tom Exp $ */
+/* $XTermId: xterm.h,v 1.745 2014/07/24 22:47:09 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -99,7 +99,7 @@
#define HAVE_PUTENV 1
#endif
-#if defined(CSRG_BASED) || defined(__GNU__)
+#if defined(CSRG_BASED) || defined(__GNU__) || defined(__minix)
#define USE_POSIX_TERMIOS 1
#endif
@@ -134,7 +134,7 @@
#define HAVE_TCGETATTR 1
#endif
-#if defined(__SCO__) || defined(__UNIXWARE__)
+#if defined(__SCO__) || defined(__UNIXWARE__) || defined(__minix)
#define USE_TERMCAP 1
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/xterm.log.html new/xterm-310/xterm.log.html
--- old/xterm-309/xterm.log.html 2014-07-13 23:58:07.000000000 +0200
+++ new/xterm-310/xterm.log.html 2014-07-26 02:05:11.000000000 +0200
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1504 2014/07/13 21:58:07 tom Exp $
+ $XTermId: xterm.log.html,v 1.1511 2014/07/26 00:05:11 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_310">Patch #310 - 2014/07/25</a></li>
+
<li><a href="#xterm_309">Patch #309 - 2014/07/13</a></li>
<li><a href="#xterm_308">Patch #308 - 2014/06/19</a></li>
@@ -903,6 +905,23 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_310" id="xterm_310">Patch #310 -
+ 2014/07/25</a></h1>
+
+ <ul>
+ <li>update package/freebsd files based on xterm #309 port.</li>
+
+ <li>adapt changes from Minux3.2 which ported <a href=
+ "#xterm_197">xterm #197</a>, to allow building on that platform
+ both using <code>imake</code> as well as using the configure
+ script.</li>
+
+ <li>update precompose.c based on Unicode 7.0</li>
+
+ <li>build-fix for <code>--with-Xaw3dxft</code> option (report
+ by Emanuel Haupt).</li>
+ </ul>
+
<h1><a name="xterm_309" id="xterm_309">Patch #309 -
2014/07/13</a></h1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/xterm_io.h new/xterm-310/xterm_io.h
--- old/xterm-309/xterm_io.h 2013-01-06 16:20:45.000000000 +0100
+++ new/xterm-310/xterm_io.h 2014-07-25 10:26:56.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: xterm_io.h,v 1.56 2013/01/06 15:20:45 tom Exp $ */
+/* $XTermId: xterm_io.h,v 1.58 2014/07/25 08:26:56 tom Exp $ */
/*
- * Copyright 2000-2012,2013 by Thomas E. Dickey
+ * Copyright 2000-2013,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -41,6 +41,11 @@
* FIXME: some, such as those defining USE_TERMIOS should be moved to xterm.h
* as they are integrated with the configure script.
*/
+#if defined(__minix)
+#define USE_POSIX_TERMIOS 1
+#undef HAVE_POSIX_OPENPT /* present, does not work */
+#endif
+
#ifdef CSRG_BASED
#define USE_TERMIOS
#endif
@@ -162,9 +167,9 @@
*/
#ifdef SYSV
#ifdef USE_USG_PTYS
-#include <sys/stream.h> /* get typedef used in ptem.h */
+#include <sys/stream.h> /* get typedef used in ptem.h */
#ifdef HAVE_SYS_PTEM_H
-#include <sys/ptem.h> /* get struct winsize */
+#include <sys/ptem.h> /* get struct winsize */
#endif
#endif /* USE_USG_PTYS */
#endif /* SYSV */
@@ -203,7 +208,7 @@
#endif
#if defined(__sgi) && (OSMAJORVERSION >= 5)
-#undef TIOCLSET /* defined, but not useable */
+#undef TIOCLSET /* defined, but not useable */
#endif
#if defined(__GNU__) || defined(__MVS__) || defined(__osf__)
@@ -212,7 +217,7 @@
#endif
#if defined (__sgi) || (defined(__linux__) && defined(__sparc__)) ||
defined(__UNIXWARE__)
-#undef TIOCLSET /* XXX why is this undef-ed again? */
+#undef TIOCLSET /* XXX why is this undef-ed again? */
#endif
#if defined(sun) || defined(__UNIXWARE__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-309/xtermcfg.hin new/xterm-310/xtermcfg.hin
--- old/xterm-309/xtermcfg.hin 2014-05-08 10:05:07.000000000 +0200
+++ new/xterm-310/xtermcfg.hin 2014-07-15 01:42:59.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: xtermcfg.hin,v 1.205 2014/05/08 08:05:07 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.206 2014/07/14 23:42:59 tom Exp $ */
/*
* Copyright 1997-2013,2014 by Thomas E. Dickey
@@ -62,6 +62,7 @@
#undef HAVE_LIB_PCRE /* CF_WITH_PCRE */
#undef HAVE_LIB_XAW /* CF_X_ATHENA */
#undef HAVE_LIB_XAW3D /* CF_X_ATHENA(--with-Xaw3d) */
+#undef HAVE_LIB_XAW3DXFT /* CF_X_ATHENA(--with-Xaw3dxft) */
#undef HAVE_LIB_XAWPLUS /* CF_X_ATHENA(--with-XawPlus) */
#undef HAVE_LIB_XCURSOR /* AC_CHECK_LIB(Xcursor) */
#undef HAVE_MKDTEMP /* AC_CHECK_FUNCS(mkdtemp) */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
