configure.ac | 16 +++++++++++++++-
doc/Wayland/Makefile.am | 2 ++
doc/man/Makefile.am | 7 +++++--
src/wayland-client.h | 3 ---
tests/connection-test.c | 6 ++++--
5 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit ce1f41251a07600ed8c6b2e3dc1e868008aeb33a
Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Fri Dec 14 16:38:09 2012 -0500
configure.ac: Bump version to 1.0.3
diff --git a/configure.ac b/configure.ac
index c584439..571ca97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [0])
-m4_define([wayland_micro_version], [2])
+m4_define([wayland_micro_version], [3])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
commit 8148896d19d0e5bb195c76825a4b140d5b16e501
Author: Pekka Paalanen <ppaala...@gmail.com>
Date: Wed Dec 12 14:19:23 2012 +0200
client: remove two unused function pointer typedefs
The need for wl_display_update_func_t was removed in
commit 53d24713a31d59d9534c1c1a84a7ad46f44ee95f
Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Thu Oct 4 16:54:22 2012 -0400
Change filedescriptor API to be thread safe
and wl_callback_func_t does not seem to have ever been used in the first
place.
Signed-off-by: Pekka Paalanen <ppaala...@gmail.com>
diff --git a/src/wayland-client.h b/src/wayland-client.h
index 8d2b8df..8b1fd0d 100644
--- a/src/wayland-client.h
+++ b/src/wayland-client.h
@@ -135,9 +135,6 @@ void wl_proxy_set_queue(struct wl_proxy *proxy, struct
wl_event_queue *queue);
#include "wayland-client-protocol.h"
-typedef int (*wl_display_update_func_t)(uint32_t mask, void *data);
-typedef void (*wl_callback_func_t)(void *data, uint32_t time);
-
struct wl_display *wl_display_connect(const char *name);
struct wl_display *wl_display_connect_to_fd(int fd);
void wl_display_disconnect(struct wl_display *display);
commit 8bcfa5ad7061231495a65d39c4c9503a64fb2746
Author: Pekka Paalanen <ppaala...@gmail.com>
Date: Mon Dec 3 16:58:25 2012 +0200
tests: rename temporary files
This is libwayland, not weston, so call the temporary files
wayland-tests-*, not weston-tests-*.
This is a candidate for the stable branch.
Signed-off-by: Pekka Paalanen <ppaala...@gmail.com>
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 45744a0..1ac88d2 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -425,7 +425,7 @@ marshal_demarshal(struct marshal_data *data,
TEST(connection_marshal_demarshal)
{
struct marshal_data data;
- char f[] = "/tmp/weston-tests-XXXXXX";
+ char f[] = "/tmp/wayland-tests-XXXXXX";
setup_marshal_data(&data);
@@ -478,7 +478,7 @@ TEST(connection_marshal_alot)
* for both regular data an fds. */
for (i = 0; i < 2000; i++) {
- strcpy(f, "/tmp/weston-tests-XXXXXX");
+ strcpy(f, "/tmp/wayland-tests-XXXXXX");
data.value.h = mkstemp(f);
assert(data.value.h >= 0);
unlink(f);
commit 15625a5cc70f58aa466f3db5171a5fa1851aad71
Author: Sven Joachim <svenj...@gmx.de>
Date: Sun Dec 2 22:42:11 2012 +0100
tests: Don't leave temporary files behind
Signed-off-by: Sven Joachim <svenj...@gmx.de>
diff --git a/tests/connection-test.c b/tests/connection-test.c
index d0113f1..45744a0 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -447,6 +447,7 @@ TEST(connection_marshal_demarshal)
data.value.h = mkstemp(f);
assert(data.value.h >= 0);
+ unlink(f);
marshal_demarshal(&data, (void *) validate_demarshal_h,
8, "h", data.value.h);
@@ -480,6 +481,7 @@ TEST(connection_marshal_alot)
strcpy(f, "/tmp/weston-tests-XXXXXX");
data.value.h = mkstemp(f);
assert(data.value.h >= 0);
+ unlink(f);
marshal_demarshal(&data, (void *) validate_demarshal_h,
8, "h", data.value.h);
}
commit 7fd3ca049b2339363d31abcb7fe0e8305972317b
Author: Jonas Ådahl <jad...@gmail.com>
Date: Sat Dec 1 17:33:23 2012 +0100
man, configure.ac: Only generate man pages if we can do it offline
Instead of relying on downloading the stylesheet from the Internet for
generating man pages, only generate them if the stylesheet is available
locally.
Signed-off-by: Jonas Ådahl <jad...@gmail.com>
diff --git a/configure.ac b/configure.ac
index 0d842e1..c584439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,20 @@ fi
AC_PATH_PROG(XSLTPROC, xsltproc)
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
+AC_MSG_CHECKING([for docbook manpages stylesheet])
+MANPAGES_STYLESHEET=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+AC_PATH_PROGS_FEATURE_CHECK([XSLTPROC_TMP], [xsltproc],
+ AS_IF([`"$ac_path_XSLTPROC_TMP" --nonet
"$MANPAGES_STYLESHEET" > /dev/null 2>&1`],
+ [HAVE_MANPAGES_STYLESHEET=yes]))
+if test "x$HAVE_MANPAGES_STYLESHEET" = "xyes"; then
+ AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], true)
+ AC_SUBST(MANPAGES_STYLESHEET)
+ AC_MSG_RESULT([yes])
+else
+ AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], false)
+ AC_MSG_RESULT([no])
+fi
+
AM_CONDITIONAL(BUILD_DOCS, [test x$enable_documentation = xyes])
if test "x$enable_documentation" = "xyes"; then
AC_PATH_PROG(DOXYGEN, doxygen)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a6a5072..1407953 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST =
man_MANS =
if HAVE_XSLTPROC
+if HAVE_MANPAGES_STYLESHEET
CLEANFILES += $(MANPAGES) $(MANPAGES_ALIASES)
EXTRA_DIST += $(MANPAGES) $(MANPAGES_ALIASES) $(XML_FILES)
@@ -25,11 +26,12 @@ XSLTPROC_FLAGS = \
--stringparam man.authors.section.enabled 0 \
--stringparam man.copyright.section.enabled 0 \
--stringparam funcsynopsis.style ansi \
- --stringparam man.output.quietly 1
+ --stringparam man.output.quietly 1 \
+ --nonet
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS)
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(MANPAGES_STYLESHEET) $< && \
$(SED) -i -e 's/^\.so \(.*\)\.\(.\)$$/\.so man\2\/\1\.\2/'
$(MANPAGES_ALIASES)
%.1: %.xml
@@ -46,4 +48,5 @@ XSLTPROC_PROCESS_MAN = \
wl_display_connect_to_fd.3: wl_display_connect.3
+endif # HAVE_MANPAGES_STYLESHEET
endif # HAVE_XSLTPROC
commit 61387cac3de4dbe574263a0fc4c1fce1ecd3629d
Author: Jonas Ådahl <jad...@gmail.com>
Date: Sat Dec 1 17:33:22 2012 +0100
doc: Only generate Wayland documentation if xsltproc was found
Instead of failing to generate documentation because xsltproc doesn't
exist, don't try to generate at all.
Signed-off-by: Jonas Ådahl <jad...@gmail.com>
diff --git a/doc/Wayland/Makefile.am b/doc/Wayland/Makefile.am
index 53ad6ee..1d27b1a 100644
--- a/doc/Wayland/Makefile.am
+++ b/doc/Wayland/Makefile.am
@@ -14,6 +14,7 @@ publican_sources = \
$(srcdir)/en_US/images/x-architecture.png
if HAVE_PUBLICAN
+if HAVE_XSLTPROC
noinst_DATA = Wayland $(publican_targets)
pubdir = $(docdir)/Wayland/en-US
@@ -96,5 +97,6 @@ uninstall-local:
fi;
endif
+endif
EXTRA_DIST = $(publican_sources) publican.cfg protocol-to-docbook.xsl
protocol-interfaces-to-docbook.xsl doxygen-to-publican.xsl
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tjvjd-0000ks...@vasks.debian.org
