mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
93 lines
2.5 KiB
Plaintext
93 lines
2.5 KiB
Plaintext
From 888e4094afccd2016aa72828b7d49263ee80d8db Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Fri, 3 Oct 2014 18:33:08 +0000
|
|
Subject: Haiku patch
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 2ce1959..c04c05c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -287,6 +287,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.10.2
|
|
|
|
|
|
From e3e4f468cc12266d121a2ddb99808a090b15e157 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
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 a351b01..474f34c 100644
|
|
--- a/test/cairo-test.c
|
|
+++ b/test/cairo-test.c
|
|
@@ -40,6 +40,7 @@
|
|
#include <unistd.h>
|
|
#endif
|
|
#include <errno.h>
|
|
+#include <fenv.h>
|
|
#include <string.h>
|
|
#if HAVE_FCFINI
|
|
#include <fontconfig/fontconfig.h>
|
|
--
|
|
2.10.2
|
|
|
|
|
|
From 66cf163733ee56380b0525b918b7969849ed0229 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
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 b2fcd27..cf7e4ad 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 \
|
|
@@ -210,7 +210,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.10.2
|
|
|