From 86395d99f9525a52dfd540cdef26e218fa20a0a0 Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Mon, 24 Apr 2017 15:29:16 +0900 Subject: [PATCH] disable all features except dbus support Change-Id: I2f98127d78234291a97fc2de2ce50ed42aa096fa --- configure.ac | 24 ++++++++++++------------ packaging/edbus.spec | 12 +++++++++--- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 45a0442..fddd154 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ esac requirement_ebluez="edbus >= 1.7.9" requirement_econnman0_7x="edbus >= 1.7.9" -requirement_edbus="ecore >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62" +requirement_edbus="ecore-core >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62" requirement_ehal="edbus >= 1.7.9" requirement_enotify="edbus >= 1.7.9" requirement_eofono="edbus >= 1.7.9" @@ -213,70 +213,70 @@ EFL_ENABLE_BIN([edbus-async-test], ["yes"]) if test "x${have_edbus_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_TEST], - [ecore >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 dbus-1 >= 0.62], [have_edbus_test="yes"], [have_edbus_test="no"]) fi if test "x${have_edbus_test_client}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_TEST_CLIENT], - [ecore >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 dbus-1 >= 0.62], [have_edbus_test_client="yes"], [have_edbus_test_client="no"]) fi if test "x${have_edbus_bluez_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_BLUEZ_TEST], - [ecore >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_bluez_test="yes"], [have_edbus_bluez_test="no"]) fi if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST], - [ecore >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_connman0_7x_test="yes"], [have_edbus_connman0_7x_test="no"]) fi if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_NOTIFICATION_DAEMON_TEST], - [ecore >= 1.7.9 evas >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 evas >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_notification_daemon_test="yes"], [have_edbus_notification_daemon_test="no"]) fi if test "x${have_edbus_notify_send}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND], - [ecore >= 1.7.9 evas >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 evas >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_notify_send="yes"], [have_edbus_notify_send="no"]) fi if test "x${have_edbus_notify_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_NOTIFY_TEST], - [ecore >= 1.7.9 ecore-evas >= 1.7.9 evas >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 ecore-evas >= 1.7.9 evas >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_notify_test="yes"], [have_edbus_notify_test="no"]) fi if test "x${have_edbus_ofono_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_OFONO_TEST], - [ecore >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_ofono_test="yes"], [have_edbus_ofono_test="no"]) fi if test "x${have_edbus_ukit_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_UKIT_TEST], - [ecore >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62], [have_edbus_ukit_test="yes"], [have_edbus_ukit_test="no"]) fi if test "x${have_edbus_performance_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], - [ecore >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62 ecore-evas >= 1.7.9 elementary >= 1.7.9 evas >= 1.7.9], + [ecore-core >= 1.7.9 eina >= 1.7.9 dbus-1 >= 0.62 ecore-evas >= 1.7.9 elementary >= 1.7.9 evas >= 1.7.9], [have_edbus_performance_test="yes"], [have_edbus_performance_test="no"]) fi @@ -285,7 +285,7 @@ AM_CONDITIONAL([BUILD_EDBUS_PERFORMANCE_TEST], [test "x${have_edbus_performance_ if test "x${have_edbus_async_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_ASYNC_TEST], - [ecore >= 1.7.9 dbus-1 >= 0.62], + [ecore-core >= 1.7.9 dbus-1 >= 0.62], [have_edbus_async_test="yes"], [have_edbus_async_test="no"]) fi diff --git a/packaging/edbus.spec b/packaging/edbus.spec index 87226ac..3c81b7f 100644 --- a/packaging/edbus.spec +++ b/packaging/edbus.spec @@ -9,9 +9,9 @@ Source0: e_dbus-%{version}.tar.bz2 Source1001: edbus.manifest BuildRequires: doxygen BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(ecore) +BuildRequires: pkgconfig(ecore-core) BuildRequires: pkgconfig(eina) -BuildRequires: pkgconfig(evas) +#BuildRequires: pkgconfig(evas) %description e_dbus provides a convenience wrapper for EFL applications using DBus. @@ -30,6 +30,12 @@ cp %{SOURCE1001} . %build %reconfigure --disable-static \ + --disable-ebluez \ + --disable-econnman0_7x \ + --disable-ehal \ + --disable-enotify \ + --disable-eofono \ + --disable-eukit \ --disable-edbus-test \ --disable-edbus-test-client \ --disable-edbus-bluez-test \ @@ -64,5 +70,5 @@ cp %{SOURCE1001} . %{_includedir}/e_dbus-1/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_includedir}/e_dbus-1/connman0_7x/E_Connman.h +#%{_includedir}/e_dbus-1/connman0_7x/E_Connman.h #%{_bindir}/e-notify-send -- 2.7.4