From 7fa107c58c2809a9059128e754ce65d96be1e29e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Oct 2014 18:33:08 +0000 Subject: Haiku patch diff --git a/configure.ac b/configure.ac index 5e33c96..3baa8a8 100644 --- a/configure.ac +++ b/configure.ac @@ -270,6 +270,11 @@ CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [ AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta") ;; + *-*-haiku) + beos_LIBS="" + AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") + AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork") + ;; *) use_beos="no (requires a BeOS platform)" ;; -- 2.30.2 From cc2b20d99233178bfdc567c0d56ed23bb50825ec Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 6 Oct 2014 18:07:36 +0200 Subject: Add missing include fenv.h. diff --git a/test/cairo-test.c b/test/cairo-test.c index d93468b..9d5901d 100644 --- a/test/cairo-test.c +++ b/test/cairo-test.c @@ -40,6 +40,7 @@ #include #endif #include +#include #include #if HAVE_FCFINI #include -- 2.30.2 From 922d7a3f67ebee8dcb0365d04023450e7e17574f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 21 Nov 2014 22:11:40 +0000 Subject: link tests against libnetwork. diff --git a/perf/Makefile.am b/perf/Makefile.am index 40b35bc..ee150d9 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src \ $(CAIRO_CFLAGS) -AM_LDFLAGS = $(CAIRO_LDFLAGS) +AM_LDFLAGS = $(CAIRO_LDFLAGS) -lnetwork SUBDIRS = micro diff --git a/test/Makefile.am b/test/Makefile.am index e3c42ea..6ce956f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -94,7 +94,7 @@ cairo_test_suite_LDADD = \ $(top_builddir)/test/pdiff/libpdiff.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ $(top_builddir)/src/libcairo.la \ - $(CAIRO_LDADD) + $(CAIRO_LDADD) -lnetwork cairo_test_suite_DEPENDENCIES = \ $(top_builddir)/test/pdiff/libpdiff.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ @@ -211,7 +211,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(CAIRO_CFLAGS) -AM_LDFLAGS = $(CAIRO_LDFLAGS) +AM_LDFLAGS = $(CAIRO_LDFLAGS) -lnetwork $(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la -- 2.30.2 From 6fb43c65d687a5fa703b0f7457d6464bc2929ac4 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 17 Dec 2021 22:56:11 -0500 Subject: Xlib: Do not attempt to use shm. diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c index 1ee1e3d..9803115 100644 --- a/src/cairo-xlib-surface-shm.c +++ b/src/cairo-xlib-surface-shm.c @@ -37,12 +37,12 @@ #include "cairoint.h" -#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS +#if 1 #include "cairo-xlib-private.h" #include "cairo-xlib-surface-private.h" -#if !HAVE_X11_EXTENSIONS_XSHM_H || !(HAVE_X11_EXTENSIONS_SHMPROTO_H || HAVE_X11_EXTENSIONS_SHMSTR_H) +#if 1 void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {} cairo_surface_t * diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 2a6d896..c46f660 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -70,7 +70,9 @@ #include #include +#ifndef __HAIKU__ #include +#endif #define XLIB_COORD_MAX 32767 @@ -1390,7 +1392,7 @@ _cairo_xlib_surface_acquire_source_image (void *abstract_surf *image_extra = NULL; *image_out = (cairo_image_surface_t *) _cairo_xlib_surface_get_shm (abstract_surface, FALSE); - if (*image_out) + if (*image_out) return (*image_out)->base.status; extents.x = extents.y = 0; -- 2.30.2