[Erp5-report] r42318 kazuhiko - in /erp5/trunk/buildout: profiles/ software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Jan 13 23:13:31 2011
New Revision: 42318

URL: http://svn.erp5.org?rev=42318&view=rev
Log:
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.

Modified:
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/libpng.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=42318&r1=42317&r2=42318&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Thu Jan 13 23:13:31 2011
@@ -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

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=42318&r1=42317&r2=42318&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Thu Jan 13 23:13:31 2011
@@ -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

Modified: erp5/trunk/buildout/software-profiles/libpng.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/libpng.cfg?rev=42318&r1=42317&r2=42318&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/libpng.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/libpng.cfg [utf8] Thu Jan 13 23:13:31 2011
@@ -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

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=42318&r1=42317&r2=42318&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Jan 13 23:13:31 2011
@@ -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',