xlibs: move X libraries to a common folder and unify naming to tarball names

14 files changed, 0 insertions, 234 deletions

diff --git a/packages/x11/.mtn2git_empty b/packages/x11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/x11/.mtn2git_empty
+++ /dev/null
diff --git a/packages/x11/diet-x11_20050226.bb b/packages/x11/diet-x11_20050226.bb
deleted file mode 100644
index acb6fc330b..0000000000
--- a/packages/x11/diet-x11_20050226.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-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/packages/x11/diet-x11_6.2.1.bb b/packages/x11/diet-x11_6.2.1.bb
deleted file mode 100644
index b63bfa041a..0000000000
--- a/packages/x11/diet-x11_6.2.1.bb
+++ /dev/null
@@ -1,9 +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 \
-	file://xim.patch;patch=1"
-
diff --git a/packages/x11/diet-x11_cvs.bb b/packages/x11/diet-x11_cvs.bb
deleted file mode 100644
index 0adf717f17..0000000000
--- a/packages/x11/diet-x11_cvs.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-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 \
-	file://xim.patch;patch=1"
diff --git a/packages/x11/files/.mtn2git_empty b/packages/x11/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/x11/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/x11/files/autofoo.patch b/packages/x11/files/autofoo.patch
deleted file mode 100644
index 8bdba09768..0000000000
--- a/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/packages/x11/files/errordb-keysymdb-path-fix.patch b/packages/x11/files/errordb-keysymdb-path-fix.patch
deleted file mode 100644
index f43d38065e..0000000000
--- a/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/packages/x11/files/fix-utf8-wrong-define.patch b/packages/x11/files/fix-utf8-wrong-define.patch
deleted file mode 100644
index dca88fba92..0000000000
--- a/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/packages/x11/files/xim.patch b/packages/x11/files/xim.patch
deleted file mode 100644
index 0eab197a80..0000000000
--- a/packages/x11/files/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- libX11-6.2.1/src/X18NCMSstubs.c	2003-12-04 22:47:47.000000000 +0000
-+++ libX11-6.2.1/src/X18NCMSstubs.c-new	2005-12-09 12:09:03.000000000 +0000
-@@ -90,6 +90,52 @@
-   return;
- }
- 
-+XIM
-+XOpenIM (
-+    Display* display,
-+    struct _XrmHashBucketRec* rdb,
-+    char* res_name,
-+    char* res_class)
-+{
-+  return (XIM) NULL;
-+}
-+
-+Status
-+XCloseIM ( XIM im )
-+{
-+  return NULL;
-+}
-+
-+XIC
-+XCreateIC ( XIM im, ...)
-+{
-+  return NULL;
-+}
-+
-+void
-+XDestroyIC ( XIC ic )
-+{
-+  return;
-+}
-+
-+int
-+XmbLookupString (
-+    XIC ic,
-+    XKeyPressedEvent* ev,
-+    char* buffer,
-+    int nbytes,
-+    KeySym* keysym,
-+    Status* status)
-+{
-+  return XLookupNone;
-+}
-+
-+char *
-+XGetICValues( XIC ic, ...)
-+{
-+  return (char *) NULL;
-+}
-+
- XPointer
- _XimGetLocaleCode ( _Xconst char* encoding_name )
- {
diff --git a/packages/x11/x11-native_6.2.1.bb b/packages/x11/x11-native_6.2.1.bb
deleted file mode 100644
index cb44531b87..0000000000
--- a/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/packages/x11/x11-native_cvs.bb b/packages/x11/x11-native_cvs.bb
deleted file mode 100644
index 30a31ebf9b..0000000000
--- a/packages/x11/x11-native_cvs.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "x11/base"
-include x11_cvs.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
diff --git a/packages/x11/x11_20050226.bb b/packages/x11/x11_20050226.bb
deleted file mode 100644
index b8206c29df..0000000000
--- a/packages/x11/x11_20050226.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCDATE = "20050226"
-
-include x11_cvs.bb
-
-DEFAULT_PREFERENCE = "0"
-
diff --git a/packages/x11/x11_6.2.1.bb b/packages/x11/x11_6.2.1.bb
deleted file mode 100644
index b1de21c383..0000000000
--- a/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 = "r4"
-
-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/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb
deleted file mode 100644
index 5cc568de58..0000000000
--- a/packages/x11/x11_cvs.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-PV = "6.2.1+cvs${SRCDATE}"
-LICENSE = "XFree86"
-PR = "r6"
-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 = "${FREEDESKTOP_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}
-}