update to #139, upstream bugfixes; ok espie@

This commit is contained in:
naddy 2000-06-20 13:08:21 +00:00
parent a498061c86
commit 762b9f63c8
3 changed files with 5 additions and 41 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2000/06/13 21:18:47 jakob Exp $
# $OpenBSD: Makefile,v 1.3 2000/06/20 13:08:21 naddy Exp $
DISTNAME= xterm-137
DISTNAME= xterm-139
CATEGORIES= x11
NEED_VERSION= 1.299

View File

@ -1,3 +1,3 @@
MD5 (xterm-137.tgz) = afd3116aefbc704b231c057facbce1c6
RMD160 (xterm-137.tgz) = 5be6ddd40eb2ea5468c1a1d0e55e497f68653299
SHA1 (xterm-137.tgz) = 8401be281f7b8463f3b9e90c910d59ea47a1fdd3
MD5 (xterm-139.tgz) = d7916d63ece4475af49cadd8d6a12e44
RMD160 (xterm-139.tgz) = f7c2e776143b83310fe23366ffa964901557d062
SHA1 (xterm-139.tgz) = e7da6570f2c1034966cd3bf9ec36f7547a3f66ce

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-main_c,v 1.1 2000/06/18 00:04:08 espie Exp $
--- main.c.orig Sat Jun 10 21:17:09 2000
+++ main.c Sun Jun 18 01:49:46 2000
@@ -1302,7 +1302,7 @@ main (int argc, char *argv[])
Widget form_top, menu_top;
register TScreen *screen;
int mode;
- char *app_name = "XTerm";
+ char *class_name = "XTerm"; /* DO NOT CHANGE */
/* Do these first, since we may not be able to open the display */
ProgramName = argv[0];
@@ -1312,11 +1312,13 @@ main (int argc, char *argv[])
Version();
if (abbrev(argv[1], "-help"))
Help();
+#if 0 /* This is _wrong_: -name is read by X toolkit already! */
for (n = 1; n < argc - 1; n++) {
if (abbrev(argv[n], "-name")) {
- app_name = argv[n+1];
+ class_name = argv[n+1];
}
}
+#endif
}
/* This dumps core on HP-UX 9.05 with X11R5 */
@@ -1625,7 +1627,7 @@ main (int argc, char *argv[])
#endif
XtSetErrorHandler(xt_error);
- toplevel = XtAppInitialize (&app_con, app_name,
+ toplevel = XtAppInitialize (&app_con, class_name,
optionDescList,
XtNumber(optionDescList),
&argc, argv, fallback_resources,