Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
slapos
Commits
98ed5440
Commit
98ed5440
authored
Feb 16, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LibreOffice 3.5.0 depends on libpng12 and libXrender, but not depends on libXinerama.
parent
05b1c214
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
22 deletions
+33
-22
component/libpng/buildout.cfg
component/libpng/buildout.cfg
+6
-0
component/xorg/buildout.cfg
component/xorg/buildout.cfg
+17
-16
software/cloudooo/instance.cfg
software/cloudooo/instance.cfg
+1
-1
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+1
-1
software/erp5/instance-cloudooo.cfg
software/erp5/instance-cloudooo.cfg
+1
-1
software/erp5/software.cfg
software/erp5/software.cfg
+1
-1
stack/cloudooo.cfg
stack/cloudooo.cfg
+3
-1
stack/erp5.cfg
stack/erp5.cfg
+3
-1
No files found.
component/libpng/buildout.cfg
View file @
98ed5440
...
@@ -3,6 +3,7 @@ extends =
...
@@ -3,6 +3,7 @@ extends =
../zlib/buildout.cfg
../zlib/buildout.cfg
parts =
parts =
libpng12
libpng
libpng
[libpng-common]
[libpng-common]
...
@@ -13,6 +14,11 @@ environment =
...
@@ -13,6 +14,11 @@ environment =
CPPFLAGS =-I${zlib:location}/include
CPPFLAGS =-I${zlib:location}/include
LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
[libpng12]
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.2.46.tar.bz2
md5sum = e8b43dc78ef95b3949af7f961d76874b
[libpng]
[libpng]
<= libpng-common
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.5.5.tar.bz2
url = http://download.sourceforge.net/libpng/libpng-1.5.5.tar.bz2
...
...
component/xorg/buildout.cfg
View file @
98ed5440
...
@@ -12,8 +12,8 @@ parts =
...
@@ -12,8 +12,8 @@ parts =
libXdmcp
libXdmcp
libXext
libXext
libXau
libXau
libXinerama
libSM
libSM
libXrender
[xorg-aclocal]
[xorg-aclocal]
ACLOCAL=${xorg-util-macros:location}/share/aclocal
ACLOCAL=${xorg-util-macros:location}/share/aclocal
...
@@ -155,21 +155,6 @@ configure-options =
...
@@ -155,21 +155,6 @@ configure-options =
--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=${xorg-util-macros:location}/share/pkgconfig:${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
configure-options =
--disable-static
[libICE]
[libICE]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
...
@@ -194,3 +179,19 @@ environment =
...
@@ -194,3 +179,19 @@ environment =
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
LIBUUID_CFLAGS=-I${libuuid:location}/include
LIBUUID_CFLAGS=-I${libuuid:location}/include
[renderproto]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/proto/renderproto-0.11.1.tar.bz2
md5sum = a914ccc1de66ddeb4b611c6b0686e274
[libXrender]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXrender-0.9.6.tar.bz2
md5sum = 3b3b7d076c2384b6c600c0b5f4ba971f
configure-options =
--disable-static
environment =
PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${libX11:location}/include -I${renderproto:location}/include -I${xproto:location}/include
software/cloudooo/instance.cfg
View file @
98ed5440
...
@@ -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:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${lib
SM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb
:location}/lib:${zlib:location}/lib
LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${lib
png12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender
:location}/lib:${zlib:location}/lib
software/cloudooo/software.cfg
View file @
98ed5440
...
@@ -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 =
2a38a928deb5870e02a8271b34341f5b
md5sum =
49da453a38dc5462c170747a029037b7
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
software/erp5/instance-cloudooo.cfg
View file @
98ed5440
...
@@ -27,7 +27,7 @@ wrapper = $${basedirectory:services}/cloudooo
...
@@ -27,7 +27,7 @@ wrapper = $${basedirectory:services}/cloudooo
data-directory = $${directory:cloudooo-data}
data-directory = $${directory:cloudooo-data}
environment =
environment =
LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${lib
SM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb
:location}/lib:${zlib:location}/lib
LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${lib
png12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender
:location}/lib:${zlib:location}/lib
FONTCONFIG_FILE = $${fontconfig-instance:conf-path}
FONTCONFIG_FILE = $${fontconfig-instance:conf-path}
# Binary information
# Binary information
...
...
software/erp5/software.cfg
View file @
98ed5440
...
@@ -66,7 +66,7 @@ mode = 0644
...
@@ -66,7 +66,7 @@ mode = 0644
[template-cloudooo]
[template-cloudooo]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-cloudooo.cfg
url = ${:_profile_base_location_}/instance-cloudooo.cfg
md5sum =
8ea2839e951f26af2bc74b9a8c0fa5c2
md5sum =
e7698a0537785339e249bdc57f369e93
output = ${buildout:directory}/template-cloudooo.cfg
output = ${buildout:directory}/template-cloudooo.cfg
mode = 0644
mode = 0644
...
...
stack/cloudooo.cfg
View file @
98ed5440
...
@@ -10,6 +10,7 @@ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
...
@@ -10,6 +10,7 @@ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
extends =
extends =
../component/libreoffice-bin/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/libpng/buildout.cfg
../component/lxml-python/buildout.cfg
../component/lxml-python/buildout.cfg
../component/python-2.6/buildout.cfg
../component/python-2.6/buildout.cfg
../component/python-2.7/buildout.cfg
../component/python-2.7/buildout.cfg
...
@@ -30,14 +31,15 @@ parts =
...
@@ -30,14 +31,15 @@ parts =
libXdmcp
libXdmcp
libXext
libXext
libXau
libXau
libXinerama
libSM
libSM
libXrender
# fonts
# fonts
liberation-fonts
liberation-fonts
ipaex-fonts
ipaex-fonts
# Dependencies
# Dependencies
libpng12
imagemagick
imagemagick
file
file
xpdf
xpdf
...
...
stack/erp5.cfg
View file @
98ed5440
...
@@ -45,6 +45,7 @@ extends =
...
@@ -45,6 +45,7 @@ extends =
../component/hookbox/buildout.cfg
../component/hookbox/buildout.cfg
../component/imagemagick/buildout.cfg
../component/imagemagick/buildout.cfg
../component/kumo/buildout.cfg
../component/kumo/buildout.cfg
../component/libpng/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/lxml-python/buildout.cfg
../component/lxml-python/buildout.cfg
../component/percona-toolkit/buildout.cfg
../component/percona-toolkit/buildout.cfg
...
@@ -89,6 +90,7 @@ parts =
...
@@ -89,6 +90,7 @@ parts =
stunnel
stunnel
w3m
w3m
poppler
poppler
libpng12
libpng
libpng
ghostscript
ghostscript
mariadb
mariadb
...
@@ -119,8 +121,8 @@ parts =
...
@@ -119,8 +121,8 @@ parts =
libXdmcp
libXdmcp
libXext
libXext
libXau
libXau
libXinerama
libSM
libSM
libXrender
# fonts
# fonts
liberation-fonts
liberation-fonts
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment