diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-11 09:17:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-11 09:17:54 +0100 |
| commit | bc2fd4900222c904751d14906b5e4cd3372d14e8 (patch) | |
| tree | 99a35a4f011bdc9d8f1aabc906dabe28458839e7 /package/cairo | |
| parent | c7d63e029bc682c511770b8d3189be1264325c04 (diff) | |
| parent | e3fcd8688f769707d355ac3ae786d0d46185506f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cairo')
| -rw-r--r-- | package/cairo/Makefile | 7 | ||||
| -rw-r--r-- | package/cairo/patches/patch-Makefile_in | 20 |
2 files changed, 25 insertions, 2 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 8b26cbfdb..2429c545b 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo PKG_VERSION:= 1.12.16 -PKG_RELEASE:= 1 +PKG_RELEASE:= 4 PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs @@ -33,7 +33,10 @@ endif CONFIGURE_ARGS+= --enable-ft=yes \ --enable-fc=yes \ --enable-tee=yes \ - --enable-xlib=yes + --enable-xlib=yes \ + --enable-pdf=yes \ + --disable-test-surfaces \ + --disable-full-testing cairo-install: ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo diff --git a/package/cairo/patches/patch-Makefile_in b/package/cairo/patches/patch-Makefile_in new file mode 100644 index 000000000..266149788 --- /dev/null +++ b/package/cairo/patches/patch-Makefile_in @@ -0,0 +1,20 @@ +--- cairo-1.12.16.orig/Makefile.in 2013-08-26 19:00:44.000000000 +0200 ++++ cairo-1.12.16/Makefile.in 2014-02-10 14:44:58.000000000 +0100 +@@ -80,7 +80,7 @@ EXTRA_PROGRAMS = + TESTS = + check_PROGRAMS = + # libpng is required for our test programs +-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf ++@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ +@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src + # $(srcdir)/build/Makefile.win32.features-h \ + # $(NULL) + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} +-DIST_SUBDIRS = src doc util boilerplate test perf ++DIST_SUBDIRS = src doc util boilerplate perf + SUBDIRS = src doc util $(am__append_1) + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ |