Hello community,
here is the log from the commit of package eio for openSUSE:Factory checked in at 2013-01-10 10:51:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eio (Old)
and /work/SRC/openSUSE:Factory/.eio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eio", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/eio/eio.changes 2012-12-10 13:48:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.eio.new/eio.changes 2013-01-10 10:51:57.000000000 +0100
@@ -1,0 +2,41 @@
+Fri Jan 4 21:47:12 UTC 2013 - sleep_walker@suse.cz
+
+- update to 1.7.5
+ Changes since Eio 1.7.4:
+ * Add eio_eet_sync symbol.
+ * Functions no longer crash when passed NULL and throw errors
+ accordingly
+
+
+-------------------------------------------------------------------
+Sat Dec 29 12:56:56 UTC 2012 - sleep_walker@suse.cz
+
+- make Fedora's version conflicting
+
+-------------------------------------------------------------------
+Thu Dec 27 14:47:21 UTC 2012 - sleep_walker@suse.cz
+
+- package examples
+
+-------------------------------------------------------------------
+Fri Dec 21 16:15:36 UTC 2012 - sleep_walker@suse.cz
+
+- update to 1.7.4
+ Changes since Eio 1.7.3:
+ - Fixed crash in eio_monitor_del.
+ - Properly destroy fd on exec.
+ - Add XML output to doc
+ - Add installation rule for doc
+
+
+-------------------------------------------------------------------
+Thu Dec 20 23:33:41 UTC 2012 - sleep_walker@suse.cz
+
+- package also man pages
+
+-------------------------------------------------------------------
+Thu Dec 20 09:12:23 UTC 2012 - sleep_walker@suse.cz
+
+- build and package documentation
+
+-------------------------------------------------------------------
Old:
----
eio-1.7.3.tar.bz2
New:
----
eio-1.7.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eio.spec ++++++
--- /var/tmp/diff_new_pack.czJIYi/_old 2013-01-10 10:51:58.000000000 +0100
+++ /var/tmp/diff_new_pack.czJIYi/_new 2013-01-10 10:51:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package eio
#
-# 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,13 +17,14 @@
Name: eio
-Version: 1.7.3
+Version: 1.7.5
Release: 0
Summary: Extension of ecore for parallel io operations
License: LGPL-2.1
Group: System/Libraries
Url: http://enlightenment.org/
Source: %{name}-%{version}.tar.bz2
+BuildRequires: doxygen
BuildRequires: ecore-devel >= %version
BuildRequires: eina-devel >= %version
BuildRequires: gcc
@@ -35,6 +36,9 @@
BuildRequires: m4
BuildRequires: pkgconfig
BuildRequires: zlib
+%if 0%{?suse_version}
+BuildRequires: fdupes
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -43,6 +47,7 @@
%package -n libeio1
Summary: Extension of ecore for parallel io operations
Group: System/Libraries
+Conflicts: libeio
%description -n libeio1
Extension of ecore for parallel I/O operations. Part of Enlightenment Foundation Libraries.
@@ -58,15 +63,59 @@
%description devel
Development files for eio package.
+%package doc-html
+Summary: HTML documentation of Eio
+Group: Documentation/HTML
+
+%description doc-html
+Documentation of Eio library in form of HTML pages.
+
+%package doc-man
+Summary: Man documentation of Eina
+Group: Documentation/Man
+
+%description doc-man
+Documentation of Eina library in form of man pages.
+
+%package examples
+Summary: Eina usage examples
+Group: Documentation/Other
+
+%description examples
+Examples of usage of Eina library.
+
%prep
%setup -q
%build
-%configure --disable-static --disable-silent-rules
+# fake time used for documentation
+FAKE_DOCDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%a %%b %%d %%Y')
+FAKE_DOCYEAR=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%Y')
+FAKE_DOCDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%a %%b %%d %%Y %T')
+sed -i "s/\$datetime/$FAKE_DOCDATETIME/g;s/\$date/$FAKE_DOCDATE/g;s/\$year/$FAKEDOCYEAR/g" doc/*.html
+
+%configure --disable-static --disable-silent-rules --enable-install-examples
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 permissions
+find %{buildroot}%{_docdir} -type f | xargs chmod 0644
+find %{buildroot}%{_docdir} -type d | xargs chmod 0755
+# 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 libeio1 -p /sbin/ldconfig
@@ -83,4 +132,19 @@
%{_includedir}/*
%{_libdir}/libeio.so
+%files doc-html
+%defattr(-, root, root)
+%{_docdir}/%{name}
+
+%files doc-man
+%defattr(-, root, root)
+%{_mandir}/*/*
+
+%files examples
+%defattr(-, root, root)
+# eio doesn't have any other file here so add
+# this dir to eio-examples for now
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/examples
+
%changelog
++++++ eio-1.7.3.tar.bz2 -> eio-1.7.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/AUTHORS new/eio-1.7.5/AUTHORS
--- old/eio-1.7.3/AUTHORS 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/AUTHORS 2013-01-04 11:47:11.000000000 +0100
@@ -6,3 +6,4 @@
Mike Blumenkrantz (zmike/discomfitor)
Jérôme Pinot
Daniel Willmann
+Jérémy Zurcher
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/ChangeLog new/eio-1.7.5/ChangeLog
--- old/eio-1.7.3/ChangeLog 2012-12-07 16:11:12.000000000 +0100
+++ new/eio-1.7.5/ChangeLog 2013-01-04 14:46:52.000000000 +0100
@@ -75,4 +75,33 @@
* 1.7.3 release
+2012-12-12 Mike Blumenkrantz
+
+ * Fixed crash in eio_monitor_del.
+
+2012-12-14 Cedric Bail
+
+ * Properly destroy fd on exec.
+
+2012-12-17 Vincent Torri
+
+ * Add XML output to doc
+ * Add installation rule for doc
+
+2012-12-21 Luis Felipe Strano Moraes
+
+ * 1.7.4 release
+
+2012-12-24 Mike Blumenkrantz
+
+ * eio functions no longer crash when passed NULL and throw errors accordingly
+
+2013-01-03 Jérémy Zurcher
+
+ * Add eio_eet_sync symbol.
+
+2013-01-04 Luis Felipe Strano Moraes
+
+ * 1.7.5 release
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/Makefile.am new/eio-1.7.5/Makefile.am
--- old/eio-1.7.3/Makefile.am 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/Makefile.am 2012-12-19 15:43:23.000000000 +0100
@@ -44,10 +44,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = eio.pc
-.PHONY: doc coverage benchmark
+.PHONY: doc install-doc coverage benchmark
# Documentation
doc:
@echo "entering doc/"
make -C doc doc
+
+install-doc:
+ @echo "entering doc/"
+ make -C doc install-doc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/Makefile.in new/eio-1.7.5/Makefile.in
--- old/eio-1.7.3/Makefile.in 2012-12-07 17:09:28.000000000 +0100
+++ new/eio-1.7.5/Makefile.in 2013-01-04 15:26:55.000000000 +0100
@@ -865,7 +865,7 @@
uninstall uninstall-am uninstall-pkgconfigDATA
-.PHONY: doc coverage benchmark
+.PHONY: doc install-doc coverage benchmark
# Documentation
@@ -873,6 +873,10 @@
@echo "entering doc/"
make -C doc doc
+install-doc:
+ @echo "entering doc/"
+ make -C doc install-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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/NEWS new/eio-1.7.5/NEWS
--- old/eio-1.7.3/NEWS 2012-12-07 16:11:16.000000000 +0100
+++ new/eio-1.7.5/NEWS 2013-01-04 11:47:11.000000000 +0100
@@ -1,3 +1,26 @@
+Eio 1.7.5
+Changes since Eio 1.7.4:
+------------------------
+
+Add:
+ * Add eio_eet_sync symbol.
+
+Fixes:
+ * Functions no longer crash when passed NULL and throw errors accordingly
+
+
+Eio 1.7.4
+
+Changes since Eio 1.7.3:
+------------------------
+
+Fixes:
+ - Fixed crash in eio_monitor_del.
+ - Properly destroy fd on exec.
+ - Add XML output to doc
+ - Add installation rule for doc
+
+
Eio 1.7.3
Changes since Eio 1.7.2:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/README new/eio-1.7.5/README
--- old/eio-1.7.3/README 2012-12-07 17:09:25.000000000 +0100
+++ new/eio-1.7.5/README 2013-01-04 15:26:52.000000000 +0100
@@ -1,4 +1,4 @@
-EIO 1.7.0
+EIO 1.7.4
******************************************************************************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/config.h.in new/eio-1.7.5/config.h.in
--- old/eio-1.7.3/config.h.in 2012-12-07 17:09:31.000000000 +0100
+++ new/eio-1.7.5/config.h.in 2013-01-04 15:26:58.000000000 +0100
@@ -36,6 +36,9 @@
/* Define to 1 if you have the `fchmod' function. */
#undef HAVE_FCHMOD
+/* Define to 1 if you have the `fcntl' function. */
+#undef HAVE_FCNTL
+
/* Define to 1 if you have the header file. */
#undef HAVE_FEATURES_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/configure new/eio-1.7.5/configure
--- old/eio-1.7.3/configure 2012-12-07 17:09:27.000000000 +0100
+++ new/eio-1.7.5/configure 2013-01-04 15:26:55.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for eio 1.7.3.
+# Generated by GNU Autoconf 2.68 for eio 1.7.5.
#
# Report bugs to .
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='eio'
PACKAGE_TARNAME='eio'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='eio 1.7.3'
+PACKAGE_VERSION='1.7.5'
+PACKAGE_STRING='eio 1.7.5'
PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1334,7 +1334,7 @@
# 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 eio 1.7.3 to adapt to many kinds of systems.
+\`configure' configures eio 1.7.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1404,7 +1404,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of eio 1.7.3:";;
+ short | recursive ) echo "Configuration of eio 1.7.5:";;
esac
cat <<\_ACEOF
@@ -1527,7 +1527,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-eio configure 1.7.3
+eio configure 1.7.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1896,7 +1896,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by eio $as_me 1.7.3, which was
+It was created by eio $as_me 1.7.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2720,7 +2720,7 @@
# Define the identity of the package.
PACKAGE='eio'
- VERSION='1.7.3'
+ VERSION='1.7.5'
cat >>confdefs.h <<_ACEOF
@@ -11952,7 +11952,7 @@
cat >>confdefs.h <<_ACEOF
-#define VMIC 3
+#define VMIC 5
_ACEOF
@@ -11960,7 +11960,7 @@
#define VREV 0
_ACEOF
-version_info="8:3:7"
+version_info="8:5:7"
release_info=""
@@ -12960,8 +12960,8 @@
case "$host_os" in
mingw*)
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.6.99\""; } >&5
- ($PKG_CONFIG --exists --print-errors "evil >= 1.6.99") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "evil >= 1.7.5") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@@ -12970,13 +12970,13 @@
$as_echo "#define HAVE_EVIL 1" >>confdefs.h
- requirements_eio="${requirements_eio} evil >= 1.6.99"
+ requirements_eio="${requirements_eio} evil >= 1.7.5"
EFL_EIO_BUILD="-DEFL_EIO_BUILD"
;;
esac
-requirements_eio="${requirements_eio} eet >= 1.6.99 eina >= 1.6.99 ecore >= 1.6.99"
+requirements_eio="${requirements_eio} eet >= 1.7.5 eina >= 1.7.5 ecore >= 1.7.5"
@@ -14004,7 +14004,7 @@
### Checks for library functions
-for ac_func in fchmod chown getpwnam getgrnam
+for ac_func in fchmod chown getpwnam getgrnam fcntl
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -14933,7 +14933,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by eio $as_me 1.7.3, which was
+This file was extended by eio $as_me 1.7.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14999,7 +14999,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-eio config.status 1.7.3
+eio config.status 1.7.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -16796,6 +16796,9 @@
echo " Windows notification.: ${have_notify_win32}"
echo
echo " Documentation........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo " Installation.......: make install-doc"
+fi
echo " Examples...............: ${enable_build_examples}"
echo " Examples installed.....: ${enable_install_examples}"
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/configure.ac new/eio-1.7.5/configure.ac
--- old/eio-1.7.3/configure.ac 2012-12-07 17:09:25.000000000 +0100
+++ new/eio-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
@@ -108,15 +108,15 @@
EFL_EIO_BUILD=""
case "$host_os" in
mingw*)
- PKG_CHECK_EXISTS([evil >= 1.6.99])
+ PKG_CHECK_EXISTS([evil >= 1.7.5])
AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if evil package is installed])
- requirements_eio="${requirements_eio} evil >= 1.6.99"
+ requirements_eio="${requirements_eio} evil >= 1.7.5"
EFL_EIO_BUILD="-DEFL_EIO_BUILD"
;;
esac
AC_SUBST([EFL_EIO_BUILD])
-requirements_eio="${requirements_eio} eet >= 1.6.99 eina >= 1.6.99 ecore >= 1.6.99"
+requirements_eio="${requirements_eio} eet >= 1.7.5 eina >= 1.7.5 ecore >= 1.7.5"
AC_SUBST([requirements_eio])
PKG_CHECK_MODULES([EIO], [${requirements_eio}])
@@ -179,7 +179,7 @@
AC_SUBST(lt_enable_auto_import)
### Checks for library functions
-AC_CHECK_FUNCS([fchmod chown getpwnam getgrnam])
+AC_CHECK_FUNCS([fchmod chown getpwnam getgrnam fcntl])
### Check for splice system call
@@ -288,6 +288,9 @@
echo " Windows notification.: ${have_notify_win32}"
echo
echo " Documentation........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo " Installation.......: make install-doc"
+fi
echo " Examples...............: ${enable_build_examples}"
echo " Examples installed.....: ${enable_install_examples}"
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/doc/Doxyfile new/eio-1.7.5/doc/Doxyfile
--- old/eio-1.7.3/doc/Doxyfile 2012-12-07 17:09:30.000000000 +0100
+++ new/eio-1.7.5/doc/Doxyfile 2013-01-04 15:26:58.000000000 +0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.7.3
+PROJECT_NUMBER = 1.7.5
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -1242,7 +1242,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' old/eio-1.7.3/doc/Doxyfile.in new/eio-1.7.5/doc/Doxyfile.in
--- old/eio-1.7.3/doc/Doxyfile.in 2012-12-07 12:53:26.000000000 +0100
+++ new/eio-1.7.5/doc/Doxyfile.in 2012-12-19 15:43:23.000000000 +0100
@@ -1242,7 +1242,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' old/eio-1.7.3/doc/Makefile.am new/eio-1.7.5/doc/Makefile.am
--- old/eio-1.7.3/doc/Makefile.am 2012-12-07 12:53:26.000000000 +0100
+++ new/eio-1.7.5/doc/Makefile.am 2012-12-19 15:43:23.000000000 +0100
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-.PHONY: doc
+.PHONY: doc install-doc
PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
@@ -9,12 +9,15 @@
doc-clean:
rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
-doc: all
+doc-build: all
$(efl_doxygen)
- cp $(srcdir)/img/* html/
+ 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)/
@@ -22,11 +25,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 = $(builddir)/Doxyfile $(wildcard $(srcdir)/img/*.*) $(srcdir)/e.css $(srcdir)/head.html $(srcdir)/foot.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/doc/Makefile.in new/eio-1.7.5/doc/Makefile.in
--- old/eio-1.7.3/doc/Makefile.in 2012-12-07 17:09:28.000000000 +0100
+++ new/eio-1.7.5/doc/Makefile.in 2013-01-04 15:26:55.000000000 +0100
@@ -310,6 +310,7 @@
@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
@@ -375,7 +376,7 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-local
.MAKE: install-am install-strip
@@ -389,20 +390,23 @@
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/ $(PACKAGE_DOCNAME).tar*
-@EFL_BUILD_DOC_TRUE@doc: all
+@EFL_BUILD_DOC_TRUE@doc-build: all
@EFL_BUILD_DOC_TRUE@ $(efl_doxygen)
-@EFL_BUILD_DOC_TRUE@ cp $(srcdir)/img/* html/
+@EFL_BUILD_DOC_TRUE@ cp img/* html/
+@EFL_BUILD_DOC_TRUE@ cp img/* latex/
+
+@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/ man/ $(PACKAGE_DOCNAME)/doc
+@EFL_BUILD_DOC_TRUE@ cp -R html/ latex/ man/ 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)/
@@ -410,9 +414,18 @@
@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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/doc/eio.dox.in new/eio-1.7.5/doc/eio.dox.in
--- old/eio-1.7.3/doc/eio.dox.in 2012-12-07 12:53:26.000000000 +0100
+++ new/eio-1.7.5/doc/eio.dox.in 2013-01-04 12:25:37.000000000 +0100
@@ -27,7 +27,7 @@
* @author Gustavo Sverzut Barbieri
* @author Vincent "caro" Torri <vtorri at univ-evry dot fr>
* @author Guillaume "kuri" Friloux
- * @date 2010-2012
+ * @date 2010-2013
*
* @section eio_intro_sec Introduction
* @version @PACKAGE_VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/eio.pc.in new/eio-1.7.5/eio.pc.in
--- old/eio-1.7.3/eio.pc.in 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/eio.pc.in 2012-12-19 15:43:23.000000000 +0100
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+docdir=@docdir@
Name: eio
Description: Enlightenned Asynchronous Input Output library
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/eio.spec new/eio-1.7.5/eio.spec
--- old/eio-1.7.3/eio.spec 2012-12-07 17:09:30.000000000 +0100
+++ new/eio-1.7.5/eio.spec 2013-01-04 15:26:58.000000000 +0100
@@ -3,7 +3,7 @@
Summary: Enlightenment Input/Output Library
Name: eio
-Version: 1.7.3
+Version: 1.7.5
Release: %{_rel}
License: LGPLv2.1
Group: System Environment/Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/Eio.h new/eio-1.7.5/src/lib/Eio.h
--- old/eio-1.7.3/src/lib/Eio.h 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/Eio.h 2013-01-04 11:47:11.000000000 +0100
@@ -951,7 +951,7 @@
* @param data Unmodified user data passed to callbacks
* @return NULL in case of a failure.
*
- * This function will call eet_flush() from another thread. As long as the done_cb or
+ * This function will call eet_sync() from another thread. As long as the done_cb or
* error_cb haven't be called, you must keep @p ef open.
*/
EAPI Eio_File *eio_eet_sync(Eet_File *ef,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/eio_eet.c new/eio-1.7.5/src/lib/eio_eet.c
--- old/eio-1.7.3/src/lib/eio_eet.c 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/eio_eet.c 2013-01-04 11:47:11.000000000 +0100
@@ -400,6 +400,15 @@
}
EAPI Eio_File *
+eio_eet_sync(Eet_File *ef,
+ Eio_Done_Cb done_cb,
+ Eio_Eet_Error_Cb error_cb,
+ const void *data)
+{
+ return eio_eet_flush(ef,done_cb,error_cb,data);
+}
+
+EAPI Eio_File *
eio_eet_data_write_cipher(Eet_File *ef,
Eet_Data_Descriptor *edd,
const char *name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/eio_file.c new/eio-1.7.5/src/lib/eio_file.c
--- old/eio-1.7.3/src/lib/eio_file.c 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/eio_file.c 2013-01-04 11:47:11.000000000 +0100
@@ -869,6 +869,8 @@
const char *key,
const void *data, Eina_Free_Cb free_cb)
{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(key, EINA_FALSE);
/* FIXME: Check if we are in the right worker thred */
if (!ls->worker.associated)
ls->worker.associated = eina_hash_string_small_new(eio_associate_free);
@@ -883,6 +885,8 @@
const char *key,
const void *data, Eina_Free_Cb free_cb)
{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(key, EINA_FALSE);
/* FIXME: Check if we are in the right worker thred */
if (!ls->worker.associated)
ls->worker.associated = eina_hash_string_small_new(eio_associate_free);
@@ -897,6 +901,8 @@
{
Eio_File_Associate *search;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ls, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(key, NULL);
if (!ls->main.associated)
return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/eio_monitor.c new/eio-1.7.5/src/lib/eio_monitor.c
--- old/eio-1.7.3/src/lib/eio_monitor.c 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/eio_monitor.c 2013-01-04 11:47:11.000000000 +0100
@@ -266,6 +266,7 @@
const char *tmp;
Eio_Monitor *ret;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
tmp = eina_stringshare_add(path);
ret = eio_monitor_stringshared_add(tmp);
eina_stringshare_del(tmp);
@@ -278,6 +279,7 @@
Eio_Monitor *monitor;
struct stat st;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
if (_monitor_pid == -1) return NULL;
if (_monitor_pid != getpid())
@@ -339,6 +341,7 @@
EAPI void
eio_monitor_del(Eio_Monitor *monitor)
{
+ if (!monitor) return;
EINA_REFCOUNT_UNREF(monitor)
_eio_monitor_free(monitor);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/eio_monitor_inotify.c new/eio-1.7.5/src/lib/eio_monitor_inotify.c
--- old/eio-1.7.3/src/lib/eio_monitor_inotify.c 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/eio_monitor_inotify.c 2012-12-19 15:43:22.000000000 +0100
@@ -184,7 +184,7 @@
void eio_monitor_backend_init(void)
{
int fd;
-#ifdef HAVE_EXECVP
+#ifdef HAVE_FCNTL
int flags;
#endif
@@ -192,7 +192,7 @@
if (fd < 0)
return ;
-#ifdef HAVE_EXECVP
+#ifdef HAVE_FCNTL
flags = fcntl(fd, F_GETFD);
flags |= FD_CLOEXEC;
fcntl(fd, F_SETFD, flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/eio_single.c new/eio-1.7.5/src/lib/eio_single.c
--- old/eio-1.7.3/src/lib/eio_single.c 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/eio_single.c 2013-01-04 11:47:11.000000000 +0100
@@ -418,8 +418,9 @@
{
Eio_File_Stat *s = NULL;
- if (!path || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
s = malloc(sizeof (Eio_File_Stat));
if (!s) return NULL;
@@ -450,8 +451,9 @@
#ifdef HAVE_LSTAT
Eio_File_Stat *s = NULL;
- if (!path || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
s = malloc(sizeof (Eio_File_Stat));
if (!s) return NULL;
@@ -482,8 +484,9 @@
{
Eio_File_Unlink *l = NULL;
- if (!path || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
l = malloc(sizeof (Eio_File_Unlink));
if (!l) return NULL;
@@ -511,8 +514,9 @@
{
Eio_File_Mkdir *r = NULL;
- if (!path || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
r = malloc(sizeof (Eio_File_Mkdir));
if (!r) return NULL;
@@ -541,8 +545,9 @@
{
Eio_File_Mkdir *r = NULL;
- if (!path || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
r = malloc(sizeof (Eio_File_Mkdir));
if (!r) return NULL;
@@ -572,8 +577,9 @@
{
Eio_File_Chown *c = NULL;
- if (!path || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
c = malloc(sizeof (Eio_File_Chown));
if (!c) return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eio-1.7.3/src/lib/eio_xattr.c new/eio-1.7.5/src/lib/eio_xattr.c
--- old/eio-1.7.3/src/lib/eio_xattr.c 2012-12-07 12:53:27.000000000 +0100
+++ new/eio-1.7.5/src/lib/eio_xattr.c 2013-01-04 11:47:11.000000000 +0100
@@ -320,8 +320,10 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
@@ -341,8 +343,10 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
@@ -362,8 +366,10 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
@@ -383,8 +389,10 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
@@ -407,8 +415,12 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !xattr_data || !xattr_size || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(xattr_data, NULL);
+ EINA_SAFETY_ON_FALSE_RETURN_VAL(xattr_size, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr) + xattr_size);
if (!async) return NULL;
@@ -433,8 +445,11 @@
Eio_File_Xattr *async;
int length;
- if (!path || !attribute || !done_cb || !xattr_string || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(xattr_string, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
@@ -464,8 +479,10 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
@@ -487,8 +504,10 @@
{
Eio_File_Xattr *async;
- if (!path || !attribute || !done_cb || !error_cb)
- return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(attribute, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
async = malloc(sizeof (Eio_File_Xattr));
if (!async) return NULL;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org