Fixes to xkbcomp invocation

Author: pelya

android/build.sh

@@ -316,6 +316,7 @@ env CFLAGS="-isystem$BUILDDIR -include strings.h" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -353,6 +354,7 @@ LDFLAGS="-L$BUILDDIR" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -388,6 +390,7 @@ LDFLAGS="-L$BUILDDIR" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -421,6 +424,7 @@ LDFLAGS="-L$BUILDDIR" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -466,6 +470,7 @@ LDFLAGS="-L$BUILDDIR" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -516,6 +521,7 @@ $BUILDDIR/setCrossEnvironment.sh \
 LIBS="-lXau -lXdmcp -landroid_support" \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -556,6 +562,7 @@ LIBS="-lxcb -lXau -lXdmcp -landroid_support" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./
@@ -592,6 +599,7 @@ LIBS="-lxcb -lXau -lXdmcp -landroid_support -lX11" \
 $BUILDDIR/setCrossEnvironment.sh \
 ./configure \
 --host=arm-linux-androideabi \
+--prefix=$TARGET_DIR/usr \
 || exit 1
 
 cp -f `which libtool` ./

configure-xsdl.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-env SDL=yes CFLAGS="-O0 -g" \
+env SDL=yes CFLAGS="-O0 -g -DDEBUG" \
 ./configure --prefix=`pwd`/data/usr \
 --enable-debug \
 --disable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin \

data/archive.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+tar cvfz data-1.tgz usr tmp

data/data-1.tgz

@@ -306,7 +306,7 @@ extern _X_EXPORT void OsReleaseSignals (void);
 
 extern _X_EXPORT void OsAbort (void) _X_NORETURN;
 
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(__ANDROID__)
 extern _X_EXPORT int System(char *);
 extern _X_EXPORT pointer Popen(char *, char *);
 extern _X_EXPORT int Pclose(pointer);

data/usr/bin/xkbcomp

@@ -1230,7 +1230,7 @@ OsAbort (void)
     abort();
 }
 
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(__ANDROID__)
 /*
  * "safer" versions of system(3), popen(3) and pclose(3) which give up
  * all privs before running a command.

include/os.h

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./Xsdl :1111 -screen 640x480x24 # -mouse mouse -keybd keyboard
+./Xsdl :1111 -screen 640x480x24 -mouse mouse -keybd keyboard

os/utils.c

@@ -57,10 +57,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XKM_OUTPUT_DIR	"compiled/"
 #endif
 
-#define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
-#define	ERROR_PREFIX	"\"> \""
-#define	POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-#define	POST_ERROR_MSG2 "\"End of messages from xkbcomp\""
+#define	PRE_ERROR_MSG "xkbcomp:"
+#define	ERROR_PREFIX	"---"
+#define	POST_ERROR_MSG1 "======="
 
 #if defined(WIN32)
 #define PATHSEPARATOR "\\"
@@ -223,8 +222,8 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
     }
 
     if (asprintf(&buf,
-		 "\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
-		  "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
+		 "%s%sxkbcomp -w %d %s -xkm %s "
+		  "-em1 %s -emp %s -eml %s %s%s.xkm",
 		 xkbbindir, xkbbindirsep,
 		 ((xkbDebugFlags < 2) ? 1 :
 		  ((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
@@ -250,7 +249,13 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
 #ifdef DEBUG
     if (xkbDebugFlags) {
        ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
+#ifdef __ANDROID__
+       //FILE * dbg = fopen("/sdcard/xkb-input.txt", "wb");
+       //XkbWriteXKBKeymapForNames(dbg,names,xkb,want,need);
+       //fclose(dbg);
+#else
        XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
+#endif
     }
 #endif
 	XkbWriteXKBKeymapForNames(out,names,xkb,want,need);