summaryrefslogtreecommitdiff
path: root/package/cairo
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:34:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:34:13 +0100
commit902ee7e7b23751ca7a8264d36a837aa4aae12032 (patch)
tree56c6b37cd9afd91d176cd75acb77bf32ccd20378 /package/cairo
parent3d45df344602687c8983f5fb609721aa8ca2469f (diff)
parent52dbdcd1045c7a8ad96753593540719cff9f8863 (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_sh11
-rw-r--r--package/cairo/patches/patch-src_cairo-features_h15
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