From: Frans Meulenbroeks Date: Wed, 3 Feb 2010 21:59:28 +0000 (+0100) Subject: libx11-native: removed patch as this is already in libx11 X-Git-Tag: Release-2010-05/1~593 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88d445e9879fd7d42152973d4f955a1d7f8fab02;p=openembedded.git 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 --- diff --git a/recipes/xorg-lib/libx11-native_1.3.3.bb b/recipes/xorg-lib/libx11-native_1.3.3.bb index 98fe79f5c3..71b45afdf4 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 947e9388c1..e70716a96d 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"