summaryrefslogtreecommitdiffstats
path: root/x11-libs/cairo
diff options
context:
space:
mode:
authorGeorge Sherwood2010-09-11 11:37:10 -0500
committerGeorge Sherwood2010-09-11 11:37:10 -0500
commitfee1927568e4ad6146e610a2d6e2e7f672cc1c0b (patch)
tree14c016cd2ee5bf41edac93dd0c80709d30f1d043 /x11-libs/cairo
parent48b66b592c524bc1840e26032443f38f67a3683f (diff)
cairo: Updated to version 1.10.0. I haven't seen any issues with
this update.
Diffstat (limited to 'x11-libs/cairo')
-rwxr-xr-xx11-libs/cairo/DETAILS10
-rw-r--r--x11-libs/cairo/HISTORY5
-rwxr-xr-xx11-libs/cairo/PRE_BUILD5
-rw-r--r--x11-libs/cairo/libpng14.patch12
4 files changed, 10 insertions, 22 deletions
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 1c338a4f4f..870fe5bd71 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,13 +1,13 @@
SPELL=cairo
if [[ $CAIRO_DEVEL == y ]]; then
- VERSION=1.9.14
- SOURCE_HASH=sha512:c38556c9ad0e2db9e627a40a02050ad6d459b5d53ea8b827304a3898623215d0c65bcfab94b5eef13d8acc20d041e4d708a04c13a9936111577954b0ce626d73
+ VERSION=1.10.0
+ SOURCE_HASH=sha512:5595e15dcfbf67f0c148bb9587472d2125be3eb524491f9780098b1303e9a08d3431a07cbccffb9601be0852d05c4a6f7cfc71c4fa13f7972b457e2f8a5b10f6
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://cairographics.org/snapshots/$SOURCE
+ SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=1.8.8
- SOURCE_HASH=sha512:74d94e7239b1b4e3f4db9cc59fa44145838b13ad56e32b7bc165d62c8841f7e4c9b86e52e182b5b2811e6e034cf794fc7478a24828ed0d16f1fa4a9180c50d25
+ VERSION=1.10.0
+ SOURCE_HASH=sha512:5595e15dcfbf67f0c148bb9587472d2125be3eb524491f9780098b1303e9a08d3431a07cbccffb9601be0852d05c4a6f7cfc71c4fa13f7972b457e2f8a5b10f6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f6933d437b..1b550d52d1 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2010-09-10 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated devel and stable to 1.10.0
+ * libpng14.patch: removed, no longer needed
+ * PRE_BUILD: removed, no longer needed
+
2010-08-21 Bor Kraljič <pyrobor@ver.si>
* PRE_BUILD: apply the patch if VERSION is 1.8.8
* libpng14.patch: added to compile with libpng 1.4*. Based on upstream patch:
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
deleted file mode 100755
index a3184fd536..0000000000
--- a/x11-libs/cairo/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
-if [[ $VERSION == "1.8.8" ]]; then
- patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libpng14.patch
-fi
diff --git a/x11-libs/cairo/libpng14.patch b/x11-libs/cairo/libpng14.patch
deleted file mode 100644
index 1cd4a3c636..0000000000
--- a/x11-libs/cairo/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -161,7 +161,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
- AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
- if test "x$png_REQUIRES" = x; then
- # libpng13 is GnuWin32's libpng-1.2.8 :-(
-- for l in libpng12 libpng13 libpng10 ; do
-+ for l in libpng12 libpng13 libpng10 libpng ; do
- if $PKG_CONFIG --exists $l ; then
- png_REQUIRES=$l
- use_png=yes