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
Roque
slapos
Commits
46066d9f
Commit
46066d9f
authored
Sep 16, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update firefox and opera components
parent
43364ef8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
52 deletions
+49
-52
component/firefox/buildout.cfg
component/firefox/buildout.cfg
+48
-51
component/opera/buildout.cfg
component/opera/buildout.cfg
+1
-1
No files found.
component/firefox/buildout.cfg
View file @
46066d9f
...
@@ -9,15 +9,14 @@ extends =
...
@@ -9,15 +9,14 @@ extends =
../perl/buildout.cfg
../perl/buildout.cfg
parts =
parts =
firefox-bin
firefox
firefox
[firefox
-bin
]
[firefox]
recipe = slapos.recipe.build
recipe = slapos.recipe.build
slapos_promise =
slapos_promise =
file:firefox
file:firefox
file:firefox-bin
file:firefox-bin
file:firefox-
wrapper
file:firefox-
slapos
x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-i686/en-US/firefox-6.0.2.tar.bz2 d3334d1c4f7c94d0ec2b2d76f6d720d0
x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-i686/en-US/firefox-6.0.2.tar.bz2 d3334d1c4f7c94d0ec2b2d76f6d720d0
x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-x86_64/en-US/firefox-6.0.2.tar.bz2 13df923c0fbc40da0af4d3147da8ec2f
x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/linux-x86_64/en-US/firefox-6.0.2.tar.bz2 13df923c0fbc40da0af4d3147da8ec2f
...
@@ -26,54 +25,52 @@ script =
...
@@ -26,54 +25,52 @@ script =
extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
workdir = guessworkdir(extract_dir)
workdir = guessworkdir(extract_dir)
self.copyTree(workdir, "%(location)s")
self.copyTree(workdir, "%(location)s")
wrapper = open(os.path.join("%(location)s", "firefox-wrapper"), 'w')
wrapper_location = os.path.join("%(location)s", "firefox-slapos")
wrapper = open(wrapper_location, 'w')
wrapper.write("""#!/bin/sh
wrapper.write("""#!/bin/sh
export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:
${gtk-2:location}/lib:
%(location)s
export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:%(location)s
%(location)s/firefox""")
%(location)s/firefox""")
wrapper.close()
os.chmod(wrapper_location, 0766)
[libIDL]
#[libIDL]
recipe = hexagonit.recipe.cmmi
#recipe = hexagonit.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
#url = http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
#md5sum =
##md5sum =
environment =
#environment =
PKG_CONFIG_PATH=${bison:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig
# PKG_CONFIG_PATH=${bison:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig
LD_LIBRARY_PATH=${bison:location}/lib:${glib:location}/lib
# LD_LIBRARY_PATH=${bison:location}/lib:${glib:location}/lib
LD_RUN_PATH=${bison:location}/lib:${glib:location}/lib
# LD_RUN_PATH=${bison:location}/lib:${glib:location}/lib
PATH=${pkgconfig:location}/bin:${bison:location}/bin::${flex:location}/bin:%(PATH)s
# PATH=${pkgconfig:location}/bin:${bison:location}/bin::${flex:location}/bin:%(PATH)s
#
[firefox-cairo-patch]
#[firefox]
recipe = hexagonit.recipe.download
#recipe = hexagonit.recipe.cmmi
url = http://svnweb.mageia.org/packages/cauldron/xulrunner/current/SOURCES/xulrunner-2.0-system-cairo.patch?revision=43415&view=co&pathrev=60536
#url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/source/firefox-6.0.2.source.tar.bz2
download-only = true
##patches =
filename = cairo.patch
## ${firefox-cairo-patch:location}/${firefox-cairo-patch:filename}
#configure-options =
[firefox]
# --enable-system-cairo
recipe = hexagonit.recipe.cmmi
# --disable-webm
url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/6.0.2/source/firefox-6.0.2.source.tar.bz2
# --disable-ogg
#patches =
# --disable-wave
# ${firefox-cairo-patch:location}/${firefox-cairo-patch:filename}
# --disable-gnomevfs
configure-options =
# --disable-gconf
--enable-system-cairo
# --disable-cache
--disable-webm
# --disable-libnotify
--disable-ogg
# --disable-gnomeui
--disable-wave
# --disable-accessibility
--disable-gnomevfs
# --disable-printing
--disable-gconf
# --disable-crashreporter
--disable-libnotify
# --disable-libjpeg-turbo
--disable-gnomeui
# --disable-updater
--disable-accessibility
# --disable-javaxpcom
--disable-printing
# --disable-necko-disk-cache
--disable-crashreporter
# --disable-necko-wifi
--disable-libjpeg-turbo
# --disable-angle
--disable-updater
# --disable-tests
--disable-javaxpcom
#environment =
--disable-necko-disk-cache
# PATH=${perl:location}/bin:${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
--disable-necko-wifi
# PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libIDL:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
--disable-angle
# CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXt:location}/include -I${libXext:location}/include -I${xextproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${mesa:location}/include -I${libICE:location}/include -I${kbproto:location}/include -I${xtrans:location}/include -I${fontconfig:location}/include/ -I${freetype:location}/include/ -I${freetype:location}/include/freetype2 -I${cairo:location}/include/cairo -I${libSM:location}/include/ -I${xorg-libpthread-stubs:location}/include -I${pango:location}/include/pango-1.0 -I${gdk-pixbuf:location}/include/gdk-pixbuf-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${gtk-2:location}/lib/gtk-2.0/include -I${atk:location}/include/atk-1.0 -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${dbus-glib:location}/include
--disable-tests
# LDFLAGS=-L${gettext:location}/lib -L${libX11:location}/lib -L${xproto:location}/lib -L${libXt:location}/lib -L${libXext:location}/lib -L${xextproto:location}/lib -L${libXrender:location}/lib -L${render:location}/lib -L${mesa:location}/lib -L${libICE:location}/lib -L${kbproto:location}/lib -L${xtrans:location}/lib -L${fontconfig:location}/lib/ -L${freetype:location}/lib/ -L${freetype:location}/lib/freetype2 -L${cairo:location}/lib/cairo -L${libSM:location}/lib/ -L${xorg-libpthread-stubs:location}/lib -L${pango:location}/lib/pango-1.0 -L${gdk-pixbuf:location}/lib/gdk-pixbuf-2.0 -L${glib:location}/lib/glib-2.0 -L${glib:location}/lib/gio-unix-2.0 -L${glib:location}/lib/glib-2.0/lib -L${gtk-2:location}/lib/gtk-2.0 -L${gtk-2:location}/lib/gtk-2.0/lib -L${atk:location}/lib/atk-1.0 -L${libdrm:location}/lib/libdrm -L${libdrm:location}/lib -L${dbus-glib:location}/lib -L${libIDL:location}/lib -ldl -lX11
environment =
# LD_LIBRARY_PATH=${libIDL:location}/lib:${glib:location}/lib:${gettext:location}/lib:${gtk-2:location}/lib:${cairo:location}/lib:${pango:location}/lib:${libpng:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${pixman:location}/lib:${libXt:location}/lib:${dbus:location}/lib:${mesa:location}/lib
PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${gtk-2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libIDL:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXt:location}/include -I${libXext:location}/include -I${xextproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${mesa:location}/include -I${libIce:location}/include -I${kbproto:location}/include -I${xtrans:location}/include -I${fontconfig:location}/include/ -I${freetype:location}/include/ -I${freetype:location}/include/freetype2 -I${cairo:location}/include/cairo -I${libSM:location}/include/ -I${xorg-libpthread-stubs:location}/include -I${pango:location}/include/pango-1.0 -I${gdk-pixbuf:location}/include/gdk-pixbuf-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${gtk-2:location}/lib/gtk-2.0/include -I${atk:location}/include/atk-1.0 -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${dbus-glib:location}/include
LDFLAGS=-L${gettext:location}/lib -L${libX11:location}/lib -L${xproto:location}/lib -L${libXt:location}/lib -L${libXext:location}/lib -L${xextproto:location}/lib -L${libXrender:location}/lib -L${render:location}/lib -L${mesa:location}/lib -L${libIce:location}/lib -L${kbproto:location}/lib -L${xtrans:location}/lib -L${fontconfig:location}/lib/ -L${freetype:location}/lib/ -L${freetype:location}/lib/freetype2 -L${cairo:location}/lib/cairo -L${libSM:location}/lib/ -L${xorg-libpthread-stubs:location}/lib -L${pango:location}/lib/pango-1.0 -L${gdk-pixbuf:location}/lib/gdk-pixbuf-2.0 -L${glib:location}/lib/glib-2.0 -L${glib:location}/lib/gio-unix-2.0 -L${glib:location}/lib/glib-2.0/lib -L${gtk-2:location}/lib/gtk-2.0 -L${gtk-2:location}/lib/gtk-2.0/lib -L${atk:location}/lib/atk-1.0 -L${libdrm:location}/lib/libdrm -L${libdrm:location}/lib -L${dbus-glib:location}/lib -lX11
LD_LIBRARY_PATH=${libIDL:location}/lib:${glib:location}/lib:${gettext:location}/lib:${gtk-2:location}/lib:${cairo:location}/lib:${pango:location}/lib:${libpng:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${pixman:location}/lib:${libXt:location}/lib:${dbus:location}/lib:${mesa:location}/lib
component/opera/buildout.cfg
View file @
46066d9f
...
@@ -26,7 +26,7 @@ script =
...
@@ -26,7 +26,7 @@ script =
wrapper = open(wrapper_location, 'w')
wrapper = open(wrapper_location, 'w')
wrapper.write("""#!/bin/sh
wrapper.write("""#!/bin/sh
cd %(location)s
cd %(location)s
export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libI
ce
:location}/lib:%(location)s
export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libI
CE
:location}/lib:%(location)s
export PATH=${fontconfig:location}/bin:$PATH
export PATH=${fontconfig:location}/bin:$PATH
%(location)s/opera $*""")
%(location)s/opera $*""")
wrapper.close()
wrapper.close()
...
...
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