rpms/xterm/FC-4 xterm-212-bz186935.patch, NONE, 1.1 xterm-212-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xterm-resources-redhat.patch, 1.8, 1.9 xterm.spec, 1.20, 1.21
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 13 20:10:40 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/xterm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13566
Modified Files:
.cvsignore sources xterm-resources-redhat.patch xterm.spec
Added Files:
xterm-212-bz186935.patch xterm-212-man-page_paths.patch
Log Message:
Upgrade to 212
xterm-212-bz186935.patch:
charproc.c | 71 ++++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 22 deletions(-)
--- NEW FILE xterm-212-bz186935.patch ---
--- xterm-212/charproc.c.bz186935 2006-04-09 20:34:36.000000000 -0400
+++ xterm-212/charproc.c 2006-04-13 13:39:44.000000000 -0400
@@ -5762,28 +5762,55 @@
GC reverseCursorGC = screen->reversecursorGC;
GC cursorOutlineGC = screen->cursoroutlineGC;
- if (cursorGC)
- XFreeGC(screen->display, cursorGC);
- screen->cursorGC = 0;
-
- if (fillCursorGC && (fillCursorGC != cursorGC))
- XFreeGC(screen->display, fillCursorGC);
- screen->fillCursorGC = 0;
-
- if (reverseCursorGC
- && (reverseCursorGC != cursorGC)
- && (reverseCursorGC != fillCursorGC)
- )
- XFreeGC(screen->display, screen->reversecursorGC);
- screen->reversecursorGC = 0;
-
- if (cursorOutlineGC
- && (cursorOutlineGC != cursorGC)
- && (cursorOutlineGC != fillCursorGC)
- && (cursorOutlineGC != reverseCursorGC)
- )
- XFreeGC(screen->display, screen->cursoroutlineGC);
- screen->cursoroutlineGC = 0;
+#if OPT_ISO_COLORS
+ if (screen->colorMode) {
+ if (cursorGC)
+ XFreeGC(screen->display, cursorGC);
+ screen->cursorGC = 0;
+
+ if (fillCursorGC && (fillCursorGC != cursorGC))
+ XFreeGC(screen->display, fillCursorGC);
+ screen->fillCursorGC = 0;
+
+ if (reverseCursorGC
+ && (reverseCursorGC != cursorGC)
+ && (reverseCursorGC != fillCursorGC)
+ )
+ XFreeGC(screen->display, screen->reversecursorGC);
+ screen->reversecursorGC = 0;
+
+ if (cursorOutlineGC
+ && (cursorOutlineGC != cursorGC)
+ && (cursorOutlineGC != fillCursorGC)
+ && (cursorOutlineGC != reverseCursorGC)
+ )
+ XFreeGC(screen->display, screen->cursoroutlineGC);
+ screen->cursoroutlineGC = 0;
+ } else
+#endif
+ {
+ if ( cursorGC )
+ XtReleaseGC((Widget)term, cursorGC );
+ screen->cursorGC = 0;
+
+ if ( ( fillCursorGC )
+ && ( fillCursorGC != cursorGC )
+ ) XtReleaseGC((Widget)term, fillCursorGC);
+ screen->fillCursorGC = 0;
+
+ if ( ( reverseCursorGC )
+ && ( reverseCursorGC != cursorGC )
+ && ( reverseCursorGC != fillCursorGC )
+ ) XtReleaseGC((Widget)term, reverseCursorGC);
+ screen->reversecursorGC = 0;
+
+ if ( ( cursorOutlineGC )
+ && ( cursorOutlineGC != cursorGC )
+ && ( cursorOutlineGC != fillCursorGC )
+ && ( cursorOutlineGC != reverseCursorGC )
+ ) XtReleaseGC((Widget)term, cursorOutlineGC);
+ screen->cursoroutlineGC = 0;
+ }
}
#ifdef NO_LEAKS
xterm-212-man-page_paths.patch:
minstall.sh | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE xterm-212-man-page_paths.patch ---
--- xterm-212/minstall.sh.man-page_paths 2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/minstall.sh 2006-04-13 15:55:03.000000000 -0400
@@ -15,6 +15,9 @@
OLD_FILE="$2"
END_FILE="$3"
APPS_DIR="$4"
+if [ -n "$apploaddir" ]; then
+ APPS_DIR="$apploaddir";
+fi
suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
NEW_FILE=temp$$
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 13 Feb 2006 16:46:47 -0000 1.8
+++ .cvsignore 13 Apr 2006 20:10:25 -0000 1.9
@@ -2,5 +2,12 @@
xterm-200.tgz
xterm-205.tgz
xterm-205.tgz.asc
+xterm-206.tgz
xterm-207.tgz
+ctlseqs.txt.gz
+UnicodeData-Latest.txt.gz
+16colors.txt
xterm-208.tgz
+xterm-209.tgz
+xterm-211.tgz
+xterm-212.tgz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 13 Feb 2006 16:46:47 -0000 1.8
+++ sources 13 Apr 2006 20:10:25 -0000 1.9
@@ -1 +1,4 @@
-a062d0b398918015d07c31ecdcc5111a xterm-208.tgz
+0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz
+92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz
+6093439b8d79089f4ff1cdfed358b401 16colors.txt
+d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz
xterm-resources-redhat.patch:
XTerm.ad | 6 ++++++
1 files changed, 6 insertions(+)
Index: xterm-resources-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm-resources-redhat.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xterm-resources-redhat.patch 13 Feb 2006 16:45:58 -0000 1.8
+++ xterm-resources-redhat.patch 13 Apr 2006 20:10:25 -0000 1.9
@@ -1,11 +1,12 @@
---- xterm-208/XTerm.ad.redhat-resources 2006-01-03 21:10:17.000000000 -0500
-+++ xterm-208/XTerm.ad 2006-01-17 15:05:24.000000000 -0500
-@@ -186,3 +186,8 @@
-
- ! Here is a pattern that is useful for double-clicking on a URL:
- *charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,126:48
+--- xterm-212/XTerm.ad.redhat-resources 2006-04-13 13:40:45.000000000 -0400
++++ xterm-212/XTerm.ad 2006-04-13 13:46:07.000000000 -0400
+@@ -186,3 +186,9 @@
+ !
+ ! Alternatively,
+ !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+! Red Hat Defaults:
+*VT100*eightBitInput: 0
+*VT100*backarrowKey: 0
+*VT100*scrollBar: 1
++*VT100*utf8Title: 1
Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xterm.spec 7 Mar 2006 22:12:40 -0000 1.20
+++ xterm.spec 13 Apr 2006 20:10:25 -0000 1.21
@@ -1,10 +1,14 @@
%define _x11bindir /usr/X11R6/bin
%define _x11datadir /usr/X11R6/lib
+%{?!_with_256_color: %define _with_256_color 1}
+%{?!_with_tek4014: %define _with_tek4014 1}
+%{?!DEBUGINFO: %define DEBUGINFO 1}
+%{?!enable_trace: %define enable_trace 0}
Summary: xterm terminal emulator for the X Window System
Name: xterm
-Version: 208
-Release: 4.FC4
+Version: 212
+Release: 1.FC4
URL: http://dickey.his.com/xterm
License: MIT
Group: User Interface/X
@@ -19,6 +23,8 @@
Patch6: xterm-208-bz180450.patch
Patch7: xterm-208-bz182382.patch
Patch8: xterm-208-reverse-video-set-cursor-gcs.patch
+Patch9: xterm-212-bz186935.patch
+Patch10:xterm-212-man-page_paths.patch
BuildRequires: xorg-x11-devel >= 6.7.0
BuildRequires: utempter libtermcap-devel
@@ -40,14 +46,25 @@
%patch3 -p1 -b .tty-group-name
%patch4 -p1 -b .appsdir
%patch5 -p1 -b .root-grab-console
-%patch6 -p1 -b .bz180450
-%patch7 -p1 -b .bz182382
-%patch8 -p1 -b .bz183993
+#%patch6 -p1 -b .bz180450
+# ^- patch now upstream
+#%patch7 -p1 -b .bz182382
+# ^- patch now upstream
+#%patch8 -p1 -b .bz183993
+# ^- patch now upstream
+%patch9 -p1 -b .bz186935
+%patch10 -p1 -b .man-page_paths
-%{?!_with_256_color: %define _with_256_color 1}
-%{?!_with_tek4014: %define _with_tek4014 1}
+%if !%{DEBUGINFO}
+%define debug_package %{nil}
+%endif
%build
+%if %{DEBUGINFO}
+export CFLAGS="$RPM_OPT_FLAGS"
+%else
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
+%endif
%configure --enable-luit \
--enable-warnings \
--enable-wide-chars \
@@ -58,13 +75,16 @@
%if %{_with_256_color}
--enable-256-color \
%endif
+%if %{enable_trace}
+ --enable-trace \
+%endif
;
export XTERM_TTY_GROUP_NAME=tty;
make
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults
+%makeinstall appsdir=$RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults apploaddir=%{_x11datadir}/X11/app-defaults
#install-ti
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
@@ -79,9 +99,13 @@
mkdir -p $RPM_BUILD_ROOT%{_x11bindir}
ln -sf ../../bin/xterm $RPM_BUILD_ROOT%{_x11bindir}/xterm
}
+%if !%{DEBUGINFO}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
%clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
@@ -96,6 +120,13 @@
%{_x11bindir}/xterm
%changelog
+* Thu Apr 13 2006 Jason Vas Dias <jvdias at redhat.com> - 212-1
+- Upgrade to upstream version 212
+- fix bug 188031 : paths in man-page
+- fix bug 186935 : segfault on VisualBell in `screen'
+- fix bug 186170 : revert charClass uncommenting
+- fix bug 186094 : utfTitle
+
* Tue Mar 07 2006 Jason Vas Dias <jvdias at redhat.com> - 208-4.FC4
- fix bug 183993: call set_cursor_gcs in ReverseVideo
More information about the fedora-cvs-commits
mailing list