From 9c6e85d96f34e906e0a2a66559f16838996541d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 23 Feb 2015 12:00:01 -0700 Subject: [PATCH 1/3] Upgrade zlib --- pkgs/zlib/zlib.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/zlib/zlib.yaml b/pkgs/zlib/zlib.yaml index 7921ddb5a..38c2d1cc4 100644 --- a/pkgs/zlib/zlib.yaml +++ b/pkgs/zlib/zlib.yaml @@ -1,8 +1,9 @@ extends: [autotools_package] sources: -- url: http://downloads.sourceforge.net/project/libpng/zlib/1.2.7/zlib-1.2.7.tar.bz2 - key: tar.bz2:jhroszmn7mbwsag2n2qcm6ttp6r4j3xg +- key: tar.gz:gzsyzn3iuvgb2tpmipbrc3bh5wet5cfq + url: http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz + build_stages: From 7d275e33632afccba9535be4c45030d742f790b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 23 Feb 2015 12:00:19 -0700 Subject: [PATCH 2/3] Upgrade libpng --- pkgs/png.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/png.yaml b/pkgs/png.yaml index 8760164de..86b3a3af6 100644 --- a/pkgs/png.yaml +++ b/pkgs/png.yaml @@ -4,8 +4,8 @@ dependencies: run: [zlib] sources: -- url: http://sourceforge.net/projects/libpng/files/libpng16/older-releases/1.6.6/libpng-1.6.6.tar.gz - key: tar.gz:dj4va2fjpzsuvcl3usxe76jiywh6phjz +- key: tar.gz:43flhdyfdp6gneu6ozwb4z7lu35pvspa + url: http://sourceforge.net/projects/libpng/files/libpng16/older-releases/1.6.14/libpng-1.6.14.tar.gz when_build_dependency: - prepend_path: PKG_CONFIG_PATH From db70dfca6dba648ed38c7e64bbcb78326a4b097b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 23 Feb 2015 12:00:34 -0700 Subject: [PATCH 3/3] Pixman must depend on zlib explicitly Fixes #670 --- pkgs/pixman.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/pixman.yaml b/pkgs/pixman.yaml index 412c7cec6..b34dc2384 100644 --- a/pkgs/pixman.yaml +++ b/pkgs/pixman.yaml @@ -1,7 +1,7 @@ extends: [autotools_package] dependencies: - build: [pkg-config, png] + build: [pkg-config, png, zlib] run: [pkg-config] defaults: