[oe-commits] org.oe.dev xorg-lib: Remove unused patches, combine diet-x11 and libx11 patches into the same place

[rpurdie commit]

xorg-lib: Remove unused patches, combine diet-x11 and libx11 patches into the same place

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: eec0cf22d27780a5209f4aad8fee7ddaa6bb80a0
ViewMTN: http://monotone.openembedded.org/revision/info/eec0cf22d27780a5209f4aad8fee7ddaa6bb80a0
Files:
1
packages/xorg-lib/diet-x11
packages/xorg-lib/diet-x11/autofoo.patch
packages/xorg-lib/diet-x11/makekeys.diff
packages/xorg-lib/files
packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
packages/xorg-lib/files/fix-utf8-wrong-define.patch
packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
packages/xorg-lib/libx11/autofoo.patch
packages/xorg-lib/libxdamage
packages/xorg-lib/libxdamage/m4.patch
packages/xorg-lib/libxfont/scalable.patch
packages/xorg-lib/libxft
packages/xorg-lib/libxi
packages/xorg-lib/libxpm
packages/xorg-lib/diet-x11/X18NCMSstubs.diff
packages/xorg-lib/libx11/X18NCMSstubs.diff
packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
packages/xorg-lib/libx11/fix-disable-xlocale.diff
packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
packages/xorg-lib/libx11/fix-utf8-wrong-define.patch
packages/xorg-lib/diet-x11/xchar2b.patch
packages/xorg-lib/libx11/xchar2b.patch
packages/xorg-lib/diet-x11/xim.patch
packages/xorg-lib/libx11/xim.patch
packages/xorg-lib/files/ruutf8.patch
packages/xorg-lib/libx11/ruutf8.patch
packages/xorg-lib/diet-x11_1.1.1.bb
packages/xorg-lib/diet-x11_1.1.2.bb
packages/xorg-lib/diet-x11_1.1.3.bb
Diffs:

#
# mt diff -r18aa416d22e5314a281cc0d5b39081c8a2293a69 -reec0cf22d27780a5209f4aad8fee7ddaa6bb80a0
#
# 
# 
# delete "packages/xorg-lib/diet-x11"
# 
# delete "packages/xorg-lib/diet-x11/autofoo.patch"
# 
# delete "packages/xorg-lib/diet-x11/makekeys.diff"
# 
# delete "packages/xorg-lib/files"
# 
# delete "packages/xorg-lib/files/errordb-keysymdb-path-fix.patch"
# 
# delete "packages/xorg-lib/files/fix-utf8-wrong-define.patch"
# 
# delete "packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch"
# 
# delete "packages/xorg-lib/libx11/autofoo.patch"
# 
# delete "packages/xorg-lib/libxdamage"
# 
# delete "packages/xorg-lib/libxdamage/m4.patch"
# 
# delete "packages/xorg-lib/libxfont/scalable.patch"
# 
# delete "packages/xorg-lib/libxft"
# 
# delete "packages/xorg-lib/libxi"
# 
# delete "packages/xorg-lib/libxpm"
# 
# rename "packages/xorg-lib/diet-x11/X18NCMSstubs.diff"
#     to "packages/xorg-lib/libx11/X18NCMSstubs.diff"
# 
# rename "packages/xorg-lib/diet-x11/fix-disable-xlocale.diff"
#     to "packages/xorg-lib/libx11/fix-disable-xlocale.diff"
# 
# rename "packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch"
#     to "packages/xorg-lib/libx11/fix-utf8-wrong-define.patch"
# 
# rename "packages/xorg-lib/diet-x11/xchar2b.patch"
#     to "packages/xorg-lib/libx11/xchar2b.patch"
# 
# rename "packages/xorg-lib/diet-x11/xim.patch"
#     to "packages/xorg-lib/libx11/xim.patch"
# 
# rename "packages/xorg-lib/files/ruutf8.patch"
#     to "packages/xorg-lib/libx11/ruutf8.patch"
# 
# patch "packages/xorg-lib/diet-x11_1.1.1.bb"
#  from [54e6aee1f75e962c08a6e50ff72f283effa50e97]
#    to [e1a7c7618aa6c12e6f57bc70c8741fe59f234313]
# 
# patch "packages/xorg-lib/diet-x11_1.1.2.bb"
#  from [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
#    to [2486dd5dcd1de860deda3dffcd0759e0b071b8dd]
# 
# patch "packages/xorg-lib/diet-x11_1.1.3.bb"
#  from [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
#    to [2486dd5dcd1de860deda3dffcd0759e0b071b8dd]
# 
============================================================
--- packages/xorg-lib/diet-x11_1.1.1.bb	54e6aee1f75e962c08a6e50ff72f283effa50e97
+++ packages/xorg-lib/diet-x11_1.1.1.bb	e1a7c7618aa6c12e6f57bc70c8741fe59f234313
@@ -1,9 +1,11 @@ CFLAGS += "-D_GNU_SOURCE"
 SECTION = "x11/base"
 require libx11_${PV}.bb
 
 EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
 SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
 	    file://fix-disable-xlocale.diff;patch=1 \
             file://fix-utf8-wrong-define.patch;patch=1 \
============================================================
--- packages/xorg-lib/diet-x11_1.1.2.bb	0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e
+++ packages/xorg-lib/diet-x11_1.1.2.bb	2486dd5dcd1de860deda3dffcd0759e0b071b8dd
@@ -1,8 +1,10 @@ SRC_URI += "file://X18NCMSstubs.diff;pat
 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"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
 EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
============================================================
--- packages/xorg-lib/diet-x11_1.1.3.bb	0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e
+++ packages/xorg-lib/diet-x11_1.1.3.bb	2486dd5dcd1de860deda3dffcd0759e0b071b8dd
@@ -1,8 +1,10 @@ SRC_URI += "file://X18NCMSstubs.diff;pat
 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"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
 EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"