Upstrem merge

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	ChangeLog
	src/bin/edje_cc.c
	src/lib/edje_multisense.c

Change-Id: Ifbfee1960a076241711ffc4560d9b806f8cab53f

diff --cc .gitignore
Simple merge

diff --cc ChangeLog
index 31e57d9,8a29cbb..691025e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -416,3 -471,17 +471,18 @@@
  
          * Fix patch for edje draggable jump issue when external event
          area is used for the dragable.
+ 
+ 2012-06-04  Cedric Bail
+ 
+       * Add SPACER part to reduce the load on the canvas (lighter and faster theme).
+ 
+ 2012-06-04  Prince Kumar Dubey
+ 
+       * Fix decompile of sound samples to use sound source file, not name
+       * Fix decompile of sound samples not double-free
+         * Fix alsa configure option to be alsa, not flac.
+ 
+ 2012-06-06  Jihoon Kim
+ 
+       * edje_entry: display preedit string even though there is no attribute
++

diff --cc configure.ac
index 130d9f1,de135c3..169a665
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -406,36 -416,9 +416,36 @@@ if test "x${want_multisense}" = "xyes" 
        if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then
            AC_MSG_ERROR([alsa support requested, but not found by pkg-config.])
        fi
- fi    
+ fi
  AM_CONDITIONAL([HAVE_LIBALSA], [test "x${have_alsa_lib}" = "xyes"])
  
 +##pulse audio library
 +have_pa_lib="no"
 +want_pa_lib="auto"
 +AC_ARG_ENABLE([pulseaudio],
 +   [AC_HELP_STRING([--disable-pa], [disable pulse audio support. @<:@default=detect@:>@])],
 +   [want_pa_lib=$enableval], [])
 +
 +if test "x${want_multisense}" = "xyes" -a "x$want_pa_lib" != "xno"; then
 +   PKG_CHECK_MODULES([PA],
 +      [
 +       libpulse >= 0.9.21
 +       libpulse-simple >= 0.9.21
 +      ],
 +      [
 +       AC_DEFINE(HAVE_LIBPA, 1, [Pulse Audio support for Edje])
 +       have_pa_lib="yes"
 +       requirement_edje="libpulse >= 0.9.21 ${requirement_edje}"
 +      ],
 +      [have_pa_lib="no"]
 +   )
 +
 +      if test "x$want_pa_lib" = "xyes" -a "x$have_pa_lib" = "xno"; then
 +          AC_MSG_ERROR([pulse audio support requested, but not found by pkg-config.])
 +      fi
 +fi
 +AM_CONDITIONAL([HAVE_LIBPA], [test "x${have_pa_lib}" = "xyes"])
 +
  
  ##flac library
  have_flac_lib="no"

diff --cc packaging/edje.spec
index 3c01abe,0000000..5682235
mode 100644,000000..100644
--- 1/packaging/edje.spec
--- /dev/null
+++ b/packaging/edje.spec
@@@ -1,85 -1,0 +1,85 @@@
- Version:    1.2.0+svn.70401slp2+build02
- Release:    2
 +#sbs-git:slp/pkgs/e/edje edje 1.1.0+svn.69011slp2+build03 96cd9783918ce594c786d12a5107be27aec4d34b
 +Name:       edje
 +Summary:    Complex Graphical Design/Layout Engine
