diff options
author | Richard Purdie <richard@openedhand.com> | 2006-03-25 23:31:04 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-03-25 23:31:04 +0000 |
commit | c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d (patch) | |
tree | 9173fb365bf861e2337693179c270f81193f41b5 /openembedded/packages/x11 | |
parent | 05ff3147c40087edece71449e375cdf588d7a29b (diff) | |
download | openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.gz openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.bz2 openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.xz openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.zip |
Update xlibs to follow restructuring in OE (in preparation for X11R7)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/x11')
-rw-r--r-- | openembedded/packages/x11/diet-x11_6.2.1.bb | 8 | ||||
-rw-r--r-- | openembedded/packages/x11/files/autofoo.patch | 22 | ||||
-rw-r--r-- | openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch | 22 | ||||
-rw-r--r-- | openembedded/packages/x11/files/fix-utf8-wrong-define.patch | 16 | ||||
-rw-r--r-- | openembedded/packages/x11/x11-native_6.2.1.bb | 5 | ||||
-rw-r--r-- | openembedded/packages/x11/x11_6.2.1.bb | 40 |
6 files changed, 0 insertions, 113 deletions
diff --git a/openembedded/packages/x11/diet-x11_6.2.1.bb b/openembedded/packages/x11/diet-x11_6.2.1.bb deleted file mode 100644 index 1313bd08d..000000000 --- a/openembedded/packages/x11/diet-x11_6.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -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/openembedded/packages/x11/files/autofoo.patch b/openembedded/packages/x11/files/autofoo.patch deleted file mode 100644 index 8bdba0976..000000000 --- a/openembedded/packages/x11/files/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# 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/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch b/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065..000000000 --- a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/openembedded/packages/x11/files/fix-utf8-wrong-define.patch b/openembedded/packages/x11/files/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba9..000000000 --- a/openembedded/packages/x11/files/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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/openembedded/packages/x11/x11-native_6.2.1.bb b/openembedded/packages/x11/x11-native_6.2.1.bb deleted file mode 100644 index cb44531b8..000000000 --- a/openembedded/packages/x11/x11-native_6.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "x11/base" -include x11_${PV}.bb -inherit native -DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" -PROVIDES = "" diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/x11/x11_6.2.1.bb deleted file mode 100644 index 121c1ddd9..000000000 --- a/openembedded/packages/x11/x11_6.2.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -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} -} |