diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/cairo | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cairo')
| -rw-r--r-- | package/cairo/patches/patch-build_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/cairo/patches/patch-src_cairo-features_h | 15 |
2 files changed, 26 insertions, 0 deletions
diff --git a/package/cairo/patches/patch-build_ltmain_sh b/package/cairo/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..d79eba50b --- /dev/null +++ b/package/cairo/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- cairo-1.8.10.orig/build/ltmain.sh 2010-02-20 00:39:43.000000000 +0100 ++++ cairo-1.8.10/build/ltmain.sh 2011-01-14 20:17:40.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/cairo/patches/patch-src_cairo-features_h b/package/cairo/patches/patch-src_cairo-features_h new file mode 100644 index 000000000..6466deec7 --- /dev/null +++ b/package/cairo/patches/patch-src_cairo-features_h @@ -0,0 +1,15 @@ +--- cairo-1.8.10.orig/src/cairo-features.h 2010-02-19 22:34:38.000000000 +0100 ++++ cairo-1.8.10/src/cairo-features.h 2011-01-14 20:12:28.000000000 +0100 +@@ -10,11 +10,11 @@ + #define CAIRO_HAS_SVG_SURFACE 1 + #define CAIRO_HAS_USER_FONT 1 + #define CAIRO_HAS_XLIB_SURFACE 1 +-#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1 + + /*#undef CAIRO_HAS_QUARTZ_FONT */ + /*#undef CAIRO_HAS_QUARTZ_SURFACE */ + /*#undef CAIRO_HAS_WIN32_FONT */ + /*#undef CAIRO_HAS_WIN32_SURFACE */ ++/*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */ + + #endif |