/[gentoo-x86]/x11-libs/cairo/files/cairo-1.10.2-ubuntu.patch
Gentoo

Contents of /x11-libs/cairo/files/cairo-1.10.2-ubuntu.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Wed Jul 25 08:44:33 2012 UTC (23 months, 2 weeks ago) by yngwin
Branch: MAIN
CVS Tags: HEAD
Fix bugs #369593, #410213, #416507

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

1 --- cairo.orig/build/configure.ac.features 2010-12-28 14:41:21.487225155 +0100
2 +++ cairo/build/configure.ac.features 2010-12-28 14:42:06.166239606 +0100
3 @@ -407,6 +407,7 @@
4 echo "The following features and utilities:"
5 echo " cairo-trace: $use_trace"
6 echo " cairo-script-interpreter: $use_interpreter"
7 + echo " cairo-perf-utils: $use_perf_utils"
8 echo ""
9 echo "And the following internal features:"
10 echo " pthread: $use_pthread"
11 --- cairo.orig/configure.ac 2010-12-28 14:43:02.291226995 +0100
12 +++ cairo/configure.ac 2010-12-28 14:43:18.191141863 +0100
13 @@ -10,6 +10,7 @@
14 AC_CONFIG_SRCDIR(src/cairo.h)
15 AC_CONFIG_HEADERS(config.h)
16 AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
17 +AM_MAINTAINER_MODE
18 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
19 AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
20 AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
21 @@ -796,6 +796,11 @@
22 PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no)
23 AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
24
25 +dnl ===========================================================================
26 +
27 +CAIRO_ENABLE(perf_utils, cairo-perf-utils, no, [use_perf_utils=yes])
28 +
29 +
30 AC_CONFIG_FILES([
31 Makefile
32 boilerplate/Makefile
33 --- cairo.orig/perf/Makefile.am 2010-06-18 13:47:11.000000000 +0200
34 +++ cairo/perf/Makefile.am 2010-12-28 14:42:06.162226875 +0100
35 @@ -10,6 +10,18 @@
36
37 AM_LDFLAGS = $(CAIRO_LDFLAGS)
38
39 +if CAIRO_HAS_PERF_UTILS
40 +bin_PROGRAMS = cairo-perf-micro \
41 + cairo-perf-trace \
42 + cairo-perf-diff-files \
43 + cairo-perf-print \
44 + cairo-perf-chart \
45 + cairo-perf-compare-backends
46 +if HAVE_GTK
47 +bin_PROGRAMS += cairo-perf-graph-files
48 +endif
49 +endif
50 +
51 EXTRA_PROGRAMS += cairo-perf-micro \
52 cairo-perf-trace \
53 cairo-perf-diff-files \

  ViewVC Help
Powered by ViewVC 1.1.20