From 0f11105b9d09a1b25c6792c2b2c17396de038718 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 9 Dec 2012 08:46:19 -0800 Subject: [PATCH] Imported Upstream version 1.7.3 --- AUTHORS | 1 + ChangeLog | 8 ++++++++ NEWS | 9 ++++++++- configure | 24 ++++++++++++------------ configure.ac | 2 +- edje.spec | 2 +- src/bin/edje_inspector.c | 8 +++++--- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/AUTHORS b/AUTHORS index 377e7f4..62ee3da 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,3 +29,4 @@ Kim Shinwoo Michael Bouchaud (yoz) WooHyun Jung (woohyun) Guilherme Silveira +Robert David diff --git a/ChangeLog b/ChangeLog index ee493a0..a6b39a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -611,3 +611,11 @@ 1.7.2 release +2012-12-05 Robert David + + * Fix Solaris 11 build. + +2012-12-07 Luis Felipe Strano Moraes + + * 1.7.3 release + diff --git a/NEWS b/NEWS index 21ced31..ce26384 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,10 @@ -Edje 1.7.2 +Edje 1.7.3 + +Changes since Edje 1.7.2: +------------------------- + +Fixes: + * fix compilation on Solaris 11 Changes since Edje 1.7.1: ------------------------- @@ -9,6 +15,7 @@ Fixes: * fix edje_text_class_set to update the text classes correctly. * fix to not update map uv for proxy * fix to not segv on inheriting group lookups + * fix build on Solaris 11 Edje 1.7.1 diff --git a/configure b/configure index 3e6f725..2f039c0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for edje 1.7.2. +# Generated by GNU Autoconf 2.68 for edje 1.7.3. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='edje' PACKAGE_TARNAME='edje' -PACKAGE_VERSION='1.7.2' -PACKAGE_STRING='edje 1.7.2' +PACKAGE_VERSION='1.7.3' +PACKAGE_STRING='edje 1.7.3' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1472,7 +1472,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures edje 1.7.2 to adapt to many kinds of systems. +\`configure' configures edje 1.7.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1542,7 +1542,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of edje 1.7.2:";; + short | recursive ) echo "Configuration of edje 1.7.3:";; esac cat <<\_ACEOF @@ -1745,7 +1745,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -edje configure 1.7.2 +edje configure 1.7.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2168,7 +2168,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by edje $as_me 1.7.2, which was +It was created by edje $as_me 1.7.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2992,7 +2992,7 @@ fi # Define the identity of the package. PACKAGE='edje' - VERSION='1.7.2' + VERSION='1.7.3' cat >>confdefs.h <<_ACEOF @@ -11963,7 +11963,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 2 +#define VMIC 3 _ACEOF @@ -11971,7 +11971,7 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="8:2:7" +version_info="8:3:7" release_info="" @@ -18453,7 +18453,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by edje $as_me 1.7.2, which was +This file was extended by edje $as_me 1.7.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18519,7 +18519,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -edje config.status 1.7.2 +edje config.status 1.7.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c31cd9a..7d254d7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [2]) +m4_define([v_mic], [3]) 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 diff --git a/edje.spec b/edje.spec index 96d2964..6d78480 100644 --- a/edje.spec +++ b/edje.spec @@ -4,7 +4,7 @@ Summary: Complex Graphical Design/Layout Engine Name: edje -Version: 1.7.2 +Version: 1.7.3 Release: %{_rel} License: BSD Group: System Environment/Libraries diff --git a/src/bin/edje_inspector.c b/src/bin/edje_inspector.c index 9106f95..01cf104 100644 --- a/src/bin/edje_inspector.c +++ b/src/bin/edje_inspector.c @@ -2,6 +2,11 @@ # include "config.h" #endif +#include +#include +#include +#include + #include "Edje.h" #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1 #include "Edje_Edit.h" @@ -9,9 +14,6 @@ #include #include #include -#include -#include -#include static int _log_dom; #define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__) -- 2.7.4