From 641242fe46a4e1ea3a14a10809ffa8f520a7be51 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 13 Jan 2011 22:13:31 +0000 Subject: [PATCH] build old libpng version so that we can forcibly use it by specifying LD_LIBRARY_PATH in a binary software (like OpenOffice.org) that links to libpng12.so. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42318 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/profiles/official-2.12.cfg | 2 ++ buildout/profiles/official.cfg | 2 ++ buildout/software-profiles/libpng.cfg | 15 ++++++++++++--- buildout/tests/assertSoftware.py | 18 ++++++++++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/buildout/profiles/official-2.12.cfg b/buildout/profiles/official-2.12.cfg index 33c530b9d2..18cde0ccdb 100644 --- a/buildout/profiles/official-2.12.cfg +++ b/buildout/profiles/official-2.12.cfg @@ -17,6 +17,7 @@ extends = ../software-profiles/kumo.cfg ../software-profiles/ghostscript.cfg ../software-profiles/libevent.cfg + ../software-profiles/libpng.cfg ../software-profiles/libtool.cfg ../software-profiles/mariadb.cfg ../software-profiles/memcached.cfg @@ -48,6 +49,7 @@ parts = stunnel w3m xpdf + libpng12 ghostscript mysql-tritonn-5.0 mariadb diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg index 26744fe5d5..aa1d5a7fda 100644 --- a/buildout/profiles/official.cfg +++ b/buildout/profiles/official.cfg @@ -17,6 +17,7 @@ extends = ../software-profiles/kumo.cfg ../software-profiles/ghostscript.cfg ../software-profiles/libevent.cfg + ../software-profiles/libpng.cfg ../software-profiles/libtool.cfg ../software-profiles/mariadb.cfg ../software-profiles/memcached.cfg @@ -49,6 +50,7 @@ parts = stunnel w3m xpdf + libpng12 ghostscript mysql-tritonn-5.0 mariadb diff --git a/buildout/software-profiles/libpng.cfg b/buildout/software-profiles/libpng.cfg index 31083fd018..0c86508083 100644 --- a/buildout/software-profiles/libpng.cfg +++ b/buildout/software-profiles/libpng.cfg @@ -3,12 +3,21 @@ extends = ../software-profiles/zlib.cfg parts = + libpng12 libpng -[libpng] +[libpng-common] recipe = hexagonit.recipe.cmmi -url = http://download.sourceforge.net/libpng/libpng-1.4.5.tar.bz2 -md5sum = d500e117e4a08d5ca3bd51dca0a0bc5f environment = CPPFLAGS =-I${zlib:location}/include LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib + +[libpng12] +<= libpng-common +url = http://download.sourceforge.net/libpng/libpng-1.2.44.tar.bz2 +md5sum = e3ac7879d62ad166a6f0c7441390d12b + +[libpng] +<= libpng-common +url = http://download.sourceforge.net/libpng/libpng-1.4.5.tar.bz2 +md5sum = d500e117e4a08d5ca3bd51dca0a0bc5f diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index d6d94230be..387d3cdd5c 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -1770,6 +1770,22 @@ class AssertLibjpeg(AssertSoftwareMixin): ], []) class AssertLibpng(AssertSoftwareMixin): + def test_ld_libpng12(self): + self.assertLibraryList('parts/libpng12/lib/libpng12.so',[ + 'libc', + 'libm', + 'libz', + ], [ + 'zlib', + ]) + self.assertLibraryList('parts/libpng12/lib/libpng.so',[ + 'libc', + 'libm', + 'libz', + ], [ + 'zlib', + ]) + def test_ld_libpng14(self): self.assertLibraryList('parts/libpng/lib/libpng14.so',[ 'libc', @@ -1778,8 +1794,6 @@ class AssertLibpng(AssertSoftwareMixin): ], [ 'zlib', ]) - - def test_ld_libpng(self): self.assertLibraryList('parts/libpng/lib/libpng.so',[ 'libc', 'libm', -- 2.30.9