++Version:    1.2.0+svn.72379slp2+build01
++Release:    1
 +Group:      System/Libraries
 +License:    BSD
 +URL:        http://www.enlightenment.org/
 +Source0:    %{name}-%{version}.tar.gz
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +BuildRequires:  eina-devel
 +BuildRequires:  eet-devel
 +BuildRequires:  embryo-devel
 +BuildRequires:  evas-devel
 +BuildRequires:  ecore-devel
 +BuildRequires:  liblua-devel
 +
 +
 +%description
 +Various binaries for use with libedje
 +Edje is a graphical layout and animation library for animated resizable,
 + compressed and scalable themes. It is the theming engine behind
 + Enlightenment DR 0.17.
 + .
 + This package contains the following binaries:
 +  - edje_cc: Compiles EDC files.
 +  - edje_decc: Used to decompile compiled edje files.
 +  - edje_recc: A convenience script to recompile EDC files.
 +
 +%package devel
 +Summary:    Complex Graphical Design/Layout Engine (devel)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description devel
 +Edje is a graphical layout and animation library (devel)
 +
 +%package tools
 +Summary:    Complex Graphical Design/Layout Engine (tools)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Provides:   %{name}-bin
 +Obsoletes:  %{name}-bin
 +
 +%description tools
 +Edje is a graphical layout and animation library (tools)
 +
 +%prep
 +%setup -q
 +
 +%build
 +export CFLAGS+=" -fvisibility=hidden -ffast-math -fPIC"
 +export LDFLAGS+=" -fvisibility=hidden -Wl,--hash-style=both -Wl,--as-needed"
 +
 +%autogen --disable-static
 +%configure --disable-static
 +make %{?jobs:-j%jobs}
 +
 +%install
 +rm -rf %{buildroot}
 +%make_install
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%defattr(-,root,root,-)
 +%{_libdir}/libedje.so.*
 +%{_datadir}/mime/packages/edje.xml
 +%{_libdir}/edje/modules/multisense_factory/*/module.so
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_includedir}/edje-1/*.h
 +%{_libdir}/libedje.so
 +%{_libdir}/pkgconfig/edje.pc
 +%exclude /usr/share/edje/examples/*
 +
 +%files tools
 +%defattr(-,root,root,-)
 +%{_bindir}/*
 +%{_libdir}/%{name}/utils/epp
 +%{_datadir}/%{name}/include/edje.inc

diff --cc src/bin/edje_cc_handlers.c
Simple merge

diff --cc src/lib/Edje.h
Simple merge

diff --cc src/lib/edje_calc.c
Simple merge

diff --cc src/lib/edje_entry.c
Simple merge

diff --cc src/lib/edje_main.c
Simple merge

diff --cc src/lib/edje_private.h
Simple merge

diff --cc src/lib/edje_program.c
Simple merge

diff --cc src/lib/edje_util.c
index 07678f4,8476912..cc936c8
--- 1/src/lib/edje_util.c
--- 2/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@@ -1129,20 -1237,11 +1237,22 @@@ edje_object_part_text_set(Evas_Object *
     if (!rp) return EINA_FALSE;
     if ((rp->part->type != EDJE_PART_TYPE_TEXT) &&
         (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return EINA_FALSE;
-    return _edje_object_part_text_raw_set(obj, rp, part, text);
+    r = _edje_object_part_text_raw_set(obj, rp, part, text);
+    _edje_user_define_string(ed, part, rp->text.text);
+    return r;
  }
  
 +/**
 + * @brief Return the text of the object part.
 + *
 + * @param obj A valid Evas_Object handle
 + * @param part The part name
 + *
 + * @return The text string
 + *
 + * This function returns the text associated to the object part.
 + *
 + */
  EAPI const char *
  edje_object_part_text_get(const Evas_Object *obj, const char *part)
  {

diff --cc src/modules/alsa_snd_player/Makefile.am
index 8ec47e3,0907007..dd12c27
--- 1/src/modules/alsa_snd_player/Makefile.am
--- 2/src/modules/alsa_snd_player/Makefile.am
+++ b/src/modules/alsa_snd_player/Makefile.am
@@@ -6,7 -6,10 +6,8 @@@ pkglibdir = $(REMIX_PLUGIN_DIR
  
  AM_CPPFLAGS = \
  -I. \
 --DPACKAGE_LIB_DIR=\"$(libdir)/remix\" \
 --DPACKAGE_DATA_DIR=\"$(datadir)/remix\" \
  @EDJE_CFLAGS@ \
+ @EIO_CFLAGS@ \
  @REMIX_CFLAGS@ \
  @ALSA_CFLAGS@
  

diff --cc src/modules/eet_snd_reader/Makefile.am
index f07a44a,1e8f17f..171b7cc
--- 1/src/modules/eet_snd_reader/Makefile.am
--- 2/src/modules/eet_snd_reader/Makefile.am
+++ b/src/modules/eet_snd_reader/Makefile.am
@@@ -4,7 -4,10 +4,8 @@@ pkglibdir = $(REMIX_PLUGIN_DIR
  
  AM_CPPFLAGS = \
  -I. \
 --DPACKAGE_LIB_DIR=\"$(libdir)/remix\" \
 --DPACKAGE_DATA_DIR=\"$(datadir)/remix\" \
  @EDJE_CFLAGS@ \
+ @EIO_CFLAGS@ \
  @REMIX_CFLAGS@
  
  pkgdir = $(REMIX_PLUGIN_DIR)

diff --cc src/modules/multisense_factory/Makefile.am
Simple merge