OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e35772d79306d1d9de19c12b23681618532d.

11 files changed, 178 insertions, 0 deletions

diff --git a/org.handhelds.familiar/packages/x11/diet-x11_20050226.bb b/org.handhelds.familiar/packages/x11/diet-x11_20050226.bb
new file mode 100644
index 0000000..acb6fc3
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/diet-x11_20050226.bb
@@ -0,0 +1,6 @@
+SECTION = "x11/base"
+include x11_${PV}.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/x11/diet-x11_6.2.1.bb b/org.handhelds.familiar/packages/x11/diet-x11_6.2.1.bb
new file mode 100644
index 0000000..1313bd0
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/diet-x11_6.2.1.bb
@@ -0,0 +1,8 @@
+SECTION = "x11/base"
+include x11_${PV}.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+
diff --git a/org.handhelds.familiar/packages/x11/diet-x11_cvs.bb b/org.handhelds.familiar/packages/x11/diet-x11_cvs.bb
new file mode 100644
index 0000000..404794f
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/diet-x11_cvs.bb
@@ -0,0 +1,7 @@
+SECTION = "x11/base"
+include x11_cvs.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+
diff --git a/org.handhelds.familiar/packages/x11/files/autofoo.patch b/org.handhelds.familiar/packages/x11/files/autofoo.patch
new file mode 100644
index 0000000..8bdba09
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/files/autofoo.patch
@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/configure.ac~autofoo
++++ libX11-6.2.1/configure.ac
+@@ -7,12 +7,12 @@
+         [jg@freedesktop.org],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AC_CONFIG_AUX_DIR(.)
+ 
++AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([src/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/org.handhelds.familiar/packages/x11/files/errordb-keysymdb-path-fix.patch b/org.handhelds.familiar/packages/x11/files/errordb-keysymdb-path-fix.patch
new file mode 100644
index 0000000..f43d380
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/files/errordb-keysymdb-path-fix.patch
@@ -0,0 +1,22 @@
+--- X11/src/ErrDes.c.orig	2005-09-03 16:15:48 +0200
++++ X11/src/ErrDes.c	2005-09-03 16:16:03 +0200
+@@ -56,7 +56,7 @@
+ #include <stdio.h>
+ 
+ #ifndef ERRORDB
+-#define ERRORDB "/usr/lib/X11/XErrorDB"
++#define ERRORDB "/usr/share/X11/XErrorDB"
+ #endif
+ 
+ /*
+--- X11/src/StrKeysym.c.orig	2005-09-03 16:41:18 +0200
++++ X11/src/StrKeysym.c	2005-09-03 16:41:33 +0200
+@@ -36,7 +36,7 @@
+ #include "Key.h"
+ 
+ #ifndef KEYSYMDB
+-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
++#define KEYSYMDB "/usr/share/X11/XKeysymDB"
+ #endif
+ 
+ static Bool initialized;
diff --git a/org.handhelds.familiar/packages/x11/files/fix-utf8-wrong-define.patch b/org.handhelds.familiar/packages/x11/files/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000..dca88fb
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/files/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-6.2.1/include/X11/Xlib.h
+@@ -100,7 +100,7 @@
+ 
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+    November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING 
+ 
+ typedef char *XPointer;
+ 
diff --git a/org.handhelds.familiar/packages/x11/x11-native_6.2.1.bb b/org.handhelds.familiar/packages/x11/x11-native_6.2.1.bb
new file mode 100644
index 0000000..cb44531
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/x11-native_6.2.1.bb
@@ -0,0 +1,5 @@
+SECTION = "x11/base"
+include x11_${PV}.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/org.handhelds.familiar/packages/x11/x11-native_cvs.bb b/org.handhelds.familiar/packages/x11/x11-native_cvs.bb
new file mode 100644
index 0000000..30a31eb
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/x11-native_cvs.bb
@@ -0,0 +1,5 @@
+SECTION = "x11/base"
+include x11_cvs.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
diff --git a/org.handhelds.familiar/packages/x11/x11_20050226.bb b/org.handhelds.familiar/packages/x11/x11_20050226.bb
new file mode 100644
index 0000000..38c96cf
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/x11_20050226.bb
@@ -0,0 +1,6 @@
+CVSDATE = "20050226"
+
+include x11_cvs.bb
+
+DEFAULT_PREFERENCE = "0"
+
diff --git a/org.handhelds.familiar/packages/x11/x11_6.2.1.bb b/org.handhelds.familiar/packages/x11/x11_6.2.1.bb
new file mode 100644
index 0000000..121c1dd
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/x11_6.2.1.bb
@@ -0,0 +1,40 @@
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+PROVIDES = "x11"
+PR = "r3"
+
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
+           file://errordb-keysymdb-path-fix.patch;patch=1 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig 
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+		oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+	)
+	oe_runmake
+}
+
+do_stage() {
+	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+
+	oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}
diff --git a/org.handhelds.familiar/packages/x11/x11_cvs.bb b/org.handhelds.familiar/packages/x11/x11_cvs.bb
new file mode 100644
index 0000000..3f394df
--- /dev/null
+++ b/org.handhelds.familiar/packages/x11/x11_cvs.bb
@@ -0,0 +1,41 @@
+PV = "6.2.1cvs${CVSDATE}"
+LICENSE = "XFree86"
+PR = "r5"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+PROVIDES = "x11"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \
+	   file://errordb-keysymdb-path-fix.patch;patch=1"
+S = "${WORKDIR}/X11"
+
+inherit autotools pkgconfig 
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+		oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+	)
+	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
+
+do_stage() {
+	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+
+	oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}