[oe-commits] Frans Meulenbroeks : libx11-native: removed patch as this is already in libx11

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 88d445e9879fd7d42152973d4f955a1d7f8fab02
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=88d445e9879fd7d42152973d4f955a1d7f8fab02

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Wed Feb  3 22:59:28 2010 +0100

libx11-native: removed patch as this is already in libx11

while adding a patch for libx11, I missed that the patch was there for libx11-native
and as that one includes the libx11 recipe the patch was there twice which of course
does not apply. removed the patch from libx11-native and bumped PR in libx11
(as libx11-native does not have its own PR)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 recipes/xorg-lib/libx11-native_1.3.3.bb |    2 --
 recipes/xorg-lib/libx11_1.3.3.bb        |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/recipes/xorg-lib/libx11-native_1.3.3.bb b/recipes/xorg-lib/libx11-native_1.3.3.bb
index 98fe79f..71b45af 100644
--- a/recipes/xorg-lib/libx11-native_1.3.3.bb
+++ b/recipes/xorg-lib/libx11-native_1.3.3.bb
@@ -1,7 +1,5 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://dolt-fix.patch;patch=1"
-
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
 DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index 947e938..e70716a 100644
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r5"
+PR = "r6"
 
 XORG_PN = "libX11"