diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-02-08 17:59:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-02-08 17:59:31 +0100 |
| commit | 10ba297103cedbe0e94c857aaeccac189014c9ad (patch) | |
| tree | 2e25db3e0e437141620d2c26268e803dbab9b79e /package/cairo | |
| parent | 28fd0eecb3646a7ffcc0db63374797a3787cdf09 (diff) | |
update pango and all dependencies
Diffstat (limited to 'package/cairo')
| -rw-r--r-- | package/cairo/Makefile | 6 | ||||
| -rw-r--r-- | package/cairo/patches/patch-build_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/cairo/patches/patch-configure | 11 |
3 files changed, 4 insertions, 24 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile index de4bad1ce..5cf30d57d 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.10.2 +PKG_VERSION:= 1.12.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f +PKG_MD5SUM:= 9f7315e54885c735dcfdabe77f322d30 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SUBPKGS:= CAIRO CAIRO_DEV PKGSC_CAIRO_DEV:= devel PKGSD_CAIRO_DEV:= cairo headers diff --git a/package/cairo/patches/patch-build_ltmain_sh b/package/cairo/patches/patch-build_ltmain_sh deleted file mode 100644 index d79eba50b..000000000 --- a/package/cairo/patches/patch-build_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-configure b/package/cairo/patches/patch-configure deleted file mode 100644 index 91e1f8cd4..000000000 --- a/package/cairo/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- cairo-1.10.2.orig/configure 2010-12-25 15:22:57.000000000 +0100 -+++ cairo-1.10.2/configure 2011-07-23 14:58:11.293924415 +0200 -@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \ - MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ - -erroff=E_ENUM_TYPE_MISMATCH_OP" - --MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" -+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - |