diff options
| -rw-r--r-- | CREDITS | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | contrib/libxdg-basedir/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/libxdg-basedir/basedir.c | 2 | ||||
| -rw-r--r-- | contrib/libxdg-basedir/basedir.h | 18 | ||||
| -rw-r--r-- | contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch | 11 |
6 files changed, 12 insertions, 29 deletions
@@ -24,7 +24,7 @@ libmad 0.15.1b Miguel Freitas libmpeg2 0.2.1 [*] libmpcdec 1.2.5 libvcd 0.7.21 [o] -libxdg-basedir 0.1.2 Diego Pettenò +libxdg-basedir 0.1.3 Diego Pettenò nosefart 1.92 Mike Melanson tvtime 0.9.8.4 Miguel Freitas wine diff --git a/configure.ac b/configure.ac index 7d979e08b..f003d22c8 100644 --- a/configure.ac +++ b/configure.ac @@ -325,11 +325,7 @@ AC_ARG_WITH([external-libxdg-basedir], AS_HELP_STRING([--with-external-libxdg-basedir], [use external copy of libxdg-basedir])) if test "x$with_external_libxdg_basedir" = "xyes"; then - AC_CHECK_HEADER([basedir.h], , [AC_MSG_ERROR([Unable to find basedir.h for libxdg-basedir])]) - AC_CHECK_LIB([xdg-basedir], [xdgCacheHome], , [AC_MSG_ERROR([Unable to find libxdg-basedir])]) - - XDG_BASEDIR_CFLAGS='' - XDG_BASEDIR_LIBS='-lxdg-basedir' + PKG_CHECK_MODULES([XDG_BASEDIR], [libxdg-basedir >= 0.1.3]) else XDG_BASEDIR_CFLAGS='-I$(top_srcdir)/contrib/libxdg-basedir' XDG_BASEDIR_LIBS='$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la' diff --git a/contrib/libxdg-basedir/Makefile.am b/contrib/libxdg-basedir/Makefile.am index 20a2e272f..68f09b0a9 100644 --- a/contrib/libxdg-basedir/Makefile.am +++ b/contrib/libxdg-basedir/Makefile.am @@ -4,5 +4,3 @@ endif libxdg_basedir_la_SOURCES = basedir.c basedir.h libxdg_basedir_la_CFLAGS = $(VISIBILITY_FLAG) - -EXTRA_DIST = diff_from_libxdg-basedir_0.1.2.patch diff --git a/contrib/libxdg-basedir/basedir.c b/contrib/libxdg-basedir/basedir.c index b0782efa2..ae50d1bba 100644 --- a/contrib/libxdg-basedir/basedir.c +++ b/contrib/libxdg-basedir/basedir.c @@ -209,7 +209,7 @@ static char** xdgSplitPath(const char* string) #endif itemlist[i][k] = string[j]; } - itemlist[i][k] = 0; + itemlist[i][k] = 0; // Bugfix provided by Diego 'Flameeyes' Pettenò /* move to next string */ string += j; if (*string == PATH_SEPARATOR_CHAR) string++; /* skip seperator */ diff --git a/contrib/libxdg-basedir/basedir.h b/contrib/libxdg-basedir/basedir.h index cf0a84e27..cfdd88bec 100644 --- a/contrib/libxdg-basedir/basedir.h +++ b/contrib/libxdg-basedir/basedir.h @@ -29,7 +29,7 @@ #ifndef XDG_BASEDIR_H #define XDG_BASEDIR_H -#if !defined(__cplusplus) && !defined(__bool_true_false_are_defined) +#if !defined(__cplusplus) && !defined(__bool_true_false_are_defined) && !defined(_DOXYGEN) #if defined(STDC_HEADERS) || defined(HAVE_STDBOOL_H) #include <stdbool.h> #else @@ -129,13 +129,13 @@ const char * xdgCacheHome(xdgHandle handle); /*@{*/ /** Find all existing data files corresponding to relativePath. - * Consider as performing @code fopen(filename, "r") @endcode on every possible @c filename - * and returning the successful <tt>filename</tt>s. - * @param relativePath Path to scan for. - * @param handle Handle to data cache. - * @return A sequence of null-terminated strings terminated by a double-null (empty string) - * and allocated using malloc(). - */ + * Consider as performing @code fopen(filename, "r") @endcode on every possible @c filename + * and returning the successful <tt>filename</tt>s. + * @param relativePath Path to scan for. + * @param handle Handle to data cache. + * @return A sequence of null-terminated strings terminated by a double-null (empty string) + * and allocated using malloc(), e.g.: @code "/etc/share\0/home/jdoe/.local\0" @endcode + */ const char * xdgDataFind(const char* relativePath, xdgHandle handle); /** Find all existing config files corresponding to relativePath. @@ -144,7 +144,7 @@ const char * xdgDataFind(const char* relativePath, xdgHandle handle); * @param relativePath Path to scan for. * @param handle Handle to data cache. * @return A sequence of null-terminated strings terminated by a double-null (empty string) - * and allocated using malloc(). + * and allocated using malloc(), e.g.: @code "/etc/xdg\0/home/jdoe/.config\0" @endcode */ const char * xdgConfigFind(const char* relativePath, xdgHandle handle); diff --git a/contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch b/contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch deleted file mode 100644 index 5a7e69fdc..000000000 --- a/contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r fe43a4a573b2 contrib/libxdg-basedir/basedir.c ---- a/contrib/libxdg-basedir/basedir.c Fri Apr 13 22:04:05 2007 +0200 -+++ b/contrib/libxdg-basedir/basedir.c Fri Apr 13 22:05:25 2007 +0200 -@@ -209,6 +209,7 @@ static char** xdgSplitPath(const char* s - #endif - itemlist[i][k] = string[j]; - } -+ itemlist[i][k] = 0; - /* move to next string */ - string += j; - if (*string == PATH_SEPARATOR_CHAR) string++; /* skip seperator */ |