Hello community, here is the log from the commit of package edje for openSUSE:Factory checked in at 2013-01-10 10:49:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/edje (Old) and /work/SRC/openSUSE:Factory/.edje.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "edje", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/edje/edje.changes 2012-12-10 17:15:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.edje.new/edje.changes 2013-01-10 10:49:09.000000000 +0100 @@ -1,0 +2,36 @@ +Fri Jan 4 21:46:21 UTC 2013 - [email protected] + +- update to 1.7.5 + no visible changes, just keeping version in sync + +------------------------------------------------------------------- +Mon Dec 31 11:20:27 UTC 2012 - [email protected] + +- require embryo + +------------------------------------------------------------------- +Wed Dec 26 22:33:14 UTC 2012 - [email protected] + +- edje depends on edje-utils, keep them installed both +- eio is needed dependency for edje_watch, add it +- package examples to its own subpackage +- move edje.inc from edje-devel to edje + +------------------------------------------------------------------- +Fri Dec 21 16:09:08 UTC 2012 - [email protected] + +- update to 1.7.4 + Changes since Edje 1.7.3: + * Lua 5.2 support added, still works fine with 5.1. + * Before cursor is moved by mouse_down, imf_context_reset + should be called with current cursor position. + * Backport from 78587 in trunk. + * Fix inheriting groups with programs that have after + programs where after programs are duplicated in the list. + +------------------------------------------------------------------- +Thu Dec 20 11:10:48 UTC 2012 - [email protected] + +- build and package documentation + +------------------------------------------------------------------- Old: ---- edje-1.7.3.tar.bz2 New: ---- edje-1.7.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ edje.spec ++++++ --- /var/tmp/diff_new_pack.IVcfMx/_old 2013-01-10 10:49:11.000000000 +0100 +++ /var/tmp/diff_new_pack.IVcfMx/_new 2013-01-10 10:49:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package edje # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,35 @@ Name: edje -Version: 1.7.3 +Version: 1.7.5 Release: 0 Summary: Abstract GUI layout and animation object library License: BSD-2-Clause and GPL-2.0 Group: Development/Libraries/C and C++ Url: http://www.enlightenment.org Source: %{name}-%{version}.tar.bz2 -BuildRequires: libtool -BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1210 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel < 5.2 -%endif +BuildRequires: doxygen BuildRequires: ecore-devel >= %{version} BuildRequires: eet-devel >= %{version} BuildRequires: eina-devel >= %{version} +BuildRequires: eio-devel >= %{version} BuildRequires: embryo-devel >= %{version} BuildRequires: evas-devel >= %{version} +%if 0%{?suse_version} +BuildRequires: fdupes +%endif BuildRequires: fontconfig-devel BuildRequires: freetype2-devel +%if 0%{?suse_version} > 1210 +BuildRequires: lua51-devel +%else +BuildRequires: lua-devel < 5.2 +%endif +BuildRequires: pkgconfig BuildRequires: python >= 2.5 +Requires: edje-utils = %version +Requires: embryo %description Abstract GUI layout and animation object library. Part of Enlightenment Foundation Libraries. @@ -80,15 +86,52 @@ %description utils Edje utils script to convert import from gimp and inkscape. Part of edje library. +%package doc-html +Summary: HTML documentation of Edje +Group: Documentation/HTML + +%description doc-html +Documentation of Edje library in form of HTML pages. + +%package doc-man +Summary: Man documentation of Edje +Group: Documentation/Man + +%description doc-man +Documentation of Edje library in form of man pages. + +%package examples +Summary: Examples of Edje usage +Group: Documentation/Man + +%description examples +Examples of usage of Edje library. + %prep %setup -q %build -%configure --disable-static --disable-silent-rules +%configure --disable-static --disable-silent-rules --enable-install-examples --enable-edje-watch make %{?_smp_mflags} +make doc %install make install DESTDIR="%buildroot" + +# copy documentation manually +echo "Copying HTML documentation" +mkdir -p %{buildroot}%{_docdir}/%{name} +/bin/cp -vr doc/html %{buildroot}%{_docdir}/%{name} +echo "Copying MAN pages" +/bin/cp -vr doc/man/ %{buildroot}%{_mandir}/ +# fix line endings +find %{buildroot}%{_docdir} -name '*.eps' | xargs sed -i 's@\r@\n@g' +# remove duplicates +%if 0%{?suse_version} +%fdupes -s %{buildroot}%{_docdir} +%fdupes -s %{buildroot}%{_mandir} +%endif + find %{buildroot}%{_libdir} -name '*.la' -exec rm -v {} \; %post -n libedje1 -p /sbin/ldconfig @@ -100,6 +143,8 @@ %{_bindir}/edje_* %{_datadir}/mime/packages/edje.xml %dir %{_libdir}/edje +%dir %{_datadir}/edje +%{_datadir}/edje/include %files -n libedje1 %defattr(-, root, root) @@ -110,11 +155,22 @@ %{_includedir}/edje-1/ %{_libdir}/pkgconfig/edje.pc %{_libdir}/libedje.so -%{_datadir}/edje/ %files utils %defattr(-,root,root) %{_bindir}/inkscape2edc %{_libdir}/edje/utils +%files doc-html +%defattr(-, root, root) +%{_docdir}/%{name} + +%files doc-man +%defattr(-, root, root) +%{_mandir}/*/* + +%files examples +%defattr(-, root, root) +%{_datadir}/%{name}/examples + %changelog ++++++ edje-1.7.3.tar.bz2 -> edje-1.7.5.tar.bz2 ++++++ ++++ 1670 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/AUTHORS new/edje-1.7.5/AUTHORS --- old/edje-1.7.3/AUTHORS 2012-12-07 12:50:53.000000000 +0100 +++ new/edje-1.7.5/AUTHORS 2012-12-19 15:40:47.000000000 +0100 @@ -30,3 +30,4 @@ WooHyun Jung (woohyun) <[email protected]> Guilherme Silveira <[email protected]> Robert David <[email protected]> +Bluezery <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/ChangeLog new/edje-1.7.5/ChangeLog --- old/edje-1.7.3/ChangeLog 2012-12-07 15:57:03.000000000 +0100 +++ new/edje-1.7.5/ChangeLog 2013-01-04 13:10:06.000000000 +0100 @@ -619,3 +619,39 @@ * 1.7.3 release +2012-12-05 Tae-Hwan Kim (Bluezery) + + * Fix inheriting groups with programs that have after programs where + after programs are duplicated in the list. + +2012-12-13 Doug Newgard + + * Enforce compilation with Lua 5.1 only. + +2012-12-17 Vincent Torri + + * Add XML output to doc + * Add installation rule for doc + +2012-12-18 WooHyun Jung + + * Before cursor is moved by mouse_down, imf_context_reset should be called with current cursor position. + +2012-12-20 David Seikel (onefang) + + * Lua: Backport from 76883 in trunk, and revert 80791 - Lua 5.2 support added. + +2012-12-20 Tom Hacohen (TAsn) + + * Backport from 78587 in trunk. + Edje entry: Fix update of cursor with IMF and user_insert. + Was missing, now cursor updates like it should. + +2012-12-21 Luis Felipe Strano Moraes + + * 1.7.4 release + +2013-01-04 Luis Felipe Strano Moraes + + * 1.7.5 release + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/Makefile.am new/edje-1.7.5/Makefile.am --- old/edje-1.7.3/Makefile.am 2012-12-07 12:50:53.000000000 +0100 +++ new/edje-1.7.5/Makefile.am 2012-12-19 15:40:47.000000000 +0100 @@ -46,7 +46,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = edje.pc -.PHONY: doc coverage +.PHONY: doc install-doc coverage # Documentation @@ -54,6 +54,10 @@ @echo "entering doc/" make -C doc doc +install-doc: + @echo "entering doc/" + make -C doc install-doc + # Unit tests if EFL_ENABLE_TESTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/NEWS new/edje-1.7.5/NEWS --- old/edje-1.7.3/NEWS 2012-12-07 15:56:33.000000000 +0100 +++ new/edje-1.7.5/NEWS 2013-01-04 13:09:38.000000000 +0100 @@ -1,3 +1,19 @@ +Edje 1.7.5 + +Changes since Edje 1.7.4: +------------------------- + + * No visible changes, bumping to sync with new minor release. + +Changes since Edje 1.7.3: +------------------------- + +Fixes: + * Lua 5.2 support added, still works fine with 5.1. + * Before cursor is moved by mouse_down, imf_context_reset should be called with current cursor position. + * Backport from 78587 in trunk. + * Fix inheriting groups with programs that have after programs where after programs are duplicated in the list. + Edje 1.7.3 Changes since Edje 1.7.2: @@ -5,6 +21,7 @@ Fixes: * fix compilation on Solaris 11 + * fix duplicate after programs in group inheritance. Changes since Edje 1.7.1: ------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/README new/edje-1.7.5/README --- old/edje-1.7.3/README 2012-12-07 17:04:25.000000000 +0100 +++ new/edje-1.7.5/README 2013-01-04 15:21:52.000000000 +0100 @@ -1,4 +1,4 @@ -Edje 1.7.0 +Edje 1.7.4 ****************************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/configure.ac new/edje-1.7.5/configure.ac --- old/edje-1.7.3/configure.ac 2012-12-07 17:04:25.000000000 +0100 +++ new/edje-1.7.5/configure.ac 2013-01-04 15:07:28.000000000 +0100 @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [3]) +m4_define([v_mic], [5]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line @@ -221,7 +221,7 @@ EFL_EDJE_BUILD="" case "$host_os" in mingw*) - PKG_CHECK_MODULES([EVIL], [evil >= 1.6.99]) + PKG_CHECK_MODULES([EVIL], [evil >= 1.7.5]) AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil library is installed]) requirement_edje="evil ${requirement_edje}" EFL_EDJE_BUILD="-DEFL_EDJE_BUILD" @@ -259,47 +259,47 @@ PKG_CHECK_MODULES([MINIMAL], [ - eina >= 1.6.99 - eet >= 1.6.99 + eina >= 1.7.5 + eet >= 1.7.5 ]) PKG_CHECK_MODULES([EDJE], [ - eina >= 1.6.99 - eet >= 1.6.99 - evas >= 1.6.99 - ecore >= 1.6.99 - ecore-evas >= 1.6.99 - ecore-file >= 1.6.99 - ecore-input >= 1.6.99 - embryo >= 1.6.99 + eina >= 1.7.5 + eet >= 1.7.5 + evas >= 1.7.5 + ecore >= 1.7.5 + ecore-evas >= 1.7.5 + ecore-file >= 1.7.5 + ecore-input >= 1.7.5 + embryo >= 1.7.5 ]) EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" -requirement_edje="embryo >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 ${requirement_edje}" +requirement_edje="embryo >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5 ${requirement_edje}" requirement_edje="${requirement_lua} ${requirement_edje}" have_ecore_imf="no" PKG_CHECK_MODULES([ECORE_IMF], [ - ecore-imf >= 1.6.99 - ecore-imf-evas >= 1.6.99 + ecore-imf >= 1.7.5 + ecore-imf-evas >= 1.7.5 ], [ AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) have_ecore_imf="yes" - requirement_edje="ecore-imf-evas >= 1.6.99 ecore-imf >= 1.6.99 ${requirement_edje}" + requirement_edje="ecore-imf-evas >= 1.7.5 ecore-imf >= 1.7.5 ${requirement_edje}" ], [have_ecore_imf="no"]) PKG_CHECK_MODULES([EIO], - [eio >= 1.6.99], + [eio >= 1.7.5], [ AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously]) have_eio="yes" - requirement_edje="eio >= 1.6.99 ${requirement_edje}" + requirement_edje="eio >= 1.7.5 ${requirement_edje}" ], [have_eio="no"]) @@ -458,7 +458,7 @@ if test "x${have_edje_cc}" = "xyes" ; then PKG_CHECK_MODULES([EDJE_CC], - [ecore-file >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.0 eina >= 1.6.99]) + [ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.6.0 eina >= 1.7.5]) EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" fi @@ -466,27 +466,27 @@ if test "x${have_edje_decc}" = "xyes" ; then PKG_CHECK_MODULES([EDJE_DECC], - [ecore-file >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99]) + [ecore-file >= 1.7.5 ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eet >= 1.7.5 eina >= 1.7.5]) fi if test "x${have_edje_player}" = "xyes" ; then PKG_CHECK_MODULES([EDJE_PLAYER], - [ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99]) + [ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5]) fi if test "x${have_edje_inspector}" = "xyes" ; then PKG_CHECK_MODULES([EDJE_INSPECTOR], - [ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99]) + [ecore-evas >= 1.7.5 ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5]) fi if test "x${have_edje_external_inspector}" = "xyes" ; then PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], - [ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99]) + [ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5]) fi if test "x${have_edje_watch}" = "xyes" ; then PKG_CHECK_MODULES([EDJE_WATCH], - [ecore >= 1.6.99 eina >= 1.6.99 eio >= 1.6.99], + [ecore >= 1.7.5 eina >= 1.7.5 eio >= 1.7.5], [have_edje_watch="yes"], [have_edje_watch="no"]) fi @@ -624,6 +624,9 @@ echo " EDJE_CALC_CACHE......: $want_edje_calc_cache" echo " Fixed point..........: $want_fixed_point" echo " Documentation........: ${build_doc}" +if test "x${build_doc}" = "xyes" ; then +echo " Installation.......: make install-doc" +fi echo " Tests................: ${enable_tests}" echo " Coverage.............: ${enable_coverage}" echo " Examples.............: install:${install_examples} build:${build_examples}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/doc/Doxyfile new/edje-1.7.5/doc/Doxyfile --- old/edje-1.7.3/doc/Doxyfile 2012-12-07 17:04:31.000000000 +0100 +++ new/edje-1.7.5/doc/Doxyfile 2013-01-04 15:21:59.000000000 +0100 @@ -1152,7 +1152,7 @@ # generate an XML file that captures the structure of # the code including all documentation. -GENERATE_XML = NO +GENERATE_XML = YES # The XML_OUTPUT tag is used to specify where the XML pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/doc/Doxyfile.in new/edje-1.7.5/doc/Doxyfile.in --- old/edje-1.7.3/doc/Doxyfile.in 2012-12-07 12:50:52.000000000 +0100 +++ new/edje-1.7.5/doc/Doxyfile.in 2012-12-19 15:40:35.000000000 +0100 @@ -1152,7 +1152,7 @@ # generate an XML file that captures the structure of # the code including all documentation. -GENERATE_XML = NO +GENERATE_XML = YES # The XML_OUTPUT tag is used to specify where the XML pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/doc/Makefile.am new/edje-1.7.5/doc/Makefile.am --- old/edje-1.7.3/doc/Makefile.am 2012-12-07 12:50:52.000000000 +0100 +++ new/edje-1.7.5/doc/Makefile.am 2012-12-19 15:40:35.000000000 +0100 @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -.PHONY: doc +.PHONY: doc install-doc PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc @@ -10,13 +10,15 @@ doc-clean: rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* -doc: all doc-clean +doc-build: all $(efl_doxygen) - cp $(srcdir)/img/* html/ - cp $(srcdir)/img/* latex/ + cp img/* html/ + cp img/* latex/ + +doc: doc-build rm -rf $(PACKAGE_DOCNAME).tar* mkdir -p $(PACKAGE_DOCNAME)/doc - cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc + cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ bzip2 -9 $(PACKAGE_DOCNAME).tar rm -rf $(PACKAGE_DOCNAME)/ @@ -24,11 +26,20 @@ clean-local: doc-clean +install-doc: doc-build + install -d $(docdir) + cp -R html latex man xml $(docdir) + +uninstall-local: + rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml + else doc: @echo "Documentation not built. Run ./configure --help" +install-doc: doc + endif EXTRA_DIST = Doxyfile e.css foot.html head.html $(wildcard img/*.*) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/edje.pc.in new/edje-1.7.5/edje.pc.in --- old/edje-1.7.3/edje.pc.in 2012-12-07 12:50:53.000000000 +0100 +++ new/edje-1.7.5/edje.pc.in 2012-12-19 15:40:47.000000000 +0100 @@ -1,3 +1,4 @@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ @@ -7,6 +8,7 @@ datadir=@datadir@/edje vmaj=@VMAJ@ multisense=@want_multisense@ +docdir=@docdir@ Name: edje Description: Enlightened graphical design and layout engine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/edje.spec new/edje-1.7.5/edje.spec --- old/edje-1.7.3/edje.spec 2012-12-07 17:04:31.000000000 +0100 +++ new/edje-1.7.5/edje.spec 2013-01-04 15:21:59.000000000 +0100 @@ -4,7 +4,7 @@ Summary: Complex Graphical Design/Layout Engine Name: edje -Version: 1.7.3 +Version: 1.7.5 Release: %{_rel} License: BSD Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/src/bin/edje_cc_handlers.c new/edje-1.7.5/src/bin/edje_cc_handlers.c --- old/edje-1.7.3/src/bin/edje_cc_handlers.c 2012-12-07 12:50:44.000000000 +0100 +++ new/edje-1.7.5/src/bin/edje_cc_handlers.c 2012-12-19 15:40:46.000000000 +0100 @@ -1089,9 +1089,11 @@ EINA_LIST_FOREACH(ep2->after, l, pa2) { - pa = mem_alloc(SZ(Edje_Program_After)); + name = (char*) (pa2 + 1); + pa = mem_alloc(SZ(Edje_Program_After) + strlen(name) + 1); ep->after = eina_list_append(ep->after, pa); - + copy = (char*) (pa + 1); + memcpy(copy, name, strlen(name) + 1); data_queue_copied_program_lookup(pc, &(pa2->id), &(pa->id)); } @@ -7934,14 +7936,27 @@ ep = current_program; { Edje_Program_After *pa; + Edje_Program_After *pa2; + Eina_List *l; char *name; + char *copy; name = parse_str(0); - pa = mem_alloc(SZ(Edje_Program_After)); + EINA_LIST_FOREACH(ep->after, l, pa2) + { + if (!strcmp(name, (char*) (pa2 + 1))) + { + free(name); + return; + } + } + + pa = mem_alloc(SZ(Edje_Program_After) + strlen(name) + 1); pa->id = -1; ep->after = eina_list_append(ep->after, pa); - + copy = (char*)(pa + 1); + memcpy(copy, name, strlen(name) + 1); data_queue_program_lookup(pc, name, &(pa->id)); free(name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/src/bin/edje_cc_out.c new/edje-1.7.5/src/bin/edje_cc_out.c --- old/edje-1.7.3/src/bin/edje_cc_out.c 2012-12-07 12:50:44.000000000 +0100 +++ new/edje-1.7.5/src/bin/edje_cc_out.c 2013-01-04 11:46:04.000000000 +0100 @@ -1643,7 +1643,9 @@ if (ep2->reorder.linked_prev) ERR("Unable to insert two or more parts in same part \"%s\".", pc->parts[j]->name); - k = j - 1; + /* Need it to be able to insert an element before the first */ + if (j == 0) k = 0; + else k = j - 1; found = EINA_TRUE; ep2->reorder.linked_prev += ep->reorder.linked_prev + 1; ep->reorder.before = (Edje_Part_Parser *)pc->parts[j]; @@ -1692,10 +1694,10 @@ } if (i > k) { - for (j = i - ep->reorder.linked_prev - 1 ; j >= k ; j--) + for (j = i - ep->reorder.linked_prev ; j > k; j--) { - pc->parts[j + amount] = pc->parts[j]; - pc->parts[j + amount]->id = j + amount; + pc->parts[j + amount - 1] = pc->parts[j - 1]; + pc->parts[j + amount - 1]->id = j + amount - 1; } for (j = 0 ; j < amount ; j++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/src/examples/lua_script.edc new/edje-1.7.5/src/examples/lua_script.edc --- old/edje-1.7.3/src/examples/lua_script.edc 2012-12-07 12:50:35.000000000 +0100 +++ new/edje-1.7.5/src/examples/lua_script.edc 2013-01-04 11:46:04.000000000 +0100 @@ -67,7 +67,7 @@ d = edje.size(); D.clip:geom(10, 10, d.w - 20, d.h - 20); c = D.clip:clipees(); - for i=1,table.getn(c),1 do + for i=1,#c,1 do d = c[i]:geom(); print("lua::" .. i .. " geom = " .. d.x .. "," .. d.y .. " " .. d.w .. "x" .. d.h); end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/src/lib/Edje.h new/edje-1.7.5/src/lib/Edje.h --- old/edje-1.7.3/src/lib/Edje.h 2012-12-07 12:50:40.000000000 +0100 +++ new/edje-1.7.5/src/lib/Edje.h 2013-01-04 12:24:52.000000000 +0100 @@ -4,8 +4,8 @@ These routines are used for Edje. @mainpage Edje Library Documentation -@version 1.7 -@date 2003-2012 +@version 1.7.5 +@date 2003-2013 Please see the @ref authors page for contact details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/src/lib/edje_entry.c new/edje-1.7.5/src/lib/edje_entry.c --- old/edje-1.7.3/src/lib/edje_entry.c 2012-12-07 12:50:40.000000000 +0100 +++ new/edje-1.7.5/src/lib/edje_entry.c 2013-01-04 11:46:04.000000000 +0100 @@ -1738,7 +1738,7 @@ Evas_Textblock_Cursor *tc = NULL; Eina_Bool dosel = EINA_FALSE; Eina_Bool shift; - if (!rp) return; + if ((!rp) || (!ev)) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; en = rp->entry_data; if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || @@ -1758,6 +1758,8 @@ } #endif + _edje_entry_imf_context_reset(rp); + shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); en->select_mod_start = EINA_FALSE; en->select_mod_end = EINA_FALSE; @@ -1966,7 +1968,7 @@ Entry *en; Evas_Coord x, y, w, h; Evas_Textblock_Cursor *tc; - if (ev->button != 1) return; + if ((!ev) || (ev->button != 1)) return; if (!rp) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK) return; @@ -2075,7 +2077,7 @@ Entry *en; Evas_Coord x, y, w, h; Evas_Textblock_Cursor *tc; - if (!rp) return; + if (!rp || (!ev)) return; en = rp->entry_data; if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) @@ -2169,6 +2171,7 @@ _evas_focus_in_cb(void *data, Evas *e, __UNUSED__ void *event_info) { Edje *ed = (Edje *)data; + if (!ed) return; if (evas_focus_get(e) == ed->obj) { @@ -2180,6 +2183,7 @@ _evas_focus_out_cb(void *data, Evas *e, __UNUSED__ void *event_info) { Edje *ed = (Edje *)data; + if (!ed) return; if (evas_focus_get(e) == ed->obj) { @@ -2208,7 +2212,7 @@ void _edje_entry_shutdown(Edje *ed) { - if (!ed->has_entries) + if ((!ed) || (!ed->has_entries)) return; if (!ed->entries_inited) return; @@ -2721,6 +2725,9 @@ _edje_emit_full(rp->edje, "entry,changed,user", rp->part->name, info, _free_entry_change_info); _edje_emit(rp->edje, "cursor,changed", rp->part->name); + + _edje_entry_imf_cursor_info_set(en); + _edje_entry_real_part_configure(rp); } void @@ -3429,6 +3436,9 @@ info, _free_entry_change_info); _edje_emit(ed, "cursor,changed", rp->part->name); } + + _edje_entry_imf_cursor_info_set(en); + _edje_entry_real_part_configure(rp); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/edje-1.7.3/src/lib/edje_lua2.c new/edje-1.7.5/src/lib/edje_lua2.c --- old/edje-1.7.3/src/lib/edje_lua2.c 2012-12-07 12:50:40.000000000 +0100 +++ new/edje-1.7.5/src/lib/edje_lua2.c 2013-01-04 11:46:04.000000000 +0100 @@ -985,7 +985,11 @@ int i, n; const char *str; luaL_checktype(L, 3, LUA_TTABLE); // Stack usage [-0, +0, v] +#if LUA_VERSION_NUM >= 502 + n = lua_rawlen(L, 3); // Stack usage [-0, +0, -] +#else n = lua_objlen(L, 3); // Stack usage [-0, +0, -] +#endif emsg = alloca(sizeof(Edje_Message_String_Set) + ((n - 1) * sizeof(char *))); emsg->count = n; for (i = 1; i <= n; i ++) @@ -1003,7 +1007,11 @@ Edje_Message_Int_Set *emsg; int i, n; luaL_checktype(L, 3, LUA_TTABLE); // Stack usage [-0, +0, v] +#if LUA_VERSION_NUM >= 502 + n = lua_rawlen(L, 3); // Stack usage [-0, +0, -] +#else n = lua_objlen(L, 3); // Stack usage [-0, +0, -] +#endif emsg = alloca(sizeof(Edje_Message_Int_Set) + ((n - 1) * sizeof(int))); emsg->count = n; for (i = 1; i <= n; i ++) @@ -1020,7 +1028,11 @@ Edje_Message_Float_Set *emsg; int i, n; luaL_checktype(L, 3, LUA_TTABLE); // Stack usage [-0, +0, v] +#if LUA_VERSION_NUM >= 502 + n = lua_rawlen(L, 3); // Stack usage [-0, +0, -] +#else n = lua_objlen(L, 3); // Stack usage [-0, +0, -] +#endif emsg = alloca(sizeof(Edje_Message_Float_Set) + ((n - 1) * sizeof(double))); emsg->count = n; for (i = 1; i <= n; i ++) @@ -1057,7 +1069,11 @@ const char *str = luaL_checkstring(L, 3); // Stack usage [-0, +0, v] if (!str) return 0; luaL_checktype(L, 4, LUA_TTABLE); // Stack usage [-0, +0, v] +#if LUA_VERSION_NUM >= 502 + n = lua_rawlen(L, 4); // Stack usage [-0, +0, -] +#else n = lua_objlen(L, 4); // Stack usage [-0, +0, -] +#endif emsg = alloca(sizeof(Edje_Message_String_Int_Set) + ((n - 1) * sizeof(int))); emsg->str = (char *)str; emsg->count = n; @@ -1077,7 +1093,11 @@ const char *str = luaL_checkstring(L, 3); // Stack usage [-0, +0, v] if (!str) return 0; luaL_checktype(L, 4, LUA_TTABLE); // Stack usage [-0, +0, v] +#if LUA_VERSION_NUM >= 502 + n = lua_rawlen(L, 4); // Stack usage [-0, +0, -] +#else n = lua_objlen(L, 4); +#endif emsg = alloca(sizeof(Edje_Message_String_Float_Set) + ((n - 1) * sizeof(double))); emsg->str = (char *)str; emsg->count = n; @@ -3734,26 +3754,43 @@ { lua_pushnil(L); // Stack usage [-0, +1, -] luaL_newmetatable(L, "bogan"); // Stack usage [-0, +1, m] +#if LUA_VERSION_NUM >= 502 + luaL_setfuncs(L, _elua_bogan_funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, 0, _elua_bogan_funcs); // Stack usage [-1, +1, m] +#endif lua_setmetatable(L, -2); // Stack usage [-1, +0, -] lua_pop(L, 1); // Stack usage [-1, +0, -] } //--------------------------------------------------------------------------// +// TODO - All the register / setfuncs and rlelated stuff around here should be reviewed. Works fine for 5.1, probably works fine for 5.2, but maybe there's a better way? It may also need to change if we start using LuaJIT. + // Brain dead inheritance thingy, built for speed. Kinda. Part 1. static void _elua_add_functions(lua_State *L, const char *api, const luaL_Reg *funcs, const char *meta, const char *parent, const char *base) // Stack usage [-3, +5, m] if inheriting [-6, +11, em] { // Create an api table, fill it full of the methods. +#if LUA_VERSION_NUM >= 502 + lua_newtable(L); // Stack usage [-0, +1, e] + lua_pushvalue(L, -1); // Stack usage [-0, +1, -] + lua_setglobal(L, api); // Stack usage [-1, +0, e] + luaL_setfuncs(L, funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, api, funcs); // Stack usage [-0, +1, m] +#endif // Set the api metatable to the bogan metatable. luaL_getmetatable(L, "bogan"); // Stack usage [-0, +1, -] lua_setmetatable(L, -2); // Stack usage [-1, +0, -] // Creat a meta metatable. luaL_newmetatable(L, meta); // Stack usage [-0, +1, m] // Put the gc functions in the metatable. +#if LUA_VERSION_NUM >= 502 + luaL_setfuncs(L, _elua_edje_gc_funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] +#endif // Create an __index entry in the metatable, make it point to the api table. lua_pushliteral(L, "__index"); // Stack usage [-0, +1, m] lua_pushvalue(L, -3); // Stack usage [-0, +1, -] @@ -3821,14 +3858,29 @@ for (l = _elua_libs; l->func; l++) // Currently * 4 { +#if LUA_VERSION_NUM >= 502 + luaL_requiref(L, l->name, l->func, 1); // Stack usage [-0, +1, e] +#else lua_pushcfunction(L, l->func); // Stack usage [-0, +1, m] lua_pushstring(L, l->name); // Stack usage [-0, +1, m] lua_call(L, 1, 0); // Stack usage [-2, +0, e] +#endif } +#if LUA_VERSION_NUM >= 502 + lua_newtable(L); // Stack usage [-0, +1, e] + lua_pushvalue(L, -1); // Stack usage [-0, +1, -] + lua_setglobal(L, _elua_edje_api); // Stack usage [-1, +0, e] + luaL_setfuncs(L, _elua_edje_funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] +#endif luaL_newmetatable(L, _elua_edje_meta); // Stack usage [-0, +1, m] +#if LUA_VERSION_NUM >= 502 + luaL_setfuncs(L, _elua_edje_gc_funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] +#endif _elua_add_functions(L, _elua_evas_api, _elua_evas_funcs, _elua_evas_meta, NULL, NULL); // Stack usage [-3, +5, m] @@ -3873,18 +3925,33 @@ for (l = _elua_libs; l->func; l++) // Currently * 4 { +#if LUA_VERSION_NUM >= 502 + luaL_requiref(L, l->name, l->func, 1); // Stack usage [-0, +1, e] +#else lua_pushcfunction(L, l->func); // Stack usage [-0, +1, m] lua_pushstring(L, l->name); // Stack usage [-0, +1, m] lua_call(L, 1, 0); // Stack usage [-2, +0, m] +#endif } _elua_bogan_protect(L); // Stack usage [+3, -3, m] +#if LUA_VERSION_NUM >= 502 + lua_newtable(L); // Stack usage [-0, +1, e] + lua_pushvalue(L, -1); // Stack usage [-0, +1, -] + lua_setglobal(L, _elua_edje_api); // Stack usage [-1, +0, e] + luaL_setfuncs(L, _elua_edje_funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] +#endif luaL_getmetatable(L, "bogan"); // Stack usage [-0, +1, -] lua_setmetatable(L, -2); // Stack usage [-1, +0, -] luaL_newmetatable(L, _elua_edje_meta); // Stack usage [-0, +1, m] +#if LUA_VERSION_NUM >= 502 + luaL_setfuncs(L, _elua_edje_gc_funcs, 0); // Stack usage [-0, +0, e] +#else luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] +#endif lua_pop(L, 2); // Stack usage [-n, +0, -] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
