diff options
author | Anas Nashif <anas.nashif@intel.com> | 2012-12-21 16:29:07 -0800 |
---|---|---|
committer | Anas Nashif <anas.nashif@intel.com> | 2012-12-21 16:29:07 -0800 |
commit | 68257ae40b455d3efcfea159c07266811e5ef727 (patch) | |
tree | 73bb927b27a52515715efbb03adbebc21b24d5a7 | |
parent | 53f293d36dbb6a7f11b39644a46cfd329878f22c (diff) | |
download | efreet-68257ae40b455d3efcfea159c07266811e5ef727.tar.gz efreet-68257ae40b455d3efcfea159c07266811e5ef727.tar.bz2 efreet-68257ae40b455d3efcfea159c07266811e5ef727.zip |
Imported Upstream version 1.7.4upstream/1.7.4
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | NEWS | 12 | ||||
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | configure | 27 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | doc/Doxyfile.in | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 18 | ||||
-rw-r--r-- | doc/Makefile.in | 23 | ||||
-rw-r--r-- | efreet-mime.pc.in | 2 | ||||
-rw-r--r-- | efreet-trash.pc.in | 2 | ||||
-rw-r--r-- | efreet.pc.in | 2 | ||||
-rw-r--r-- | efreet.spec | 2 | ||||
-rw-r--r-- | po/cs.gmo | bin | 453 -> 453 bytes | |||
-rw-r--r-- | po/cs.po | 2 | ||||
-rw-r--r-- | po/de.gmo | bin | 461 -> 461 bytes | |||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/efreet.pot | 4 | ||||
-rw-r--r-- | po/el.gmo | bin | 482 -> 482 bytes | |||
-rw-r--r-- | po/el.po | 2 | ||||
-rw-r--r-- | po/es.gmo | bin | 457 -> 457 bytes | |||
-rw-r--r-- | po/es.po | 2 | ||||
-rw-r--r-- | po/fr.gmo | bin | 453 -> 453 bytes | |||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/it.gmo | bin | 456 -> 456 bytes | |||
-rw-r--r-- | po/it.po | 2 | ||||
-rw-r--r-- | po/ja.gmo | bin | 465 -> 465 bytes | |||
-rw-r--r-- | po/ja.po | 2 | ||||
-rw-r--r-- | po/ko.gmo | bin | 459 -> 459 bytes | |||
-rw-r--r-- | po/ko.po | 2 | ||||
-rw-r--r-- | po/nl.gmo | bin | 457 -> 457 bytes | |||
-rw-r--r-- | po/nl.po | 2 | ||||
-rw-r--r-- | po/pt.gmo | bin | 464 -> 464 bytes | |||
-rw-r--r-- | po/pt.po | 2 | ||||
-rw-r--r-- | po/ru.gmo | bin | 470 -> 470 bytes | |||
-rw-r--r-- | po/ru.po | 2 | ||||
-rw-r--r-- | po/sl.gmo | bin | 454 -> 454 bytes | |||
-rw-r--r-- | po/sl.po | 2 | ||||
-rw-r--r-- | src/lib/Makefile.am | 6 | ||||
-rw-r--r-- | src/lib/Makefile.in | 6 | ||||
-rw-r--r-- | src/lib/efreet_cache.c | 10 |
42 files changed, 125 insertions, 50 deletions
@@ -160,4 +160,20 @@ * 1.7.3 release +2012-12-12 Nicolas Aguirre + + * Fix build on win32 platforms + +2012-12-17 Vincent Torri + + * Add XML output to doc + * Add installation rule for doc + +2012-12-19 Mike Blumenkrantz + + * Add O_CLOEXEC to opened fds + +2012-12-21 Luis Felipe Strano Moraes + + * 1.7.4 release diff --git a/Makefile.am b/Makefile.am index a159015..ee96163 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,12 +88,16 @@ m4/efl_coverage.m4\ m4/efl_tests.m4\ README -.PHONY: doc coverage +.PHONY: doc install-doc coverage doc: @echo "entering doc/" make -C doc doc +install-doc: + @echo "entering doc/" + make -C doc install-doc + # Unit tests if EFL_ENABLE_TESTS diff --git a/Makefile.in b/Makefile.in index 3df5383..1c7cd46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -908,12 +908,16 @@ uninstall-am: uninstall-pkgconfigDATA uninstall-pkgconfigDATA -.PHONY: doc coverage +.PHONY: doc install-doc coverage doc: @echo "entering doc/" make -C doc doc +install-doc: + @echo "entering doc/" + make -C doc install-doc + # Unit tests @EFL_ENABLE_TESTS_TRUE@check-local: @@ -1,3 +1,15 @@ +Efreet 1.7.4 + +Changes since Efreet 1.7.3: +--------------------------- + +Fixes: + * Add O_CLOEXEC to opened fds + * Add XML output to doc + * Add installation rule for doc + * Fix build on Windows platforms. + + Efreet 1.7.3 Changes since Efreet 1.7.2: @@ -1,4 +1,4 @@ -Efreet 1.7.0 +Efreet 1.7.4 ****************************************************************************** @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for efreet 1.7.3. +# Generated by GNU Autoconf 2.68 for efreet 1.7.4. # # Report bugs to <enlightenment-devel@lists.sourceforge.net>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='efreet' PACKAGE_TARNAME='efreet' -PACKAGE_VERSION='1.7.3' -PACKAGE_STRING='efreet 1.7.3' +PACKAGE_VERSION='1.7.4' +PACKAGE_STRING='efreet 1.7.4' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1370,7 +1370,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 1.7.3 to adapt to many kinds of systems. +\`configure' configures efreet 1.7.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1440,7 +1440,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of efreet 1.7.3:";; + short | recursive ) echo "Configuration of efreet 1.7.4:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -efreet configure 1.7.3 +efreet configure 1.7.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1995,7 +1995,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 1.7.3, which was +It was created by efreet $as_me 1.7.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2820,7 +2820,7 @@ fi # Define the identity of the package. PACKAGE='efreet' - VERSION='1.7.3' + VERSION='1.7.4' cat >>confdefs.h <<_ACEOF @@ -11791,7 +11791,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 3 +#define VMIC 4 _ACEOF @@ -11799,7 +11799,7 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="8:3:7" +version_info="8:4:7" release_info="" @@ -17272,7 +17272,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 efreet $as_me 1.7.3, which was +This file was extended by efreet $as_me 1.7.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17338,7 +17338,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="\\ -efreet config.status 1.7.3 +efreet config.status 1.7.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -19268,6 +19268,9 @@ echo " Tests................: ${enable_tests}" echo " Coverage.............: ${enable_coverage}" echo echo " Documentation........: ${build_doc}" +if test "x${build_doc}" = "xyes" ; then +echo " Installation.......: make install-doc" +fi echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" diff --git a/configure.ac b/configure.ac index 3281734..f6cde07 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], [3]) +m4_define([v_mic], [4]) 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 @@ -274,6 +274,9 @@ echo " Tests................: ${enable_tests}" echo " Coverage.............: ${enable_coverage}" echo echo " Documentation........: ${build_doc}" +if test "x${build_doc}" = "xyes" ; then +echo " Installation.......: make install-doc" +fi echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index cd56fea..4076c86 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1294,7 +1294,7 @@ MAN_LINKS = YES # 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 --git a/doc/Makefile.am b/doc/Makefile.am index ad5250b..d953420 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in Doxyfile efreet_doxy_warnings.txt -.PHONY: doc +.PHONY: doc install-doc PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc @@ -9,12 +9,13 @@ if EFL_BUILD_DOC doc-clean: rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* -doc: all doc-clean +doc-build: all $(efl_doxygen) - cp $(srcdir)/images/* html/ + +doc: doc-build rm -rf $(PACKAGE_DOCNAME).tar* mkdir -p $(PACKAGE_DOCNAME)/doc - cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc + cp -R html/ latex/ xml/ $(PACKAGE_DOCNAME)/doc tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ bzip2 -9 $(PACKAGE_DOCNAME).tar rm -rf $(PACKAGE_DOCNAME)/ @@ -22,11 +23,20 @@ doc: all doc-clean 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.in $(wildcard images/*.*) e.css head.html foot.html diff --git a/doc/Makefile.in b/doc/Makefile.in index 1246656..eec2500 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -341,6 +341,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +@EFL_BUILD_DOC_FALSE@uninstall-local: @EFL_BUILD_DOC_FALSE@clean-local: clean: clean-am @@ -406,7 +407,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-local .MAKE: install-am install-strip @@ -420,20 +421,21 @@ uninstall-am: install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + uninstall uninstall-am uninstall-local -.PHONY: doc +.PHONY: doc install-doc @EFL_BUILD_DOC_TRUE@doc-clean: @EFL_BUILD_DOC_TRUE@ rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* -@EFL_BUILD_DOC_TRUE@doc: all doc-clean +@EFL_BUILD_DOC_TRUE@doc-build: all @EFL_BUILD_DOC_TRUE@ $(efl_doxygen) -@EFL_BUILD_DOC_TRUE@ cp $(srcdir)/images/* html/ + +@EFL_BUILD_DOC_TRUE@doc: doc-build @EFL_BUILD_DOC_TRUE@ rm -rf $(PACKAGE_DOCNAME).tar* @EFL_BUILD_DOC_TRUE@ mkdir -p $(PACKAGE_DOCNAME)/doc -@EFL_BUILD_DOC_TRUE@ cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc +@EFL_BUILD_DOC_TRUE@ cp -R html/ latex/ xml/ $(PACKAGE_DOCNAME)/doc @EFL_BUILD_DOC_TRUE@ tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ @EFL_BUILD_DOC_TRUE@ bzip2 -9 $(PACKAGE_DOCNAME).tar @EFL_BUILD_DOC_TRUE@ rm -rf $(PACKAGE_DOCNAME)/ @@ -441,9 +443,18 @@ uninstall-am: @EFL_BUILD_DOC_TRUE@clean-local: doc-clean +@EFL_BUILD_DOC_TRUE@install-doc: doc-build +@EFL_BUILD_DOC_TRUE@ install -d $(docdir) +@EFL_BUILD_DOC_TRUE@ cp -R html latex man xml $(docdir) + +@EFL_BUILD_DOC_TRUE@uninstall-local: +@EFL_BUILD_DOC_TRUE@ rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml + @EFL_BUILD_DOC_FALSE@doc: @EFL_BUILD_DOC_FALSE@ @echo "Documentation not built. Run ./configure --help" +@EFL_BUILD_DOC_FALSE@install-doc: doc + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/efreet-mime.pc.in b/efreet-mime.pc.in index d651017..ec14c18 100644 --- a/efreet-mime.pc.in +++ b/efreet-mime.pc.in @@ -1,7 +1,9 @@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +docdir=@docdir@ Name: efreet-mime Description: Freedesktop Shared Mime Info standard implementation for the EFL diff --git a/efreet-trash.pc.in b/efreet-trash.pc.in index 5a4ccf8..0686c0b 100644 --- a/efreet-trash.pc.in +++ b/efreet-trash.pc.in @@ -1,7 +1,9 @@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +docdir=@docdir@ Name: efreet-trash Description: Freedesktop Shared Trash implementation for the EFL diff --git a/efreet.pc.in b/efreet.pc.in index 2f4db8e..dfccba6 100644 --- a/efreet.pc.in +++ b/efreet.pc.in @@ -1,7 +1,9 @@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +docdir=@docdir@ Name: efreet Description: Freedesktop standards implementation for the EFL diff --git a/efreet.spec b/efreet.spec index 3ec569f..012dc4a 100644 --- a/efreet.spec +++ b/efreet.spec @@ -4,7 +4,7 @@ Summary: FreeDesktop.Org Compatibility Library Name: efreet -Version: 1.7.3 +Version: 1.7.4 Release: %{_rel} License: BSD Group: System Environment/Libraries Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" diff --git a/po/efreet.pot b/po/efreet.pot index 44c674e..de1506e 100644 --- a/po/efreet.pot +++ b/po/efreet.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: efreet 1.7.3\n" +"Project-Id-Version: efreet 1.7.4\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-07 11:47-0200\n" +"POT-Creation-Date: 2012-12-21 03:42-0800\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n" "Language-Team: Enlightenment Team\n" diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f1cc10b..ff99e5e 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -43,7 +43,7 @@ libefreet_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @EFL_EFREET_BUILD@ \ @EFREET_CFLAGS@ -libefreet_la_LIBADD = @EFREET_LIBS@ @WIN32_LIBS@ +libefreet_la_LIBADD = @EFREET_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ libefreet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @@ -53,7 +53,7 @@ libefreet_mime_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @EFL_EFREET_MIME_BUILD@ \ @EFREET_CFLAGS@ -libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la @WIN32_LIBS@ +libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la @WIN32_LIBS@ @LTLIBINTL@ libefreet_mime_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @@ -63,7 +63,7 @@ libefreet_trash_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @EFL_EFREET_TRASH_BUILD@ \ @EFREET_CFLAGS@ -libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la +libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la @LTLIBINTL@ libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index aae2785..92efdb6 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -352,7 +352,7 @@ libefreet_la_CPPFLAGS = \ @EFL_EFREET_BUILD@ \ @EFREET_CFLAGS@ -libefreet_la_LIBADD = @EFREET_LIBS@ @WIN32_LIBS@ +libefreet_la_LIBADD = @EFREET_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ libefreet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ libefreet_mime_la_SOURCES = efreet_mime.c libefreet_mime_la_CPPFLAGS = \ @@ -361,7 +361,7 @@ libefreet_mime_la_CPPFLAGS = \ @EFL_EFREET_MIME_BUILD@ \ @EFREET_CFLAGS@ -libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la @WIN32_LIBS@ +libefreet_mime_la_LIBADD = @EFREET_LIBS@ libefreet.la @WIN32_LIBS@ @LTLIBINTL@ libefreet_mime_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ libefreet_trash_la_SOURCES = efreet_trash.c libefreet_trash_la_CPPFLAGS = \ @@ -370,7 +370,7 @@ libefreet_trash_la_CPPFLAGS = \ @EFL_EFREET_TRASH_BUILD@ \ @EFREET_CFLAGS@ -libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la +libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la @LTLIBINTL@ libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h all: all-am diff --git a/src/lib/efreet_cache.c b/src/lib/efreet_cache.c index b3b9855..de7604b 100644 --- a/src/lib/efreet_cache.c +++ b/src/lib/efreet_cache.c @@ -1213,7 +1213,7 @@ desktop_cache_update_cache_cb(void *data __UNUSED__) { char file[PATH_MAX]; struct flock fl; - int prio; + int prio, flags; desktop_cache_timer = NULL; @@ -1229,6 +1229,9 @@ desktop_cache_update_cache_cb(void *data __UNUSED__) fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; if (fcntl(desktop_cache_exe_lock, F_SETLK, &fl) < 0) goto error; + flags = fcntl(icon_cache_exe_lock, F_GETFD); + flags |= FD_CLOEXEC; + if (fcntl(icon_cache_exe_lock, F_SETFD, flags) < 0) goto error; prio = ecore_exe_run_priority_get(); ecore_exe_run_priority_set(19); eina_strlcpy(file, PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", sizeof(file)); @@ -1264,7 +1267,7 @@ icon_cache_update_cache_cb(void *data __UNUSED__) { char file[PATH_MAX]; struct flock fl; - int prio; + int prio, flags; Eina_List **l, *l2; icon_cache_timer = NULL; @@ -1281,6 +1284,9 @@ icon_cache_update_cache_cb(void *data __UNUSED__) fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; if (fcntl(icon_cache_exe_lock, F_SETLK, &fl) < 0) goto error; + flags = fcntl(icon_cache_exe_lock, F_GETFD); + flags |= FD_CLOEXEC; + if (fcntl(icon_cache_exe_lock, F_SETFD, flags) < 0) goto error; prio = ecore_exe_run_priority_get(); ecore_exe_run_priority_set(19); eina_strlcpy(file, PACKAGE_LIB_DIR "/efreet/efreet_icon_cache_create", sizeof(file)); |