Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked in at 2012-10-16 21:36:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm", Maintainer is "meissner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2012-10-13 21:11:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2012-10-16 21:36:31.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Oct 16 14:49:09 UTC 2012 - meissner@suse.com
+
+-Patch #284 - 2012/10/14
+ * amend configurability changes for icons from patch #283, moving the
+ new functionality to the iconHint resource to avoid conflict with
+ existing uses of the iconName resource in the Shell widget (report
+ by Emanuel Haupt).
+ * fix documentation errata (reports by Miroslav Lichvar):
+ + correct manpage default for allowTcapOps (see patch #243
+ + modify documentation for configure --enable-backarrow-key to
+ match the script (see patch #280).
+ + fix typo in minstall.sh in patch #283, which made the
+ leading-cap "Xterm" become "xterm" (patch by Miroslav).
+ * fix two typos in configure.in from patch #283 changes; one broke
+ the --regex configure option (report by H Merijn Brand).
+
+-------------------------------------------------------------------
Old:
----
xterm-283.tgz
xterm-283.tgz.asc
New:
----
xterm-284.tgz
xterm-284.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.OHlxzz/_old 2012-10-16 21:36:34.000000000 +0200
+++ /var/tmp/diff_new_pack.OHlxzz/_new 2012-10-16 21:36:34.000000000 +0200
@@ -47,7 +47,7 @@
%if 0%{?suse_version} > 1210
Requires: luit
%endif
-Version: 283
+Version: 284
Release: 0
Summary: The basic X terminal program
License: MIT
++++++ xterm-283.tgz -> xterm-284.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/INSTALL new/xterm-284/INSTALL
--- old/xterm-283/INSTALL 2012-09-22 14:22:47.000000000 +0200
+++ new/xterm-284/INSTALL 2012-10-11 01:33:29.000000000 +0200
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.138 2012/09/22 12:22:47 tom Exp $
+-- $XTermId: INSTALL,v 1.139 2012/10/10 23:33:29 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2011,2012 by Thomas E. Dickey
--
@@ -359,7 +359,7 @@
This sets the default resource value, which is shown in the manpage.
- --enable-backarrow-is-del set default backarrowKey resource (default: true)
+ --enable-backarrow-key set default backarrowKey resource (default: true)
This sets the default resource value, which is shown in the manpage.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/MANIFEST new/xterm-284/MANIFEST
--- old/xterm-283/MANIFEST 2012-10-09 12:52:36.000000000 +0200
+++ new/xterm-284/MANIFEST 2012-10-11 00:18:21.000000000 +0200
@@ -1,4 +1,4 @@
-MANIFEST for xterm-283, version xterm-283
+MANIFEST for xterm-284, version xterm-284
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/Makefile.in new/xterm-284/Makefile.in
--- old/xterm-283/Makefile.in 2012-10-09 02:28:09.000000000 +0200
+++ new/xterm-284/Makefile.in 2012-10-14 21:58:03.000000000 +0200
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.204 2012/10/09 00:28:09 tom Exp $
+## $XTermId: Makefile.in,v 1.205 2012/10/14 19:58:03 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -223,13 +223,14 @@
ls -l \$$name @XTERM_SYMLINK@ ) ; \
fi"
+MINSTALL_ARGS = $(appsdir) $(CLASS) $(actual_xterm) $(pixmapdir)
install \
install-man \
install-full :: $(MANDIR)
- $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS) $(actual_xterm)
- $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS) $(actual_xterm)
- $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS) $(actual_xterm)
- $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS) $(actual_xterm)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(MINSTALL_ARGS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(MINSTALL_ARGS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(MINSTALL_ARGS)
+ $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(MINSTALL_ARGS)
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
@-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/configure new/xterm-284/configure
--- old/xterm-283/configure 2012-10-07 22:55:52.000000000 +0200
+++ new/xterm-284/configure 2012-10-11 00:16:12.000000000 +0200
@@ -13840,7 +13840,7 @@
if test "$enable_active_icon" = no ; then
cat >>confdefs.h <<\EOF
-#define NO_ACTIVE_ICON 0
+#define NO_ACTIVE_ICON 1
EOF
fi
@@ -16295,7 +16295,7 @@
fi
cat >>confdefs.h <<\EOF
-#define OPT_SELECT_REGEX 0
+#define OPT_SELECT_REGEX 1
EOF
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/configure.in new/xterm-284/configure.in
--- old/xterm-283/configure.in 2012-10-05 02:25:44.000000000 +0200
+++ new/xterm-284/configure.in 2012-10-11 01:32:47.000000000 +0200
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.304 2012/10/05 00:25:44 tom Exp $
+dnl $XTermId: configure.in,v 1.306 2012/10/10 23:32:47 tom Exp $
dnl
dnl -----------------------------------------------------------------------------
dnl this file is part of xterm
@@ -302,7 +302,7 @@
###############################################################################
AC_MSG_CHECKING(if backarrow-key should be DEL)
CF_ARG_DISABLE(backarrow-key,
- [ --enable-backarrow-is-del set default backarrowKey resource (default: true)],
+ [ --enable-backarrow-key set default backarrowKey resource (default: true)],
[backarrow_is_del=$enableval],
[backarrow_is_del=yes])
CF_XBOOL_RESULT(DEF_BACKARO_DEL,backarrow_is_del,[Define to 1 if backarrow-key should be DEL])
@@ -384,7 +384,7 @@
[enable_active_icon=yes])
AC_MSG_RESULT($enable_active_icon)
if test "$enable_active_icon" = no ; then
- AC_DEFINE(NO_ACTIVE_ICON,0,[Define to 0 to disable X11R6.3 active-icon feature])
+ AC_DEFINE(NO_ACTIVE_ICON,1,[Define to 1 to disable X11R6.3 active-icon feature])
fi
AC_MSG_CHECKING(if you want ANSI color)
@@ -740,7 +740,7 @@
AC_MSG_ERROR(Only POSIX or PCRE regular expressions are supported)
fi
fi
- AC_DEFINE(OPT_SELECT_REGEX,0,[Define to 0 to disable regular-expression selections])
+ AC_DEFINE(OPT_SELECT_REGEX,1,[Define to 1 to enable regular-expression selections])
fi
AC_MSG_CHECKING(if you want support for right-scrollbar)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/data.h new/xterm-284/data.h
--- old/xterm-283/data.h 2012-03-26 23:48:09.000000000 +0200
+++ new/xterm-284/data.h 2012-10-14 20:51:30.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: data.h,v 1.120 2012/03/26 21:48:09 tom Exp $ */
+/* $XTermId: data.h,v 1.121 2012/10/14 18:51:30 tom Exp $ */
/*
* Copyright 2002-2011,2012 by Thomas E. Dickey
@@ -144,6 +144,7 @@
typedef struct XTERM_RESOURCE {
char *icon_geometry;
char *title;
+ char *icon_hint;
char *icon_name;
char *term_name;
char *tty_modes;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/main.c new/xterm-284/main.c
--- old/xterm-283/main.c 2012-08-24 17:28:59.000000000 +0200
+++ new/xterm-284/main.c 2012-10-14 20:55:00.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.687 2012/08/24 15:28:59 tom Exp $ */
+/* $XTermId: main.c,v 1.688 2012/10/14 18:55:00 tom Exp $ */
/*
* Copyright 2002-2011,2012 by Thomas E. Dickey
@@ -832,6 +832,7 @@
{
Sres("iconGeometry", "IconGeometry", icon_geometry, NULL),
Sres(XtNtitle, XtCTitle, title, NULL),
+ Sres(XtNiconHint, XtCIconHint, icon_hint, NULL),
Sres(XtNiconName, XtCIconName, icon_name, NULL),
Sres("termName", "TermName", term_name, NULL),
Sres("ttyModes", "TtyModes", tty_modes, NULL),
@@ -2382,9 +2383,10 @@
XtSetArg(args[0], XtNtitle, resource.title);
XtSetArg(args[1], XtNiconName, resource.icon_name);
- TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\tbased on command \"%s\"\n",
+ TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\thint \"%s\"\n\tbased on command \"%s\"\n",
resource.title,
resource.icon_name,
+ NonNull(resource.icon_hint),
*command_to_exec));
XtSetValues(toplevel, args, 2);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/minstall.in new/xterm-284/minstall.in
--- old/xterm-283/minstall.in 2012-10-09 01:02:57.000000000 +0200
+++ new/xterm-284/minstall.in 2012-10-14 21:45:07.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XTermId: minstall.in,v 1.8 2012/10/08 23:02:57 tom Exp $
+# $XTermId: minstall.in,v 1.10 2012/10/14 19:45:07 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -42,6 +42,7 @@
# $4 = app-defaults directory
# $5 = app-defaults class
# $6 = application name, normally "xterm"
+# $7 = pixmap directory
#
# Other values correspond to definitions in xtermcfg.h, and cannot be directly
# modified using "make". They are substituted directly into this script.
@@ -71,6 +72,7 @@
APPS_DIR="$4"
APP_TYPE="$5"
APP_name="$6"
+XPMS_DIR="$7"
suffix=`echo "$END_FILE" | sed -e 's%^.*\.%%'`
NEW_FILE=temp$$
@@ -121,7 +123,7 @@
sed -e 's%__vendorversion__%"X Window System"%' \
-e "s%^\.ds N Xterm%.ds n $APP_Name%" \
- -e "s%^\.ds n xterm%.ds n $APP_name%" \
+ -e "s%^\.ds n xterm%.ds N $APP_name%" \
-e s%__default_termname__%@default_TERM@% \
-e s%__default_termid__%@default_termid@% \
-e s%__alt_sends_esc__%@alt_sends_esc@% \
@@ -133,6 +135,7 @@
-e s%__apploaddir__%$APPS_DIR% \
-e s%__mansuffix__%$MY_MANSECT%g \
-e s%__miscmansuffix__%$X_MANSECT%g \
+ -e s%__pixmapsdir__%$XPMS_DIR% \
-e s%fIutmp'\\%fI'$UTMP_NAME'\\%g' \
-e s%/etc/utmp%$UTMP_PATH%g \
-e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/misc.c new/xterm-284/misc.c
--- old/xterm-283/misc.c 2012-10-09 02:24:42.000000000 +0200
+++ new/xterm-284/misc.c 2012-10-14 20:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.623 2012/10/09 00:24:42 tom Exp $ */
+/* $XTermId: misc.c,v 1.624 2012/10/14 18:53:14 tom Exp $ */
/*
* Copyright 1999-2011,2012 by Thomas E. Dickey
@@ -4295,7 +4295,7 @@
static char *
x_find_icon(char **work, int *state, const char *suffix)
{
- const char *filename = resource.icon_name;
+ const char *filename = resource.icon_hint;
const char *prefix = PIXMAP_ROOTDIR;
const char *larger = "_48x48";
char *result = 0;
@@ -4338,7 +4338,7 @@
static const XPM_DATA *
BuiltInXPM(const XPM_DATA * table, Cardinal length)
{
- const char *find = resource.icon_name;
+ const char *find = resource.icon_hint;
const XPM_DATA *result = 0;
if (!IsEmpty(find)) {
Cardinal n;
@@ -4408,9 +4408,9 @@
#include