[oe-commits] Martin Jansa : shr/merge: drop unneeded patches

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 47ca1679f3895bc146439a67f95f0fe2e050b61a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=47ca1679f3895bc146439a67f95f0fe2e050b61a

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jan 16 02:00:05 2010 +0100

shr/merge: drop unneeded patches

---

 recipes/efl1/emotion_svn.bb                      |    6 +-----
 recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb |    3 ---
 recipes/libmikmod/libmikmod_3.2.0-beta2.bb       |    4 ----
 recipes/pingus/pingus_0.7.2.bb                   |    3 ---
 4 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb
index ce0d2c4..c5733be 100644
--- a/recipes/efl1/emotion_svn.bb
+++ b/recipes/efl1/emotion_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
 PV = "0.1.0.042+svnr${SRCPV}"
-PR = "r5"
+PR = "r4"
 
 inherit efl
 
@@ -12,7 +12,3 @@ EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDI
 PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
 RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
-
-do_compile_append() {
-	sed -i "s/${@"${PKG_CONFIG_SYSROOT_DIR}".replace('/','\/')}\/usr\/local\/lib/\$\{libdir\}/" ${S}/emotion.pc
-}
diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index d746177..fbb2d4c 100644
--- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -19,9 +19,6 @@ SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
 
 S = "${WORKDIR}/ipkg-utils"
 
-# Workaround QA issue
-TARGET_CC_ARCH += "${LDFLAGS}"
-
 INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields"
 
 do_compile() {
diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
index 4124d58..0b21ada 100644
--- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
+++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
@@ -26,10 +26,6 @@ EXTRA_OECONF = "\
   --enable-threads \
 "
 
-# Workaround QA issue
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-
 do_stage() {
 	oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
 	install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb
index 7ece33c..10f99ba 100644
--- a/recipes/pingus/pingus_0.7.2.bb
+++ b/recipes/pingus/pingus_0.7.2.bb
@@ -7,9 +7,6 @@ PR = "r2"
 
 ARM_INSTRUCTION_SET = "arm"
 
-# Workaround QA issue
-TARGET_CC_ARCH += "${LDFLAGS}"
-
 inherit scons
 
 SRC_URI = "\