Attachment 1046 Details for Bug 1568 – p_suse.diff

[patch] p_suse.diff

p_suse.diff (text/plain), 21.13 KB, created by Stefan Dirsch on 2004-10-09 10:01:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2004-10-09 10:01:33 UTC

Size: 21.13 KB

patch

obsolete

>Index: fonts/bdf/misc/fonts.alias
>===================================================================
>RCS file: /opt/repository/cvs/xc/fonts/bdf/misc/fonts.alias,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
>--- fonts/bdf/misc/fonts.alias	20 Jan 2002 14:58:47 -0000	1.1.1.3
>+++ fonts/bdf/misc/fonts.alias	13 Aug 2003 12:09:19 -0000	1.1.1.3.14.1
>@@ -75,3 +75,34 @@
> -sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
> -jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
> -jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
>+
>+!
>+! European Font Aliases for MULE
>+!
>+! a14 -etl-fixed-medium-r-normal--14-140-72-72-c-70-iso8859-1
>+a16 -etl-fixed-medium-r-normal--16-160-72-72-c-80-iso8859-1
>+a24 -etl-fixed-medium-r-normal--24-240-72-72-c-120-iso8859-1
>+-etl-fixed-medium-r-normal--14-140-72-72-c-70-koi8-1 -etl-fixed-medium-r-normal--14-140-72-72-c-70-gost19768.74-1
>+-etl-fixed-medium-r-normal--16-160-72-72-c-80-koi8-1 -etl-fixed-medium-r-normal--16-160-72-72-c-80-gost19768.74-1
>+-etl-fixed-medium-r-normal--24-240-72-72-c-120-koi8-1 -etl-fixed-medium-r-normal--24-240-72-72-c-120-gost19768.74-1
>+
>+!
>+! Chinese Font Aliases for MULE
>+!
>+-etl-fixed-medium-r-normal--24-240-72-72-c-120-sisheng_cwnn-0 -etl-fixed-medium-r-normal--24-240-72-72-c-120-omron_udc_zh-0
>+-etl-fixed-medium-r-normal--16-160-72-72-c-80-sisheng_cwnn-0 -etl-fixed-medium-r-normal--16-160-72-72-c-80-omron_udc_zh-0
>+-etl-fixed-medium-r-normal--14-140-72-72-c-70-sisheng_cwnn-0 -etl-fixed-medium-r-normal--14-140-72-72-c-70-omron_udc_zh-0
>+
>+!
>+! Japanese Font Aliases for MULE
>+!
>+k18 -jis-gothic-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0
>+k32 -watanabe-fixed-medium-r-normal--32-300-75-75-c-320-jisx0208.1983-0
>+k48 -watanabe-fixed-medium-r-normal--48-450-75-75-c-480-jisx0208.1983-0
>+
>+!
>+! traditional Chinese Font Aliases for Netscape:
>+!
>+-eten-fixed-medium-r-normal--16-150-75-75-c-160-big5-0 -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0
>+-eten-fixed-medium-r-normal--24-230-75-75-c-240-big5-0 -eten-fixed-medium-r-normal--24-230-75-75-c-240-big5.eten-0
>+
>--- 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: nls/Compose/en_US.UTF-8
>===================================================================
>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 @@
> <Multi_key> <equal> <C>			: "â¬" EuroSign # EURO SIGN
> <Multi_key> <E> <equal>			: "â¬" EuroSign # EURO SIGN
> <Multi_key> <equal> <E>			: "â¬" EuroSign # EURO SIGN
>+<Multi_key> <c> <equal>                 : "â¬" EuroSign # EURO SIGN
>+<Multi_key> <equal> <c>                 : "â¬" EuroSign # EURO SIGN
>+<Multi_key> <e> <equal>                 : "â¬" EuroSign # EURO SIGN
>+<Multi_key> <equal> <e>                 : "â¬" EuroSign # EURO SIGN
> 
> <Multi_key> <L> <minus> 		: "Â£" U00a3 # POUND SIGN
> <Multi_key> <minus> <L> 		: "Â£" U00a3 # POUND SIGN
>Index: nls/Compose/iso8859-15
>===================================================================
>RCS file: /opt/repository/cvs/xc/nls/Compose/iso8859-15,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
>--- nls/Compose/iso8859-15	21 Mar 2003 20:32:18 -0000	1.1.1.4
>+++ nls/Compose/iso8859-15	13 Aug 2003 12:09:20 -0000	1.1.1.4.8.1
>@@ -468,3 +468,4 @@
> <dead_acute> <C>			: "\307"	Ccedilla
> <dead_acute> <c>			: "\347"	ccedilla
> XCOMM End of Sequence Definition
>+<acute>					: "'"		apostrophe
>Index: programs/twm/system.twmrc
>===================================================================
>RCS file: /opt/repository/cvs/xc/programs/twm/system.twmrc,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/twm/system.twmrc	20 Jan 2002 14:59:30 -0000	1.1.1.3
>+++ programs/twm/system.twmrc	13 Aug 2003 12:09:20 -0000	1.1.1.3.14.1
>@@ -15,11 +15,11 @@
> NoGrabServer
> RestartPreviousState
> DecorateTransients
>-TitleFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
>-ResizeFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
>-MenuFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
>-IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
>-IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*"
>+TitleFont       "-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-*-helvetica-medium-r-*--17-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-16-*-*-*-*-*-*-*,-*--16-*,*" 
>+ResizeFont      "-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-*-helvetica-medium-r-*--17-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-16-*-*-*-*-*-*-*,-*--16-*,*"
>+MenuFont        "-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-*-helvetica-medium-r-*--17-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-16-*-*-*-*-*-*-*,-*--16-*,*"
>+IconFont        "-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-*-helvetica-medium-r-*--17-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-16-*-*-*-*-*-*-*,-*--16-*,*"
>+IconManagerFont "-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-*-helvetica-medium-r-*--17-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-16-*-*-*-*-*-*-*,-*--16-*,*"
> #ClientBorderWidth
> 
> Color
>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 <os2.h>
> #endif
> 
>-#ifndef USE_FILE
>+#ifdef linux
>+/*
>+ * Many Linux distribution uses a named pipe for system messages
>+ * provided by the system logger.   <werner@suse.de>
>+ */
>+#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.
>+ * <werner@suse.de>
>+ */
>+#define USE_PTS
>+#endif
>+
>+#if !defined(USE_FILE) || defined(linux)
> #include <sys/ioctl.h>
> #ifdef hpux
> #include <termios.h>
> #endif
>-#ifdef SVR4
>+#if defined(SVR4) || defined(USE_PTS)
> #include <termios.h>
> #include <sys/stropts.h>		/* for I_PUSH */
> #ifdef sun
>@@ -166,7 +184,7 @@
> #endif
> #endif
> 
>-#if (defined(SVR4) && !defined(sun)) || (defined(SYSV) && defined(i386))
>+#if (defined(SVR4) && !defined(sun) && !defined(USE_PTS)) || (defined(SYSV) && defined(i386))
> #define USE_OSM
> #include <signal.h>
> #endif
>@@ -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);
>Index: programs/xinit/Imakefile
>===================================================================
>RCS file: /opt/repository/cvs/xc/programs/xinit/Imakefile,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/xinit/Imakefile	21 Mar 2003 20:32:57 -0000	1.1.1.4
>+++ programs/xinit/Imakefile	13 Aug 2003 12:09:20 -0000	1.1.1.4.8.1
>@@ -30,9 +30,9 @@
> 
> ComplexProgramTarget_1(xinit,$(LOCAL_LIBRARIES),$(DEFFILE))
> 
>-MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR))
>+MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) -DLIBDIR=$(LIBDIR))
> 
>-MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) -DBINDIR=$(BINDIR) $(COOKIEDEFS))
>+MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) -DLIBDIR=$(LIBDIR) -DBINDIR=$(BINDIR) $(COOKIEDEFS))
> 
> EXTRAMANDEFS=-D__xinitdir__=$(XINITDIR)
> 
>Index: programs/xinit/startx.cpp
>===================================================================
>RCS file: /opt/repository/cvs/xc/programs/xinit/startx.cpp,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/xinit/startx.cpp	21 Mar 2003 20:32:57 -0000	1.1.1.4
>+++ programs/xinit/startx.cpp	13 Aug 2003 12:09:20 -0000	1.1.1.4.8.1
>@@ -48,6 +48,138 @@
> scoclientrc=$HOME/.startxrc
> #endif
> 
>+#ifdef linux
>+XCOMM
>+XCOMM check for installed servers
>+XCOMM
>+INSTALLED_SERVERS=`ls -1 /usr/X11R6/bin/Xsun* /usr/X11R6/bin/XFree86 /usr/X11R6/bin/XF86_* /usr/X11R6/bin/Xaccel* \
>+		   /usr/X11R6/bin/XSuSE* /usr/X11R6/bin/Xmetr* /usr/X11R6/bin/XFCom* /usr/X11R6/bin/XBF* 2>/dev/null`
>+
>+if [ -z "$INSTALLED_SERVERS" ]; then
>+
>+	echo ""
>+	echo "You did not install any X-Server $e.g. XF86_SVGA$!"
>+	echo "Please install at least one server to start X."
>+	echo "I'm aborting now."
>+	exit 1
>+fi
>+
>+XCOMM 
>+XCOMM  now check if Accelerated X is installed as that may have problems
>+XCOMM  with gziped fonts
>+XCOMM 
>+case "$INSTALLED_SERVERS" in
>+  /usr/X11R6/bin/Xaccel*)
>+    FONTLIST=`echo "/usr/X11R6/lib/X11/fonts/*/*.gz"`
>+    for FONT in $FONTLIST; do
>+        if test -f $FONT ; then
>+            echo "ATTENTION!!! Found AcceleratedX Server - probably it can not"
>+            echo "handle Fonts compressed with gzip."
>+            echo
>+            echo "If you have troubles, please try"
>+            echo
>+            echo "  for DIR in /usr/X11R6/lib/X11/fonts/* ; do"
>+            echo "      cd \$DIR || continue"
>+            echo "      for FILE in *.gz ; do"
>+            echo "          BASE=\`basename \$FILE .gz\`"
>+            echo "          gunzip -f \$FILE"
>+            echo "          compress \$BASE"
>+            echo "      done"
>+            echo "      mkfontdir ."
>+            echo "  done"
>+            echo
>+            sleep 5
>+        fi
>+        break
>+    done
>+    ;;
>+  *)
>+    ;;
>+esac
>+
>+
>+XCOMM 
>+XCOMM  perhaps a windowmanager is specified?
>+XCOMM 
>+XCOMM
>+XCOMM find wmlist utility, else take twm as default (always there :-))
>+XCOMM
>+type -p wmlist &> /dev/null && WMLIST="`for i in $(wmlist); do echo $i; done | sort`"
>+test -z "$WMLIST" && WMLIST="twm"
>+
>+test "$1" = "--" || { test -n "$1" && WANTEDWM=`basename "$1"` ; }
>+
>+XCOMM
>+XCOMM User could have set a list of window manager in WINDOWMANAGERLIST.
>+XCOMM go throu wms and check if user specified a reachable one.
>+XCOMM 
>+for WM in $WMLIST $WINDOWMANAGERLIST
>+do 
>+    test "$WM" = "$WANTEDWM" && {
>+	#
>+	# is it reachable via $PATH?
>+	#
>+	type -p $WM &> /dev/null || {
>+
>+	    echo "`basename $0`: error: the requested window manager '$1' could not be found!"
>+	    echo "Window manager must be one of (currently installed window managers):"
>+	    for i in $WMLIST; do echo $i; done
>+	    exit 1
>+	}
>+	#
>+	# OK, we got it, this will be the override for WINDOWMANAGER
>+	#
>+	export WINDOWMANAGER=$WM
>+	shift 1
>+	break
>+    }
>+done
>+
>+unset WINDOWMANAGERLIST WMLIST WANTEDWM WM
>+
>+XCOMM
>+XCOMM check for the first link
>+XCOMM
>+
>+if [ ! -L /usr/X11R6/bin/X ]; then
>+
>+	echo ""
>+	echo "There is no link /usr/X11R6/bin/X to /var/X11R6/bin/X!"
>+	echo "Please link the files as mentioned above or install the X-Server again."
>+	echo "I'm aborting now."
>+	exit 1
>+fi
>+
>+XCOMM
>+XCOMM check for the second link
>+XCOMM 	
>+
>+if [ ! -L /var/X11R6/bin/X ]; then
>+
>+	echo ""
>+	echo "There is no link /var/X11R6/bin/X to /usr/X11R6/bin/XF86_xxxx which is"
>+	echo "the binary of the installed X-Server."
>+	echo "Please link the files as mentioned above or install the X-Server and"
>+	echo "run xf86config again."
>+	echo "I'm aborting now."
>+	exit 1
>+fi
>+
>+XCOMM
>+XCOMM check if the XF86_xxxx file is an executable or an accidentially copied script or similar things
>+XCOMM
>+
>+if [ ! -x /var/X11R6/bin/X ]; then
>+
>+	echo ""
>+	echo "The file XF86_xxxx (binary of X-Server) doesn't seem to be a binary file."
>+	echo "Please check it or / and install a new X-Server-binary."
>+	echo "I'm aborting now."
>+	exit 1
>+fi
>+
>+#endif
>+
> userclientrc=$HOME/.xinitrc
> userserverrc=$HOME/.xserverrc
> sysclientrc=XINITDIR/xinitrc
>Index: programs/xinit/xinitrc.cpp
>===================================================================
>RCS file: /opt/repository/cvs/xc/programs/xinit/xinitrc.cpp,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/xinit/xinitrc.cpp	20 Jan 2002 14:59:38 -0000	1.1.1.3
>+++ programs/xinit/xinitrc.cpp	13 Aug 2003 12:09:20 -0000	1.1.1.3.14.1
>@@ -3,8 +3,8 @@
> 
> userresources=$HOME/.Xresources
> usermodmap=$HOME/.Xmodmap
>-sysresources=XINITDIR/.Xresources
>-sysmodmap=XINITDIR/.Xmodmap
>+sysresources=LIBDIR/Xresources
>+sysmodmap=LIBDIR/Xmodmap
> 
> XCOMM merge in defaults and keymaps
> 
>@@ -26,8 +26,15 @@
> 
> XCOMM start some nice programs
> 
>-twm &
>+if [ -x /usr/X11R6/bin/fvwm2 ]; then
>+    exec fvwm2
>+fi
>+
>+if [ -x /usr/X11R6/bin/fvwm ]; then
>+    exec fvwm
>+fi
>+
> xclock -geometry 50x50-1+1 &
> xterm -geometry 80x50+494+51 &
> xterm -geometry 80x20+494-0 &
>-exec xterm -geometry 80x66+0+0 -name login
>+exec twm
>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,7 +285,7 @@
> #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);
>--- 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,7 +167,7 @@
> # 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 | geqn -Tlatin1 | gtbl | GROFF_NO_SGR= groff -Tlatin1 -mandoc"
> # else
> #  define FORMAT "| neqn | nroff -man"      /* The format command. */
> # endif
>--- 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))
>--- fonts/scaled/TTF/Imakefile.old	2004-01-08 10:46:52.156640651 +0000
>+++ fonts/scaled/TTF/Imakefile	2004-01-08 10:49:51.729277494 +0000
>@@ -4,11 +4,7 @@
> 	luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
> 	luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf
> 
>-VERASRCDIR = $(TOP)/extras/fonts/Bitstream-Vera
>-VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
>-	VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
>-
>-FONTS = $(LUXIFONTS) $(VERAFONTS)
>+FONTS = $(LUXIFONTS)
> OBJS = $(FONTS)
> 
> FONTINSTDIR = $(FONTDIR)/TTF
>@@ -31,14 +27,3 @@
> DependSubdirs($(SUBDIRS))
> #endif
> 
>-LinkSourceFile(Vera.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
>-LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))
>-
>--- programs/xkbcomp/symbols/pc/pc.orig	2004-04-19 14:49:33.935285846 +0200
>+++ programs/xkbcomp/symbols/pc/pc	2004-04-19 15:13:04.523298499 +0200
>@@ -200,6 +200,7 @@
>     include "pc/pc(basic)"
>     key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
>     key <RALT> {	[	Alt_R,	Meta_R		]	};
>+    key <RCTL> {	[   Control_R,	Multi_key       ]       }; 
> 
> };
> 
>@@ -216,8 +217,10 @@
>     key <LALT> {	[ 	Alt_L,	Meta_L		]	};
>     key <RALT> {	[	Alt_R,	Meta_R		]	};
>     key <LWIN> {	[	Super_L			]	};
>-    key <RWIN> {	[	Super_R			]	};
>+    key <RWIN> {	[	Super_R,  Multi_key     ]       }; 
>     key <MENU> {	[	Menu			]	};
>+    key <RCTL> {	[     Control_R,  Multi_key     ]       }; 
>+    modifier_map Mod4 { Super_L, Super_R }; 
> 
> };
> 
>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,6 +2114,8 @@
> 	return NOTIFY_EMAIL_STR;
> 	break;
>     }
>+
>+    return (const char*)NULL;
> }
> 
> /*
>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,6 +1504,8 @@
> 
>     FreeVector(vector);
>     xfree(cmdNam);
>+
>+    return 0;
> }
> 
> /*
>--- lib/SM/sm_manager.c.old	2004-05-30 16:55:19.058371366 +0000
>+++ lib/SM/sm_manager.c	2004-05-30 17:08:13.811413463 +0000
>@@ -32,6 +32,7 @@
> 
> #include <X11/SM/SMlib.h>
> #include "SMlibint.h"
>+#include <X11/Xtrans.h>
> 
> #ifdef __USLC__
> #undef shutdown
>--- 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,4 +526,6 @@
> 
>     /* then wait for it... */
>     XtAppMainLoop(app_context);
>+
>+    return 0;
> }
>--- ./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,7 @@
> PsCreateColormap(ColormapPtr pColor)
> {
>   miInitializeColormap(pColor);
>+  return True;
> }
> 
> void

Actions: View | Splinter Review

Attachments on bug 1568: 1046 | 1112

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.