rpms/xterm/FC-5 xterm-212-bz186935.patch, NONE, 1.1 xterm-212-man-page_paths.patch, NONE, 1.1 xterm-212-redhat-resources.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xterm.spec, 1.41, 1.42
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 13 19:14:43 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/xterm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3566
Modified Files:
.cvsignore sources xterm.spec
Added Files:
xterm-212-bz186935.patch xterm-212-man-page_paths.patch
xterm-212-redhat-resources.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 | 10 +++++++++-
xterm.man | 6 +++---
2 files changed, 12 insertions(+), 4 deletions(-)
--- 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 14:40:31.000000000 -0400
@@ -15,7 +15,12 @@
OLD_FILE="$2"
END_FILE="$3"
APPS_DIR="$4"
-
+if [ -n "$apploaddir" ]; then
+ APPS_DIR="$apploaddir";
+fi
+fontpath=/usr/share/X11/fonts
+xorgcfgdir=/etc/X11
+xorgcfgfil=xorg.conf
suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
NEW_FILE=temp$$
@@ -23,6 +28,9 @@
-e s%__apploaddir__%$APPS_DIR% \
-e s%__mansuffix__%$suffix%g \
-e s%__miscmansuffix__%$suffix%g \
+ -e s%__fontpath__%$fontpath%g \
+ -e s%__xorgcfgdir__%$xorgcfgdir%g \
+ -e s%__xorgcfgfil__%$xorgcfgfil%g \
$OLD_FILE >$NEW_FILE
echo "$MINSTALL $OLD_FILE $END_FILE"
--- xterm-212/xterm.man.man-page_paths 2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/xterm.man 2006-04-13 14:35:07.000000000 -0400
@@ -1442,17 +1442,17 @@
The font server claims to provide the bold font that \fIxterm\fP requests,
but the result is not always readable.
XFree86 provides a feature which can be used to suppress the scaling.
-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
can add ":unscaled" to the end of the directory specification for the
"misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
For example
.RS
- FontPath "/usr/lib/X11/fonts/misc/"
+ FontPath "__fontpath__"
.RE
.IP
would become
.RS
- FontPath "/usr/lib/X11/fonts/misc/:unscaled"
+ FontPath "__fontpath__/misc/:unscaled"
.RE
.IP
Depending on your configuration, the font server may have its own configuration
xterm-212-redhat-resources.patch:
XTerm.ad | 6 ++++++
1 files changed, 6 insertions(+)
--- NEW FILE xterm-212-redhat-resources.patch ---
--- 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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Mar 2006 22:55:18 -0000 1.12
+++ .cvsignore 13 Apr 2006 19:14:40 -0000 1.13
@@ -10,3 +10,4 @@
xterm-208.tgz
xterm-209.tgz
xterm-211.tgz
+xterm-212.tgz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Mar 2006 22:55:18 -0000 1.12
+++ sources 13 Apr 2006 19:14:40 -0000 1.13
@@ -1,4 +1,4 @@
0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz
92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz
6093439b8d79089f4ff1cdfed358b401 16colors.txt
-babb9a02ba7ebb7770f48e3257b2884e xterm-211.tgz
+d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz
Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-5/xterm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xterm.spec 29 Mar 2006 16:43:31 -0000 1.41
+++ xterm.spec 13 Apr 2006 19:14:40 -0000 1.42
@@ -1,7 +1,7 @@
Summary: xterm terminal emulator for the X Window System
Name: xterm
-Version: 211
-Release: 4.FC5
+Version: 212
+Release: 1.FC5
URL: http://dickey.his.com/xterm
License: MIT
Group: User Interface/X
@@ -22,7 +22,9 @@
Patch9: xterm-209-bz182382.patch
Patch10: xterm-209-bz183993.patch
Patch11: xterm-211-bz186094.patch
-Patch12: xterm-211-bz186935.patch
+Patch12: xterm-212-bz186935.patch
+Patch13: xterm-212-redhat-resources.patch
+Patch14: xterm-212-man-page_paths.patch
BuildRequires: libXft-devel
BuildRequires: freetype-devel
BuildRequires: libXrender-devel
@@ -68,14 +70,18 @@
#%patch5 -p1 -b .freetype
#^- now fixed upstream in 208
#%patch6 -p1 -b .eightBitInput_false
-%patch7 -p1 -b .redhat-resources
+#%patch7 -p1 -b .redhat-resources
+# ^- patch now in patch13
%patch8 -p1 -b .root-grab-console
#%patch9 -p1 -b .bz182382
# ^- patch now upstream
#%patch10 -p1 -b .bz183993
# ^- patch now upstream
-%patch11 -p1 -b .bz186094
+#%patch11 -p1 -b .bz186094
+# ^- patch now in redhat-resources
%patch12 -p1 -b .bz186935
+%patch13 -p1 -b .redhat-resources
+%patch14 -p1 -b .man-page_paths
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
@@ -105,7 +111,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir}
+%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
gunzip < %SOURCE1 > ctlseqs.txt
@@ -132,6 +138,10 @@
%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
%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
+
* Wed Mar 29 2006 Jason Vas Dias <jvdias at redhat.com> - 211-4
- fix bug 186935: cursor GCs must be freed with XtReleaseGC
More information about the fedora-cvs-commits
mailing list