From 1bceb4bf02a057c22f415fe184ba5f565fd15bbd Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 1 Aug 2007 13:35:43 +0000
Subject: libx11/diet-x11: upgraded to 1.1.2

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2287 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/diet-x11_1.1.1.bb | 10 ----------
 meta/packages/xorg-lib/diet-x11_1.1.2.bb |  8 ++++++++
 meta/packages/xorg-lib/libx11_1.1.1.bb   | 23 -----------------------
 meta/packages/xorg-lib/libx11_1.1.2.bb   | 22 ++++++++++++++++++++++
 4 files changed, 30 insertions(+), 33 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/diet-x11_1.1.1.bb
 create mode 100644 meta/packages/xorg-lib/diet-x11_1.1.2.bb
 delete mode 100644 meta/packages/xorg-lib/libx11_1.1.1.bb
 create mode 100644 meta/packages/xorg-lib/libx11_1.1.2.bb

(limited to 'meta')

diff --git a/meta/packages/xorg-lib/diet-x11_1.1.1.bb b/meta/packages/xorg-lib/diet-x11_1.1.1.bb
deleted file mode 100644
index 33fda1c..0000000
--- a/meta/packages/xorg-lib/diet-x11_1.1.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-
-PR = "r1"
-
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-	    file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/diet-x11_1.1.2.bb b/meta/packages/xorg-lib/diet-x11_1.1.2.bb
new file mode 100644
index 0000000..f032987
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_1.1.2.bb
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+	    file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/libx11_1.1.1.bb b/meta/packages/xorg-lib/libx11_1.1.1.bb
deleted file mode 100644
index b2f8b5c..0000000
--- a/meta/packages/xorg-lib/libx11_1.1.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-PR = "r2"
-PE = "1"
-
-XORG_PN = "libX11"
-
-EXTRA_OECONF += "--without-xcb"
-
-do_compile() {
-	(
-		unset CC LD CXX CCLD
-		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-	)
-	oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb
new file mode 100644
index 0000000..bab2277
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_1.1.2.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+PE = "1"
+
+XORG_PN = "libX11"
+
+EXTRA_OECONF += "--without-xcb"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	)
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-- 
cgit v1.1