Commit 89c6ecec authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

libreoffice 3.4 depends on libXinerama.

parent 85b0a08b
...@@ -11,7 +11,7 @@ parts = ...@@ -11,7 +11,7 @@ parts =
libXdmcp libXdmcp
libXext libXext
libXau libXau
libX11 libXinerama
[xorg-aclocal] [xorg-aclocal]
ACLOCAL=${xorg-util-macros:location}/share/aclocal ACLOCAL=${xorg-util-macros:location}/share/aclocal
...@@ -156,3 +156,16 @@ configure-options = ...@@ -156,3 +156,16 @@ configure-options =
--disable-static --disable-static
--without-xmlto --without-xmlto
--without-fop --without-fop
[xineramaproto]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/proto/xineramaproto-1.2.tar.bz2
md5sum = a8aadcb281b9c11a91303e24cdea45f5
[libXinerama]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
md5sum = ecd4839ad01f6f637c6fb5327207f89b
environment =
PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
...@@ -23,4 +23,4 @@ link_binary_list = ...@@ -23,4 +23,4 @@ link_binary_list =
${pdftk:location}/bin/pdftk ${pdftk:location}/bin/pdftk
environment = environment =
LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib
...@@ -33,6 +33,6 @@ module = cloudooo ...@@ -33,6 +33,6 @@ module = cloudooo
# Default template for erp5 instance. # Default template for erp5 instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = 3a046c40b2f7cafc95d9a81c0cb171c8 md5sum = b626cb087d45d05983ee52d9f69a8981
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
...@@ -74,7 +74,7 @@ link_binary_list = ...@@ -74,7 +74,7 @@ link_binary_list =
# availability in software's eggs # availability in software's eggs
products = ${products:list} products = ${products:list}
environment = environment =
LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib
bt5_repository_list = ${bt5-repository:list} bt5_repository_list = ${bt5-repository:list}
......
...@@ -28,7 +28,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal ...@@ -28,7 +28,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
# Default template for erp5 instance. # Default template for erp5 instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = a1d1052cd4dd537b4364f8cfcbb0ba50 md5sum = 947a4c3a46996587307e87816ee95aee
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
......
...@@ -30,7 +30,7 @@ parts = ...@@ -30,7 +30,7 @@ parts =
libXdmcp libXdmcp
libXext libXext
libXau libXau
libX11 libXinerama
# fonts # fonts
liberation-fonts liberation-fonts
......
...@@ -112,7 +112,7 @@ parts = ...@@ -112,7 +112,7 @@ parts =
libXdmcp libXdmcp
libXext libXext
libXau libXau
libX11 libXinerama
# fonts # fonts
liberation-fonts liberation-fonts
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment