[Pkg-e-commits] [SCM] Enlightenment DR17 support for freedesktop.org specs branch, new-svn-snapshot, updated. debian/0.5.0.050+svn20081114-1-374-gcefd7e7
Albin Tonnerre
albin.tonnerre at gmail.com
Sat Jun 20 15:12:59 UTC 2009
The following commit has been merged in the new-svn-snapshot branch:
commit e1053b19dfe81ad8fe71e8f7c5964a85997aeee4
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Thu Jun 18 10:02:03 2009 +0200
Import upstream release 0.5.0.061
diff --git a/configure b/configure
index 4fc3459..5c85b9b 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.61 for efreet 0.5.0.060.
+# Generated by GNU Autoconf 2.61 for efreet 0.5.0.061.
#
# Report bugs to <enlightenment-devel at lists.sourceforge.net>.
#
@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='efreet'
PACKAGE_TARNAME='efreet'
-PACKAGE_VERSION='0.5.0.060'
-PACKAGE_STRING='efreet 0.5.0.060'
+PACKAGE_VERSION='0.5.0.061'
+PACKAGE_STRING='efreet 0.5.0.061'
PACKAGE_BUGREPORT='enlightenment-devel at lists.sourceforge.net'
ac_unique_file="configure.ac"
@@ -1413,7 +1413,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 efreet 0.5.0.060 to adapt to many kinds of systems.
+\`configure' configures efreet 0.5.0.061 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1483,7 +1483,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of efreet 0.5.0.060:";;
+ short | recursive ) echo "Configuration of efreet 0.5.0.061:";;
esac
cat <<\_ACEOF
@@ -1593,7 +1593,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-efreet configure 0.5.0.060
+efreet configure 0.5.0.061
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1607,7 +1607,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 efreet $as_me 0.5.0.060, which was
+It was created by efreet $as_me 0.5.0.061, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2384,7 +2384,7 @@ fi
# Define the identity of the package.
PACKAGE='efreet'
- VERSION='0.5.0.060'
+ VERSION='0.5.0.061'
cat >>confdefs.h <<_ACEOF
@@ -13009,7 +13009,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
-release="ver-pre-01"
+release="ver-svn-02"
efreet_release_info="-release $release"
efreet_mime_release_info="-release $release"
efreet_trash_release_info="-release $release"
@@ -14070,10 +14070,14 @@ if test "${enable_doc+set}" = set; then
else
efl_enable_doc="yes"
-
fi
+{ echo "$as_me:$LINENO: checking whether to build documentation" >&5
+echo $ECHO_N "checking whether to build documentation... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: ${efl_enable_doc}" >&5
+echo "${ECHO_T}${efl_enable_doc}" >&6; }
+
if test "x${efl_enable_doc}" = "xyes" ; then
@@ -14124,11 +14128,11 @@ fi
if test "x${efl_have_doxygen}" = "xno" ; then
echo "WARNING:"
echo "The doxygen program you specified:"
- echo "$efl_doxygen"
+ echo "${efl_doxygen}"
echo "was not found. Please check the path and make sure "
echo "the program exists and is executable."
- { echo "$as_me:$LINENO: WARNING: Warning: no doxygen detected. Documentation will not be built" >&5
-echo "$as_me: WARNING: Warning: no doxygen detected. Documentation will not be built" >&2;}
+ { echo "$as_me:$LINENO: WARNING: no doxygen detected. Documentation will not be built" >&5
+echo "$as_me: WARNING: no doxygen detected. Documentation will not be built" >&2;}
fi
else
@@ -14172,18 +14176,17 @@ fi
if test "x${efl_have_doxygen}" = "xno" ; then
echo "WARNING:"
- echo "The doxygen program was not found in your execute"
+ echo "The doxygen program was not found in your execute path."
echo "You may have doxygen installed somewhere not covered by your path."
echo ""
echo "If this is the case make sure you have the packages installed, AND"
echo "that the doxygen program is in your execute path (see your"
echo "shell manual page on setting the \$PATH environment variable), OR"
echo "alternatively, specify the program to use with --with-doxygen."
- { echo "$as_me:$LINENO: WARNING: Warning: no doxygen detected. Documentation will not be built" >&5
-echo "$as_me: WARNING: Warning: no doxygen detected. Documentation will not be built" >&2;}
+ { echo "$as_me:$LINENO: WARNING: no doxygen detected. Documentation will not be built" >&5
+echo "$as_me: WARNING: no doxygen detected. Documentation will not be built" >&2;}
fi
-
fi
fi
@@ -14654,7 +14657,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by efreet $as_me 0.5.0.060, which was
+This file was extended by efreet $as_me 0.5.0.061, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14707,7 +14710,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-efreet config.status 0.5.0.060
+efreet config.status 0.5.0.061
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index e15c4d7..d658453 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
rm -f config.cache
-AC_INIT([efreet], 0.5.0.060, [enlightenment-devel at lists.sourceforge.net])
+AC_INIT([efreet], [0.5.0.061], [enlightenment-devel at lists.sourceforge.net])
AC_PREREQ([2.52])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
@@ -27,7 +27,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
-release="ver-pre-01"
+release="ver-svn-02"
efreet_release_info="-release $release"
efreet_mime_release_info="-release $release"
efreet_trash_release_info="-release $release"
diff --git a/efreet.spec b/efreet.spec
index 8228c57..04be783 100644
--- a/efreet.spec
+++ b/efreet.spec
@@ -2,7 +2,7 @@
Summary: FreeDesktop.Org Compatibility Library
Name: efreet
-Version: 0.5.0.060
+Version: 0.5.0.061
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4
index 0c1452f..dd6bc3e 100644
--- a/m4/efl_doxygen.m4
+++ b/m4/efl_doxygen.m4
@@ -25,13 +25,15 @@ AC_ARG_ENABLE([doc],
efl_enable_doc="no"
fi
],
- [efl_enable_doc="yes"]
-)
+ [efl_enable_doc="yes"])
+
+AC_MSG_CHECKING([whether to build documentation])
+AC_MSG_RESULT([${efl_enable_doc}])
if test "x${efl_enable_doc}" = "xyes" ; then
dnl
-dnl Specify the full file name, with path
+dnl Specify the file name, without path
dnl
efl_doxygen="doxygen"
@@ -51,10 +53,10 @@ dnl
if test "x${efl_have_doxygen}" = "xno" ; then
echo "WARNING:"
echo "The doxygen program you specified:"
- echo "$efl_doxygen"
+ echo "${efl_doxygen}"
echo "was not found. Please check the path and make sure "
echo "the program exists and is executable."
- AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
+ AC_MSG_WARN([no doxygen detected. Documentation will not be built])
fi
],
[AC_CHECK_PROG([efl_have_doxygen],
@@ -63,17 +65,16 @@ dnl
[no])
if test "x${efl_have_doxygen}" = "xno" ; then
echo "WARNING:"
- echo "The doxygen program was not found in your execute"
+ echo "The doxygen program was not found in your execute path."
echo "You may have doxygen installed somewhere not covered by your path."
echo ""
echo "If this is the case make sure you have the packages installed, AND"
echo "that the doxygen program is in your execute path (see your"
echo "shell manual page on setting the \$PATH environment variable), OR"
echo "alternatively, specify the program to use with --with-doxygen."
- AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
+ AC_MSG_WARN([no doxygen detected. Documentation will not be built])
fi
- ]
- )
+ ])
fi
dnl
@@ -88,9 +89,9 @@ fi
AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
if test "x${efl_enable_doc}" = "xyes" ; then
- ifelse([$1], , :, [$1])
+ m4_default([$1], [:])
else
- ifelse([$2], , :, [$2])
+ m4_default([$2], [:])
fi
])
diff --git a/src/bin/ef_cache.c b/src/bin/ef_cache.c
index 73fd0df..ebd718b 100644
--- a/src/bin/ef_cache.c
+++ b/src/bin/ef_cache.c
@@ -1,5 +1,6 @@
#include "Efreet.h"
#include <stdio.h>
+#include <Ecore.h>
#include "ef_test.h"
static int
diff --git a/src/bin/ef_icon_theme.c b/src/bin/ef_icon_theme.c
index 2efcb4f..398692c 100644
--- a/src/bin/ef_icon_theme.c
+++ b/src/bin/ef_icon_theme.c
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <Ecore.h>
#include <Ecore_File.h>
#ifndef PATH_MAX
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fd97876..bed27fd 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -31,6 +31,7 @@ $(EFREETHEADERS)
libefreet_la_SOURCES = \
$(EFREETSOURCES)
libefreet_la_CPPFLAGS = \
+-DDATADIR=\"$(datadir)\" \
-I$(top_builddir) \
-I$(top_srcdir) \
@EFL_EFREET_BUILD@ \
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 601c7aa..ba0fa97 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -265,6 +265,7 @@ libefreet_la_SOURCES = \
$(EFREETSOURCES)
libefreet_la_CPPFLAGS = \
+-DDATADIR=\"$(datadir)\" \
-I$(top_builddir) \
-I$(top_srcdir) \
@EFL_EFREET_BUILD@ \
diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index 9d2af85..ca0708f 100644
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -98,7 +98,7 @@ efreet_data_dirs_get(void)
{
if (xdg_data_dirs) return xdg_data_dirs;
xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS",
- "/usr/local/share:/usr/share");
+ DATADIR ":/usr/share");
return xdg_data_dirs;
}
diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index 9aa8fb4..72aaf1f 100644
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -14,6 +14,7 @@
# include <winsock2.h>
#endif
+#include <Ecore.h>
#include <Ecore_Str.h>
#include <Ecore_File.h>
@@ -428,7 +429,7 @@ efreet_desktop_save(Efreet_Desktop *desktop)
Efreet_Ini *ini;
int ok = 1;
- ini = efreet_ini_new(desktop->orig_path);
+ ini = efreet_ini_new(NULL);
efreet_ini_section_add(ini, "Desktop Entry");
efreet_ini_section_set(ini, "Desktop Entry");
@@ -1837,3 +1838,48 @@ efreet_desktop_command_path_absolute(const char *path)
/* just dup an already absolute buffer */
return strdup(path);
}
+
+EAPI Eina_Bool
+efreet_desktop_x_field_set(Efreet_Desktop *desktop, const char *key, const char *data)
+{
+ if (!desktop || strncmp(key, "X-", 2))
+ return EINA_FALSE;
+
+ if (!desktop->x)
+ desktop->x = eina_hash_string_superfast_new(EINA_FREE_CB(eina_stringshare_del));
+
+ eina_hash_del(desktop->x, key, NULL);
+ eina_hash_add(desktop->x, key, eina_stringshare_add(data));
+
+ return EINA_TRUE;
+}
+
+EAPI const char *
+efreet_desktop_x_field_get(Efreet_Desktop *desktop, const char *key)
+{
+ const char *ret;
+
+ if (!desktop || strncmp(key, "X-", 2))
+ return NULL;
+
+ if (!desktop->x)
+ return NULL;
+
+ ret = eina_hash_find(desktop->x, key);
+ if (!ret)
+ return NULL;
+
+ return eina_stringshare_add(ret);
+}
+
+EAPI Eina_Bool
+efreet_desktop_x_field_del(Efreet_Desktop *desktop, const char *key)
+{
+ if (!desktop || strncmp(key, "X-", 2))
+ return EINA_FALSE;
+
+ if (!desktop->x)
+ return EINA_FALSE;
+
+ return eina_hash_del(desktop->x, key, NULL);
+}
diff --git a/src/lib/efreet_desktop.h b/src/lib/efreet_desktop.h
index f301463..c3ca2b4 100644
--- a/src/lib/efreet_desktop.h
+++ b/src/lib/efreet_desktop.h
@@ -136,6 +136,10 @@ EAPI void *efreet_desktop_type_data_get(Efreet_Desktop *desktop);
EAPI Eina_List *efreet_desktop_string_list_parse(const char *string);
EAPI char *efreet_desktop_string_list_join(Eina_List *list);
+EAPI Eina_Bool efreet_desktop_x_field_set(Efreet_Desktop *desktop, const char *key, const char *data);
+EAPI const char * efreet_desktop_x_field_get(Efreet_Desktop *desktop, const char *key);
+EAPI Eina_Bool efreet_desktop_x_field_del(Efreet_Desktop *desktop, const char *key);
+
EAPI void efreet_desktop_cache_flush(void);
/**
diff --git a/src/lib/efreet_uri.c b/src/lib/efreet_uri.c
index 1ba0416..9b5b324 100644
--- a/src/lib/efreet_uri.c
+++ b/src/lib/efreet_uri.c
@@ -9,6 +9,10 @@
#include <ctype.h>
#include <limits.h>
+#ifndef _POSIX_HOST_NAME_MAX
+#define _POSIX_HOST_NAME_MAX 255
+#endif
+
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
--
Enlightenment DR17 support for freedesktop.org specs
More information about the Pkg-e-commits
mailing list