recipes-tizen/app-core/files/remove-dlog-for-native-build.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index fd053b7..2403d3d 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -26,17 +26,14 @@ SET(APPCORE_COMMON "appcore-common")
   6  SET(SRCS_common src/appcore.c src/appcore-i18n.c src/appcore-measure.c src/appcore-rotation.c)
   7
   8  IF (with_wayland)
   9 -       ADD_DEFINITIONS("-DWAYLAND")
  10  ENDIF (with_wayland)
  11  IF (with_x11)
  12 -       ADD_DEFINITIONS("-DX11")
  13 -       SET(SRCS_common ${SRCS_common} src/appcore-X.c)
  14  ENDIF (with_wayland)
  15
  16  SET(HEADERS_common appcore-common.h)
  17
  18  INCLUDE(FindPkgConfig)
  19 -SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul dlog libtzplatform-config ecore")
  20 +SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul libtzplatform-config ecore")
  21  IF (with_x11)
  22         SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 ecore-x")
  23  ENDIF (with_x11)
  24 @@ -75,7 +72,7 @@ SET(SRCS_efl src/appcore-efl.c)
  25  SET(HEADERS_efl appcore-efl.h)
  26
  27  INCLUDE(FindPkgConfig)
  28 -SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul")
  29 +SET(APPCORE_PKG_CHECK_MODULES2 "elementary  ecore gobject-2.0 glib-2.0 aul")
  30  IF (with_x11)
  31          SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x")
  32  ENDIF (with_x11)
  33 diff --git a/include/appcore-internal.h b/include/appcore-internal.h
  34 index 038e2dc..8d8bcab 100755
  35 --- a/include/appcore-internal.h
  36 +++ b/include/appcore-internal.h
  37 @@ -27,7 +27,7 @@
  38  #define LOG_TAG "APP_CORE"
  39
  40  #include <stdio.h>
  41 -#include <dlog.h>
  42 +
  43  #include "appcore-common.h"
  44
  45
  46 diff --git a/src/appcore-efl.c b/src/appcore-efl.c
  47 index 9ef5f96..9b61ee0 100644
  48 --- a/src/appcore-efl.c
  49 +++ b/src/appcore-efl.c
  50 @@ -369,13 +369,13 @@ static void __do_app(enum app_event event, void *data, bundle * b)
  51         switch (event) {
  52         case AE_RESET:
  53                 _DBG("[APP %d] RESET", _pid);
  54 -               LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:start]",
  55 -                   ui->name);
  56 +               //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:start]",
  57 +               //    ui->name);
  58                 if (ui->ops->reset)
  59                         r = ui->ops->reset(b, ui->ops->data);
  60                 ui->state = AS_RUNNING;
  61 -               LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:done]",
  62 -                   ui->name);
  63 +               //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:done]",
  64 +               //    ui->name);
  65                 break;
  66         case AE_PAUSE:
  67                 if (ui->state == AS_RUNNING) {
  68 @@ -392,8 +392,8 @@ static void __do_app(enum app_event event, void *data, bundle * b)
  69                 _inform_backgrd();
  70                 break;
  71         case AE_RESUME:
  72 -               LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:start]",
  73 -                   ui->name);
  74 +               //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:start]",
  75 +               //    ui->name);
  76                 if (ui->state == AS_PAUSED || tmp_val == 1) {
  77                         _DBG("[APP %d] RESUME", _pid);
  78                         if (ui->ops->resume)
  79 @@ -403,10 +403,10 @@ static void __do_app(enum app_event event, void *data, bundle * b)
  80                 }
  81                 /*TODO : rotation start*/
  82                 //r = appcore_resume_rotation_cb();
  83 -               LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:done]",
  84 -                   ui->name);
  85 -               LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:Launching:done]",
  86 -                   ui->name);
  87 +               //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:done]",
  88 +               //    ui->name);
  89 +               //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:Launching:done]",
  90 +               //    ui->name);
  91                 _inform_foregrd();
  92
  93                 break;
  94 @@ -609,131 +609,17 @@ Ecore_X_Atom atom_parent;
  95
  96  static Eina_Bool __show_cb(void *data, int type, void *event)
  97  {
  98 -#ifdef WAYLAND
  99 -       Ecore_Wl_Event_Window_Activate *ev;
 100 -
 101 -       ev = event;
 102 -
 103 -       if (ev->parent_win != 0)
 104 -       {
 105 -               // This is child window. Skip!!!
 106 -               return ECORE_CALLBACK_PASS_ON;
 107 -       }
 108 -
 109 -       _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win);
 110 -
 111 -       if (!__exist_win((unsigned int)ev->win))
 112 -               __add_win((unsigned int)ev->win);
 113 -       else
 114 -               __update_win((unsigned int)ev->win, FALSE);
 115 -
 116 -    __visibility_cb(data, type, event);
 117 -#else
 118 -       Ecore_X_Event_Window_Show *ev;
 119 -       int ret;
 120 -       Ecore_X_Window parent;
 121 -
 122 -       ev = event;
 123 -
 124 -       ret = ecore_x_window_prop_window_get(ev->win, atom_parent, &parent, 1);
 125 -       if (ret != 1)
 126 -       {
 127 -               // This is child window. Skip!!!
 128 -               return ECORE_CALLBACK_PASS_ON;
 129 -       }
 130 -
 131 -       _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win);
 132 -
 133 -       if (!__exist_win((unsigned int)ev->win)) {
 134 -               /* WM_ROTATE */
 135 -               if ((priv.wm_rot_supported) && (1 == priv.rot_started)) {
 136 -                       __set_wm_rotation_support(ev->win, 1);
 137 -               }
 138 -               __add_win((unsigned int)ev->win);
 139 -       }
 140 -       else
 141 -               __update_win((unsigned int)ev->win, FALSE);
 142 -#endif
 143 -
 144         return ECORE_CALLBACK_RENEW;
 145  }
 146
 147  static Eina_Bool __hide_cb(void *data, int type, void *event)
 148  {
 149 -#ifdef WAYLAND
 150 -       Ecore_Wl_Event_Window_Deactivate *ev;
 151 -       int bvisibility = 0;
 152 -
 153 -       ev = event;
 154 -
 155 -       _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win);
 156 -
 157 -       if (__exist_win((unsigned int)ev->win)) {
 158 -               __delete_win((unsigned int)ev->win);
 159 -
 160 -               bvisibility = __check_visible();
 161 -               if (!bvisibility && b_active == 1) {
 162 -                       _DBG(" Go to Pasue state \n");
 163 -                       b_active = 0;
 164 -                       __do_app(AE_PAUSE, data, NULL);
 165 -               }
 166 -       }
 167 -#else
 168 -       Ecore_X_Event_Window_Hide *ev;
 169 -       int bvisibility = 0;
 170 -
 171 -       ev = event;
 172 -
 173 -       _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win);
 174 -
 175 -       if (__exist_win((unsigned int)ev->win)) {
 176 -               __delete_win((unsigned int)ev->win);
 177 -
 178 -               bvisibility = __check_visible();
 179 -               if (!bvisibility && b_active == 1) {
 180 -                       _DBG(" Go to Pasue state \n");
 181 -                       b_active = 0;
 182 -                       __do_app(AE_PAUSE, data, NULL);
 183 -               }
 184 -       }
 185 -#endif
 186 -
 187         return ECORE_CALLBACK_RENEW;
 188  }
 189
 190  static Eina_Bool __visibility_cb(void *data, int type, void *event)
 191  {
 192 -#ifdef WAYLAND
 193 -       Ecore_Wl_Event_Window_Activate *ev;
 194 -       int bvisibility = 0;
 195 -
 196 -       ev = event;
 197 -
 198 -       __update_win((unsigned int)ev->win, ev->fobscured);
 199 -#else
 200 -       Ecore_X_Event_Window_Visibility_Change *ev;
 201 -       int bvisibility = 0;
 202 -
 203 -       ev = event;
 204 -
 205 -       __update_win((unsigned int)ev->win, ev->fully_obscured);
 206 -#endif
 207 -       bvisibility = __check_visible();
 208 -
 209 -       if (bvisibility && b_active == 0) {
 210 -               _DBG(" Go to Resume state\n");
 211 -               b_active = 1;
 212 -               __do_app(AE_RESUME, data, NULL);
 213 -
 214 -       } else if (!bvisibility && b_active == 1) {
 215 -               _DBG(" Go to Pasue state \n");
 216 -               b_active = 0;
 217 -               __do_app(AE_PAUSE, data, NULL);
 218 -       } else
 219 -               _DBG(" No change state \n");
 220 -
 221         return ECORE_CALLBACK_RENEW;
 222 -
 223  }
 224
 225  #ifdef X11
 226 @@ -776,35 +662,7 @@ static Eina_Bool __cmsg_cb(void *data, int type, void *event)
 227  static void __add_climsg_cb(struct ui_priv *ui)
 228  {
 229         _ret_if(ui == NULL);
 230 -#ifdef WAYLAND
 231 -       ui->hshow =
 232 -           ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ACTIVATE, __show_cb, ui);
 233 -       ui->hhide =
 234 -           ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui);
 235 -#else
 236 -       atom_parent = ecore_x_atom_get("_E_PARENT_BORDER_WINDOW");
 237 -       if (!atom_parent)
 238 -       {
 239 -               // Do Error Handling
 240 -       }
 241 -
 242 -       ui->hshow =
 243 -           ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui);
 244 -       ui->hhide =
 245 -           ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, __hide_cb, ui);
 246 -       ui->hvchange =
 247 -           ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE,
 248 -                                   __visibility_cb, ui);
 249
 250 -       /* Add client message callback for WM_ROTATE */
 251 -       if(!__check_wm_rotation_support())
 252 -       {
 253 -               ui->hcmsg =
 254 -                       ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __cmsg_cb, ui);
 255 -               ui->wm_rot_supported = 1;
 256 -               appcore_set_wm_rotation(&wm_rotate);
 257 -       }
 258 -#endif
 259  }
 260
 261  static int __before_loop(struct ui_priv *ui, int *argc, char ***argv)
 262 @@ -848,7 +706,7 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv)
 263         r = appcore_init(ui->name, &efl_ops, *argc, *argv);
 264         _retv_if(r == -1, -1);
 265
 266 -       LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:appcore_init:done]", ui->name);
 267 +       //LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:appcore_init:done]", ui->name);
 268         if (ui->ops && ui->ops->create) {
 269                 r = ui->ops->create(ui->ops->data);
 270                 if (r == -1) {
 271 @@ -857,8 +715,8 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv)
 272                         errno = ECANCELED;
 273                         return -1;
 274                 }
 275 -               LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:create:done]",
 276 -                   ui->name);
 277 +               //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:create:done]",
 278 +               //    ui->name);
 279         }
 280         ui->state = AS_CREATED;
 281
 282 @@ -1014,7 +872,7 @@ EXPORT_API int appcore_efl_main(const char *name, int *argc, char ***argv,
 283  {
 284         int r;
 285
 286 -       LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:main:done]", name);
 287 +       //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:main:done]", name);
 288
 289         r = __set_data(&priv, name, ops);
 290         _retv_if(r == -1, -1);
 291 diff --git a/appcore-common-wayland.pc.in b/appcore-common-wayland.pc.in
 292 index 1b9e47d..82df9b0 100644
 293 --- a/appcore-common-wayland.pc.in
 294 +++ b/appcore-common-wayland.pc.in
 295 @@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@
 296  Name: app-core-common
 297  Description: SAMSUNG Linux platform application library
 298  Version: @VERSION@
 299 -Requires: sensor vconf aul dlog
 300 +Requires: sensor vconf aul
 301  Libs: -L${libdir} -lappcore-common
 302  Cflags: -I${includedir} -I${includedir}/appcore
 303 diff --git a/appcore-common-x.pc.in b/appcore-common-x.pc.in
 304 index f9b1519..b51804b 100644
 305 --- a/appcore-common-x.pc.in
 306 +++ b/appcore-common-x.pc.in
 307 @@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@
 308  Name: app-core-common
 309  Description: SAMSUNG Linux platform application library
 310  Version: @VERSION@
 311 -Requires: sensor vconf aul dlog x11
 312 +Requires: sensor vconf aul x11
 313  Libs: -L${libdir} -lappcore-common
 314  Cflags: -I${includedir} -I${includedir}/appcore
 315 diff --git a/appcore-efl.pc.in b/appcore-efl.pc.in
 316 index 741428e..d6c2526 100644
 317 --- a/appcore-efl.pc.in
 318 +++ b/appcore-efl.pc.in
 319 @@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@
 320  Name: app-core-efl
 321  Description: SAMSUNG Linux platform efl application library
 322  Version: @VERSION@
 323 -Requires: elementary appcore-common dlog
 324 +Requires: elementary appcore-common
 325  Libs: -L${libdir} -lappcore-efl
 326  Cflags: -I${includedir} -I${includedir}/appcore