diff options
| author | Remko van der Vossen | 2010-08-21 14:02:05 +0200 |
|---|---|---|
| committer | Remko van der Vossen | 2010-08-21 14:02:05 +0200 |
| commit | adef43a9ad57e61644ba12a78fd29c50a7976758 (patch) | |
| tree | 128fb9a4e0601c61bde18d86f0657dbf77b12cd7 /x11-libs/cairo | |
| parent | 8815a165ef1564188a10fa32bb8de6b7c82a083b (diff) | |
| parent | 3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47 (diff) | |
Merge branch 'master' into devel-libpng
Diffstat (limited to 'x11-libs/cairo')
| -rw-r--r-- | x11-libs/cairo/HISTORY | 5 | ||||
| -rwxr-xr-x | x11-libs/cairo/PRE_BUILD | 5 | ||||
| -rw-r--r-- | x11-libs/cairo/libpng14.patch | 12 |
3 files changed, 22 insertions, 0 deletions
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index ab51ff5844..471a026d53 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,8 @@ +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: + http://cgit.freedesktop.org/cairo/patch/?id=0a5ec9802a39dee240a1a3476af1ef8a7db9b6b3 + 2010-08-17 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated devel to version 1.9.14 * PRE_SUB_DEPENDS: Added option for devel version diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD new file mode 100755 index 0000000000..a3184fd536 --- /dev/null +++ b/x11-libs/cairo/PRE_BUILD @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..1cd4a3c636 --- /dev/null +++ b/x11-libs/cairo/libpng14.patch @@ -0,0 +1,12 @@ +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 |