--- programs/xrx/helper/helper.c.orig 2004-10-08 12:50:10.163465313 +0200 +++ programs/xrx/helper/helper.c 2004-10-08 12:51:03.006536409 +0200 @@ -526,5 +526,7 @@ /* then wait for it... */ XtAppMainLoop(app_context); + + return EXIT_SUCCESS; } --- ./programs/Xserver/Xprint/ps/PsColor.c.orig 2004-10-08 12:51:56.753454781 +0200 +++ ./programs/Xserver/Xprint/ps/PsColor.c 2004-10-08 12:55:22.389708383 +0200 @@ -85,6 +85,6 @@ PsCreateColormap(ColormapPtr pColor) { - miInitializeColormap(pColor); + return miInitializeColormap(pColor); } void diff -u -r programs/Xserver/Xprint.old/attributes.c programs/Xserver/Xprint/attributes.c --- programs/Xserver/Xprint.old/attributes.c 2004-05-22 22:06:33.009927616 +0000 +++ programs/Xserver/Xprint/attributes.c 2004-05-22 22:12:48.962675577 +0000 @@ -1504,7 +1504,9 @@ FreeVector(vector); xfree(cmdNam); + + return Success; } /* diff -u -r programs/Xserver/Xprint.old/Oid.c programs/Xserver/Xprint/Oid.c --- programs/Xserver/Xprint.old/Oid.c 2004-05-22 22:06:32.942942449 +0000 +++ programs/Xserver/Xprint/Oid.c 2004-05-22 22:15:12.174962244 +0000 @@ -2114,7 +2114,9 @@ return NOTIFY_EMAIL_STR; break; } + + return (const char*)NULL; } /* --- programs/xman/vendor.h.old 2003-10-27 15:02:29.000000000 +0100 +++ programs/xman/vendor.h 2003-10-27 15:06:53.000000000 +0100 @@ -167,8 +167,8 @@ # elif defined(BSD) && (BSD >= 199103) # define FORMAT "| eqn | tbl | nroff -man" # elif defined(linux) -# define FORMAT "| eqn | tbl | GROFF_NO_SGR= groff -Tlatin1 -mandoc" +# define FORMAT "| pic | eqn -Tlatin1 | tbl | GROFF_NO_SGR= groff -Tlatin1 -mandoc" # else # define FORMAT "| neqn | nroff -man" /* The format command. */ # endif Index: programs/xconsole/xconsole.c =================================================================== RCS file: /opt/repository/cvs/xc/programs/xconsole/xconsole.c,v retrieving revision 1.1.1.4 retrieving revision 1.1.1.4.8.1 diff -u -r1.1.1.4 -r1.1.1.4.8.1 --- programs/xconsole/xconsole.c 21 Mar 2003 20:32:58 -0000 1.1.1.4 +++ programs/xconsole/xconsole.c 13 Aug 2003 12:09:20 -0000 1.1.1.4.8.1 @@ -146,12 +146,30 @@ #include #endif -#ifndef USE_FILE +#ifdef linux +/* + * Many Linux distribution uses a named pipe for system messages + * provided by the system logger. + */ +#define USE_FILE +#define FILE_NAME "/dev/xconsole" +#endif + +#if defined (__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) +/* + * Linux distribution based on glibc 2.1 and higher should use + * devpts. This is the fallback if open file FILE_NAME fails. + * + */ +#define USE_PTS +#endif + +#if !defined(USE_FILE) || defined(linux) #include #ifdef hpux #include #endif -#ifdef SVR4 +#if defined(SVR4) || defined(USE_PTS) #include #include /* for I_PUSH */ #ifdef sun @@ -201,12 +219,17 @@ #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(Lynx) && !defined(__UNIXOS2__) struct stat sbuf; +#if !defined(linux) if (!stat("/dev/console", &sbuf) && (sbuf.st_uid == getuid()) && !access("/dev/console", R_OK|W_OK)) +#endif #endif { #ifdef USE_FILE +#ifdef linux + if (!stat(FILE_NAME, &sbuf)) +#endif input = fopen (FILE_NAME, "r"); #ifdef __UNIXOS2__ if (input) @@ -224,7 +245,11 @@ #endif #endif #ifdef USE_PTY +#ifdef linux + if (!input && get_pty (&pty_fd, &tty_fd, ttydev, ptydev) == 0) +#else if (get_pty (&pty_fd, &tty_fd, ttydev, ptydev) == 0) +#endif { #ifdef TIOCCONS int on = 1; @@ -775,7 +800,7 @@ static int get_pty(int *pty, int *tty, char *ttydev, char *ptydev) { -#ifdef SVR4 +#if defined(SVR4) || defined(USE_PTS) if ((*pty = open ("/dev/ptmx", O_RDWR)) < 0) return 1; grantpt(*pty); =================================================================== RCS file: /opt/repository/cvs/xc/nls/Compose/en_US.UTF-8,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.8.1 diff -u -r1.1.1.2 -r1.1.1.2.8.1 --- nls/Compose/en_US.UTF-8 21 Mar 2003 20:32:18 -0000 1.1.1.2 +++ nls/Compose/en_US.UTF-8 13 Aug 2003 12:09:19 -0000 1.1.1.2.8.1 @@ -151,6 +151,10 @@ : "€" EuroSign # EURO SIGN : "€" EuroSign # EURO SIGN : "€" EuroSign # EURO SIGN + : "€" EuroSign # EURO SIGN + : "€" EuroSign # EURO SIGN + : "€" EuroSign # EURO SIGN + : "€" EuroSign # EURO SIGN : "£" U00a3 # POUND SIGN : "£" U00a3 # POUND SIGN --- nls/locale.alias.suse 2004-03-04 18:47:15.000000000 +0100 +++ nls/locale.alias 2004-03-08 15:40:43.367736917 +0100 @@ -680,8 +680,8 @@ ro_RO.iso88592: ro_RO.ISO8859-2 ro_RO.ISO-8859-2: ro_RO.ISO8859-2 ro_RO.utf8: ro_RO.UTF-8 -ru: ru_RU.KOI8-R -ru_RU: ru_RU.KOI8-R +ru: ru_RU.ISO8859-5 +ru_RU: ru_RU.ISO8859-5 ru_RU.iso88595: ru_RU.ISO8859-5 ru_RU.ISO-8859-5: ru_RU.ISO8859-5 ru_RU.koi8r: ru_RU.KOI8-R Index: programs/xkill/xkill.c =================================================================== RCS file: /opt/repository/cvs/xc/programs/xkill/xkill.c,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.3.14.1 diff -u -r1.1.1.3 -r1.1.1.3.14.1 --- programs/xkill/xkill.c 20 Jan 2002 14:59:38 -0000 1.1.1.3 +++ programs/xkill/xkill.c 13 Aug 2003 12:09:20 -0000 1.1.1.3.14.1 @@ -285,8 +285,8 @@ #define MASK (ButtonPressMask | ButtonReleaseMask) root = RootWindow (dpy, screen); - cursor = XCreateFontCursor (dpy, XC_draped_box); + cursor = XCreateFontCursor (dpy, XC_pirate); if (cursor == None) { fprintf (stderr, "%s: unable to create selection cursor\n", ProgramName); --- fonts/encodings/Imakefile.suse 2003-06-26 12:19:41.000000000 +0200 +++ fonts/encodings/Imakefile 2003-10-27 15:14:12.000000000 +0100 @@ -7,23 +7,23 @@ OBJS = EncObjComp(adobe-dingbats) EncObjComp(adobe-standard) \ EncObjComp(adobe-symbol) \ - EncObj(ansi-1251) \ - EncObj(armscii-8) \ - EncObj(dec-special) \ - EncObj(ibm-cp437) EncObj(ibm-cp850) \ - EncObj(ibm-cp852) EncObj(ibm-cp866) \ - EncObj(iso8859-6.16) EncObj(iso8859-6.8x) \ - EncObj(iso8859-11) EncObj(iso8859-13) \ - EncObj(iso8859-16) \ - EncObj(suneu-greek) \ - EncObj(microsoft-cp1250) EncObj(microsoft-cp1251) \ - EncObj(microsoft-cp1252) EncObj(microsoft-cp1253) \ - EncObj(microsoft-cp1254) EncObj(microsoft-cp1255) \ - EncObj(microsoft-cp1256) EncObj(microsoft-cp1257) \ - EncObj(microsoft-cp1258) EncObj(microsoft-win3.1) \ - EncObj(mulearabic-0) EncObj(mulearabic-1) \ - EncObj(mulearabic-2) EncObj(mulelao-1) \ - EncObj(tcvn-0) EncObj(tis620-2) EncObjComp(viscii1.1-1) + EncObjComp(ansi-1251) \ + EncObjComp(armscii-8) \ + EncObjComp(dec-special) \ + EncObjComp(ibm-cp437) EncObjComp(ibm-cp850) \ + EncObjComp(ibm-cp852) EncObjComp(ibm-cp866) \ + EncObjComp(iso8859-6.16) EncObjComp(iso8859-6.8x) \ + EncObjComp(iso8859-11) EncObjComp(iso8859-13) \ + EncObjComp(iso8859-16) \ + EncObjComp(suneu-greek) \ + EncObjComp(microsoft-cp1250) EncObjComp(microsoft-cp1251) \ + EncObjComp(microsoft-cp1252) EncObjComp(microsoft-cp1253) \ + EncObjComp(microsoft-cp1254) EncObjComp(microsoft-cp1255) \ + EncObjComp(microsoft-cp1256) EncObjComp(microsoft-cp1257) \ + EncObjComp(microsoft-cp1258) EncObjComp(microsoft-win3.1) \ + EncObjComp(mulearabic-0) EncObjComp(mulearabic-1) \ + EncObjComp(mulearabic-2) EncObjComp(mulelao-1) \ + EncObjComp(tcvn-0) EncObjComp(tis620-2) EncObjComp(viscii1.1-1) DONES = large/DONE @@ -38,6 +38,35 @@ CompEncodingTarget(adobe-dingbats) CompEncodingTarget(adobe-standard) CompEncodingTarget(adobe-symbol) +CompEncodingTarget(ansi-1251) +CompEncodingTarget(armscii-8) +CompEncodingTarget(dec-special) +CompEncodingTarget(ibm-cp437) +CompEncodingTarget(ibm-cp850) +CompEncodingTarget(ibm-cp852) +CompEncodingTarget(ibm-cp866) +CompEncodingTarget(iso8859-6.16) +CompEncodingTarget(iso8859-6.8x) +CompEncodingTarget(iso8859-11) +CompEncodingTarget(iso8859-13) +CompEncodingTarget(iso8859-16) +CompEncodingTarget(suneu-greek) +CompEncodingTarget(microsoft-cp1250) +CompEncodingTarget(microsoft-cp1251) +CompEncodingTarget(microsoft-cp1252) +CompEncodingTarget(microsoft-cp1253) +CompEncodingTarget(microsoft-cp1254) +CompEncodingTarget(microsoft-cp1255) +CompEncodingTarget(microsoft-cp1256) +CompEncodingTarget(microsoft-cp1257) +CompEncodingTarget(microsoft-cp1258) +CompEncodingTarget(microsoft-win3.1) +CompEncodingTarget(mulearabic-0) +CompEncodingTarget(mulearabic-1) +CompEncodingTarget(mulearabic-2) +CompEncodingTarget(mulelao-1) +CompEncodingTarget(tcvn-0) +CompEncodingTarget(tis620-2) CompEncodingTarget(viscii1.1-1) InstallEncodings($(ENCODINGSDIR))