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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
b3268d89
Commit
b3268d89
authored
Mar 18, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up : LibreOffice 3.5.1. remove temporary workaround for 3.5.0 bug.
parent
87d0ef13
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
component/libreoffice-bin/buildout.cfg
component/libreoffice-bin/buildout.cfg
+3
-10
No files found.
component/libreoffice-bin/buildout.cfg
View file @
b3268d89
...
...
@@ -13,12 +13,12 @@ find-links =
[libreoffice-bin]
recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
version = 3.5.
0
version = 3.5.
1
url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
# supported architectures md5sums
md5sum_x86 =
72421e3d6ab619b50ea941ab369bd0d4
md5sum_x86-64 =
2ed879f33f225faff9b0b4b7a1c94155
md5sum_x86 =
ee46fdafb8361b8e131994508c2723b3
md5sum_x86-64 =
ddda58719358e5c97ca5d1c118646574
# where office code can be found?
officedir = libreoffice3.5
...
...
@@ -44,13 +44,6 @@ script =
# backward compatibility for cloudooo configuration
os.mkdir(os.path.join(location, 'basis-link'))
os.symlink(os.path.join('..', 'program'), os.path.join(location, 'basis-link', 'program'))
# temporary workaround for https://bugs.freedesktop.org/show_bug.cgi?id=45696
# copy GCC 4.5's libgcc_s.so and libstdc++.so to ure/lib directory.
ARCH_LIBDIR_MAP = { 'x86': 'lib', 'x86-64': 'lib64' }
os.unlink(os.path.join(location, 'ure', 'lib', 'libgcc_s.so.1'))
os.symlink(os.path.join('${:gcc_4_5_location}', ARCH_LIBDIR_MAP[platform], 'libgcc_s.so.1'), os.path.join(location, 'ure', 'lib', 'libgcc_s.so.1'))
os.unlink(os.path.join(location, 'ure', 'lib', 'libstdc++.so.6'))
os.symlink(os.path.join('${:gcc_4_5_location}', ARCH_LIBDIR_MAP[platform], 'libstdc++.so.6'), os.path.join(location, 'ure', 'lib', 'libstdc++.so.6'))
# helper binaries
cpio = ${cpio:location}/bin/cpio
...
...
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