Revert series of patches from cedric (due to dependencies and conflicts)
Revert "elementary: currently double declare elm_init/shutdown." This reverts commit44bb0c1848. Revert "elementary: fix efl_ui_multibutton installed headers." This reverts commit32a213dc72. Revert "elementary: introduce Efl_Ui.h." This reverts commitdf3d3f7334. Revert "ecore: do not display error message on cancel." This reverts commit99654b7cd2. Revert "efl: and don't forget to install the new dependencies." This reverts commit814ffb9b6b. Revert "ecore: remove EFL_OBJECT_BETA as Efl_Core.h is for Efl new inerfaces." This reverts commit619d0f3cff. Revert "ecore: move EAPI_MAIN from elementary to ecore." This reverts commite5d84da864. as such commite5d84da864starts the breaking. enlightenment, terminologya and other apps can't compile against that efl anymore.619d0f3cffthen makes this even worse with even more header errors and undefined types. on top of thisdf3d3f7334then starts making elementary_test segfault when it runs. it wont even start up. asu such of these 7 commits in the first 4 (that are then relied on later) 3 of these first 4 cause serious breakage. this simply is a complete lack of testing changes, so i've rolled fl back to before these things so it builds and works again and you can build against it. PLEASE test these things. this looks ot me to be obviously a lack of any testing... :(
This commit is contained in:
parent
44bb0c1848
commit
2cea85db38
|
|
@ -136,9 +136,7 @@ pc/emile.pc \
|
|||
pc/eet.pc \
|
||||
pc/evas.pc \
|
||||
pc/ecore.pc \
|
||||
pc/efl-core.pc \
|
||||
pc/ecore-con.pc \
|
||||
pc/efl-net.pc \
|
||||
pc/ecore-ipc.pc \
|
||||
pc/ecore-file.pc \
|
||||
pc/ecore-input.pc \
|
||||
|
|
@ -159,8 +157,7 @@ pc/emotion.pc \
|
|||
pc/ethumb.pc \
|
||||
pc/ethumb_client.pc \
|
||||
pc/elocation.pc \
|
||||
pc/elementary.pc \
|
||||
pc/efl-ui.pc
|
||||
pc/elementary.pc
|
||||
|
||||
if HAVE_CXX11
|
||||
pkgconfig_DATA += \
|
||||
|
|
|
|||
|
|
@ -5606,7 +5606,6 @@ pc/efl-cxx.pc
|
|||
pc/efl-wl.pc
|
||||
pc/efl-core.pc
|
||||
pc/efl-net.pc
|
||||
pc/efl-ui.pc
|
||||
pc/evas-fb.pc
|
||||
pc/evas-eglfs.pc
|
||||
pc/evas-opengl-x11.pc
|
||||
|
|
|
|||
|
|
@ -76,4 +76,3 @@
|
|||
/efl-wl.pc
|
||||
/efl-core.pc
|
||||
/efl-net.pc
|
||||
/efl-ui.pc
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
datarootdir=@datarootdir@
|
||||
datadir=@datadir@/elementary
|
||||
pkgdatadir=@datadir@/elementary
|
||||
vmaj=@VMAJ@
|
||||
vmin=@VMIN@
|
||||
vmic=@VMIC@
|
||||
themes=${pkgdatadir}/themes
|
||||
eoincludedir=@datadir@/eolian/include
|
||||
eolian_flags=-I${pc_sysrootdir}${eoincludedir}/elementary-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/emap-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/elocation-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/efreet-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/edje-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eio-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eldbus-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/ecore-con-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/ecore-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/efl-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eo-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eet-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/emile-@VMAJ@ -I${pc_sysrootdir}${eoincludedir}/eina-@VMAJ@
|
||||
|
||||
Name: efl_ui
|
||||
Description: EFL user interface abstraction library
|
||||
Requires.private: @requirements_pc_elementary@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lelementary -lefl -leina -lpthread -leet -levas -lecore -lecore_evas -lecore_file -lecore_input -ledje -leo -lethumb_client -lemotion -lecore_imf -lecore_con -leldbus -lefreet -lefreet_mime -lefreet_trash -leio @requirements_public_libs_elementary@ @requirements_public_libs_eina@ @requirements_libs_eina@ @requirements_libs_elm@
|
||||
Cflags: -I${includedir}/elementary-@VMAJ@ -I${includedir}/emap-@VMAJ@ -I${includedir}/elocation-@VMAJ@ -I${includedir}/efreet-@VMAJ@ -I${includedir}/edje-@VMAJ@ -I${includedir}/eio-@VMAJ@ -I${includedir}/eldbus-@VMAJ@ -I${includedir}/ecore-@VMAJ@ -I${includedir}/efl-@VMAJ@ -I${includedir}/eo-@VMAJ@ -I${includedir}/eet-@VMAJ@ -I${includedir}/emile-@VMAJ@ -I${includedir}/eina-@VMAJ@
|
||||
|
|
@ -324,9 +324,7 @@ includesunstable_HEADERS = \
|
|||
lib/elementary/elm_code_indent.h \
|
||||
lib/elementary/elm_code_file.h \
|
||||
lib/elementary/elm_code_parse.h \
|
||||
lib/elementary/elm_code_syntax.h \
|
||||
lib/elementary/efl_ui_multibuttonentry.h \
|
||||
lib/elementary/Efl_Ui.h
|
||||
lib/elementary/elm_code_syntax.h
|
||||
includesunstabledir = $(includedir)/elementary-@VMAJ@
|
||||
|
||||
nodist_includesunstable_HEADERS = \
|
||||
|
|
|
|||
|
|
@ -64,7 +64,9 @@ extern "C" {
|
|||
extern EAPI double _efl_startup_time;
|
||||
|
||||
#include "Ecore_Common.h"
|
||||
#include "Ecore_Eo.h"
|
||||
#ifdef EFL_OBJECT_BETA
|
||||
# include "Ecore_Eo.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,23 +13,6 @@
|
|||
#undef __EFL_NET
|
||||
#undef EFL_MAIN
|
||||
#undef EFL_MAIN_EX
|
||||
#undef EAPI_MAIN
|
||||
|
||||
#ifdef _WIN32
|
||||
// There is no support for quicklaunch on windows, so no needs
|
||||
// to export the efl_main symbol
|
||||
# define EAPI_MAIN
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI_MAIN __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI_MAIN
|
||||
# endif
|
||||
# else
|
||||
# define EAPI_MAIN
|
||||
# endif
|
||||
#endif /* ! _WIN32 */
|
||||
|
||||
#ifdef EFL_VERSION_MICRO
|
||||
# define _EFL_VERSION_MICRO EFL_VERSION_MICRO
|
||||
|
|
|
|||
|
|
@ -1,253 +0,0 @@
|
|||
#ifndef _EFL_CORE_H
|
||||
#define _EFL_CORE_H
|
||||
|
||||
#include <Efl_Config.h>
|
||||
#include <Elementary_Options.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
||||
/* Standard headers for standard system calls etc. */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/param.h>
|
||||
#include <math.h>
|
||||
#include <fnmatch.h>
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
#include <time.h>
|
||||
#ifdef ELM_DIRENT_H
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
#include <pwd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef ELM_UNIX
|
||||
#include <locale.h>
|
||||
#ifdef ELM_LIBINTL_H
|
||||
#include <libintl.h>
|
||||
#endif
|
||||
#include <signal.h>
|
||||
#include <grp.h>
|
||||
#include <glob.h>
|
||||
#endif
|
||||
|
||||
#ifdef ELM_ALLOCA_H
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
|
||||
#ifdef ELM_WIN32
|
||||
#include <malloc.h>
|
||||
#ifndef alloca
|
||||
#define alloca _alloca
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <Eina.h>
|
||||
#include <Eo.h>
|
||||
#include <Efl.h>
|
||||
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_ECORE_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif /* ! DLL_EXPORT */
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif /* ! EFL_ECORE_BUILD */
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif /* ! _WIN32 */
|
||||
|
||||
#ifdef _WIN32
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# include <winsock2.h>
|
||||
# undef WIN32_LEAN_AND_MEAN
|
||||
#elif defined (__FreeBSD__) || defined (__OpenBSD__)
|
||||
# include <sys/select.h>
|
||||
# include <signal.h>
|
||||
#elif defined (__ANDROID__)
|
||||
# include <sys/select.h>
|
||||
#elif defined (__sun)
|
||||
# include <sys/siginfo.h>
|
||||
#else
|
||||
# include <sys/time.h>
|
||||
# if !defined (EXOTIC_NO_SIGNAL)
|
||||
# include <signal.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#define __EFL_UI_IS_REQUIRED
|
||||
|
||||
#include <Efl_Net.h>
|
||||
|
||||
#include <Evas.h>
|
||||
#include <Evas_GL.h>
|
||||
#include <Eio.h>
|
||||
#include <Edje.h>
|
||||
#include <Eldbus.h>
|
||||
#include <Efreet.h>
|
||||
#include <Efreet_Mime.h>
|
||||
#include <Efreet_Trash.h>
|
||||
#include <Ethumb_Client.h>
|
||||
|
||||
#ifdef ELM_ELOCATION
|
||||
#include <Elocation.h>
|
||||
#endif
|
||||
|
||||
#ifdef ELM_EMAP
|
||||
#include <EMap.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern EAPI double _efl_startup_time;
|
||||
|
||||
// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
|
||||
#include "efl_ui.eot.h"
|
||||
|
||||
# include <efl_ui_focus_object.eo.h>
|
||||
# include <efl_ui_focus_manager.eo.h>
|
||||
# include <efl_ui_focus_manager_calc.eo.h>
|
||||
# include <efl_ui_focus_manager_sub.eo.h>
|
||||
# include <efl_ui_focus_manager_root_focus.eo.h>
|
||||
# include <efl_ui_focus_user.eo.h>
|
||||
# include <efl_ui_textpath.eo.h>
|
||||
# include <efl_ui_translatable.eo.h>
|
||||
# include <efl_ui_focus_composition.eo.h>
|
||||
# include <efl_ui_focus_layer.eo.h>
|
||||
# include <efl_access.h>
|
||||
# include <efl_access_text.h>
|
||||
# include <efl_access_window.h>
|
||||
|
||||
# include <efl_access_action.eo.h>
|
||||
# include <efl_access_component.eo.h>
|
||||
# include <efl_access_editable_text.eo.h>
|
||||
# include <efl_access_image.eo.h>
|
||||
# include <efl_access_selection.eo.h>
|
||||
# include <efl_access_value.eo.h>
|
||||
|
||||
# include <efl_config_global.eo.h>
|
||||
# include <efl_ui_widget_part.eo.h>
|
||||
# include <efl_ui_layout_part.eo.h>
|
||||
# include <efl_ui_layout_part_box.eo.h>
|
||||
# include <efl_ui_layout_part_content.eo.h>
|
||||
# include <efl_ui_layout_part_text.eo.h>
|
||||
# include <efl_ui_layout_part_table.eo.h>
|
||||
# include <efl_ui_win_part.eo.h>
|
||||
# include <efl_ui_box.eo.h>
|
||||
# include <efl_ui_box_flow.eo.h>
|
||||
# include <efl_ui_box_stack.eo.h>
|
||||
# include <efl_ui_grid.eo.h>
|
||||
# include <efl_ui_grid_static.eo.h>
|
||||
# include <efl_ui_image.eo.h>
|
||||
# include <efl_ui_win.eo.h>
|
||||
# include <efl_ui_win_inlined.eo.h>
|
||||
# include <efl_ui_win_socket.eo.h>
|
||||
# include <efl_ui_text_interactive.eo.h>
|
||||
# include <efl_ui_text.eo.h>
|
||||
# include <efl_ui_text_editable.eo.h>
|
||||
# include <efl_ui_text_async.eo.h>
|
||||
# include <efl_ui_clock.h>
|
||||
# include <efl_ui_image_factory.eo.h>
|
||||
# include <efl_ui_video.h>
|
||||
# include <efl_ui_nstate.h>
|
||||
# include <efl_ui_calendar.h>
|
||||
# include <efl_ui_button_eo.h>
|
||||
# include <efl_ui_multibuttonentry.h>
|
||||
# include <efl_ui_slider_eo.h>
|
||||
# include <efl_ui_flip_eo.h>
|
||||
# include <efl_ui_frame_eo.h>
|
||||
# include <efl_ui_check_eo.h>
|
||||
# include <efl_ui_image_zoomable_eo.h>
|
||||
# include <efl_ui_progressbar_eo.h>
|
||||
# include <efl_ui_radio_eo.h>
|
||||
# include <efl_ui_bg_eo.h>
|
||||
# include <efl_ui_panes_eo.h>
|
||||
|
||||
/**
|
||||
* Initialize Elementary
|
||||
*
|
||||
* @param[in] argc System's argument count value
|
||||
* @param[in] argv System's pointer to array of argument strings
|
||||
* @return The init counter value.
|
||||
*
|
||||
* This function initializes Elementary and increments a counter of
|
||||
* the number of calls to it. It returns the new counter's value.
|
||||
*
|
||||
* @warning This call is exported only for use by the @c ELM_MAIN()
|
||||
* macro. There is no need to use this if you use this macro (which
|
||||
* is highly advisable). An elm_main() should contain the entry
|
||||
* point code for your application, having the same prototype as
|
||||
* elm_init(), and @b not being static (putting the @c EAPI_MAIN symbol
|
||||
* in front of its type declaration is advisable). The @c
|
||||
* ELM_MAIN() call should be placed just after it.
|
||||
*
|
||||
* Example:
|
||||
* @dontinclude bg_example_01.c
|
||||
* @skip static void
|
||||
* @until ELM_MAIN
|
||||
*
|
||||
* See the full @ref bg_example_01_c "example".
|
||||
*
|
||||
* @see elm_shutdown().
|
||||
* @ingroup Elm_General
|
||||
*/
|
||||
EAPI int elm_init(int argc, char **argv);
|
||||
|
||||
/**
|
||||
* Shut down Elementary
|
||||
*
|
||||
* @return The init counter value.
|
||||
*
|
||||
* This should be called at the end of your application, just
|
||||
* before it ceases to do any more processing. This will clean up
|
||||
* any permanent resources your application may have allocated via
|
||||
* Elementary that would otherwise persist.
|
||||
*
|
||||
* @see elm_init() for an example
|
||||
*
|
||||
* @note elm_shutdown() will iterate main loop until all ecore_evas are freed.
|
||||
* There is a possibility to call your ecore callbacks(timer, animator, event,
|
||||
* job, and etc.) in elm_shutdown()
|
||||
*
|
||||
* @ingroup Elm_General
|
||||
*/
|
||||
EAPI int elm_shutdown(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
||||
// We are including efl_general.h again, just in case Efl_Core.h was already included before this
|
||||
// and the __EFL_*_IS_REQUIRED changed since then.
|
||||
#include <efl_general.h>
|
||||
|
|
@ -85,6 +85,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# define EAPI_MAIN
|
||||
# ifdef ELEMENTARY_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
|
|
@ -98,11 +99,14 @@
|
|||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# define EAPI_MAIN __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_MAIN
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_MAIN
|
||||
# endif
|
||||
#endif /* ! _WIN32 */
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
* @{
|
||||
*/
|
||||
|
||||
#include "efl_ui_multibuttonentry_common.h"
|
||||
#ifdef EFL_EO_API_SUPPORT
|
||||
#include "efl_ui_multibuttonentry_eo.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -96,7 +96,9 @@ extern EAPI double _elm_startup_time;
|
|||
#define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; }
|
||||
#endif
|
||||
|
||||
#include "Efl_Ui.h"
|
||||
#define __EFL_UI_IS_REQUIRED
|
||||
|
||||
#include "Efl_Core.h"
|
||||
|
||||
/**************************************************************************/
|
||||
/* General calls */
|
||||
|
|
|
|||
|
|
@ -149,8 +149,7 @@ _on_low_battery_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
|
|||
_eldbus_pending = eina_list_remove(_eldbus_pending, pending);
|
||||
if (eldbus_message_error_get(msg, &errname, &errmsg))
|
||||
{
|
||||
if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
|
||||
ERR("Message error %s - %s", errname, errmsg);
|
||||
ERR("Message error %s - %s", errname, errmsg);
|
||||
return;
|
||||
}
|
||||
if (!eldbus_message_arguments_get(msg, "v", &variant))
|
||||
|
|
@ -198,8 +197,7 @@ _on_battery_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
|
|||
_eldbus_pending = eina_list_remove(_eldbus_pending, pending);
|
||||
if (eldbus_message_error_get(msg, &errname, &errmsg))
|
||||
{
|
||||
if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
|
||||
ERR("Message error %s - %s", errname, errmsg);
|
||||
ERR("Message error %s - %s", errname, errmsg);
|
||||
return;
|
||||
}
|
||||
if (!eldbus_message_arguments_get(msg, "v", &variant))
|
||||
|
|
@ -287,8 +285,7 @@ _daemon_version_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
|
|||
_eldbus_pending = eina_list_remove(_eldbus_pending, pending);
|
||||
if (eldbus_message_error_get(msg, &errname, &errmsg))
|
||||
{
|
||||
if (strcmp(errname, "org.enlightenment.DBus.Canceled"))
|
||||
ERR("Message error %s - %s", errname, errmsg);
|
||||
ERR("Message error %s - %s", errname, errmsg);
|
||||
return;
|
||||
}
|
||||
if (!eldbus_message_arguments_get(msg, "v", &variant))
|
||||
|
|
|
|||
Loading…
Reference in New Issue