diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-28 15:03:51 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-20 09:57:41 +0200 |
commit | f11e9d2a3bffcd4b8e5db47b683eafed62176989 (patch) | |
tree | a929b2ba44762deb167a6a59941db47972129cc0 /meta-efl | |
parent | a87b248abc48f79b01265f98795c30741722c730 (diff) | |
download | meta-openembedded-contrib-f11e9d2a3bffcd4b8e5db47b683eafed62176989.tar.gz |
edbus: drop patch applied upstream r74447
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r-- | meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch | 51 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/edbus_svn.bb | 1 |
2 files changed, 0 insertions, 52 deletions
diff --git a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch b/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch deleted file mode 100644 index db1b15ddeb..0000000000 --- a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 133d67d43fc21674f525da9ecd530f2b73fbdeea Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 26 Jul 2012 10:35:35 +0200 -Subject: [PATCH] edbus: configure.ac fixup performance_test - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d798484..d0fc4ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,6 +69,7 @@ want_ehal="yes" - want_enotify="yes" - want_eofono="yes" - want_eukit="yes" -+want_performance_test="yes" - - case "$host_os" in - mingw*) -@@ -78,6 +79,7 @@ case "$host_os" in - want_enotify="no" - want_eofono="no" - want_eukit="no" -+ want_performance_test="no" - ;; - esac - -@@ -127,7 +129,7 @@ AC_ARG_ENABLE([eukit], - AC_ARG_ENABLE([performance_test], - [AC_HELP_STRING([--disable-performance_test], [Disable performance build])], - [enable_performance_test=$enableval], -- [enable_performance_test="${want_eukit}"]) -+ [enable_performance_test="${want_performance_test}"]) - - - ### Checks for programs -@@ -277,7 +279,7 @@ fi - - if test "x${have_edbus_performance_test}" = "xyes" ; then - PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], -- [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62 ecore-evas >= 1.2.0 elementary], -+ [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99], - [have_edbus_performance_test="yes"], - [have_edbus_performance_test="no"]) - fi --- -1.7.8.6 - diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index c22fcaf9bf..d40deb2634 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -8,6 +8,5 @@ DEFAULT_PREFERENCE = "-1" EXTRA_OECONF += "--disable-performance_test" SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ - file://0001-edbus-configure.ac-fixup-performance_test.patch \ " S = "${WORKDIR}/${SRCNAME}" |