projects
/
hvlinux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80ded7d
)
Déplacé Evince au stage 5 (ne requiert pas Gnome)
author
gobo72
<gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Wed, 24 Aug 2011 00:09:18 +0000
(
00:09
+0000)
committer
gobo72
<gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Wed, 24 Aug 2011 00:09:18 +0000
(
00:09
+0000)
config/dependencies
patch
|
blob
|
history
config/packages-list
patch
|
blob
|
history
stage5/hv-install-1
patch
|
blob
|
history
stage5/packages-update
patch
|
blob
|
history
stage6/hv-install-1
patch
|
blob
|
history
stage6/packages-update
patch
|
blob
|
history
diff --git
a/config/dependencies
b/config/dependencies
index
710c58f
..
a43d85b
100644
(file)
--- a/
config/dependencies
+++ b/
config/dependencies
@@
-33,7
+33,7
@@
${JASPER}: ${LIBJPEG} ${XORG} ${MESALIB}
${GHOSTSCRIPT}: ${LIBJPEG} ${LIBPNG} ${JASPER} ${GTK} ${XORG}
${POPPLER}: ${FONTCONFIG} ${LIBJPEG} ${CAIRO} ${GLIB} ${LIBOPENJPEG}
${GHOSTSCRIPT}: ${LIBJPEG} ${LIBPNG} ${JASPER} ${GTK} ${XORG}
${POPPLER}: ${FONTCONFIG} ${LIBJPEG} ${CAIRO} ${GLIB} ${LIBOPENJPEG}
-${EVINCE}: ${POPPLER} ${
LIBGNOMEUI} ${GNOME_ICON_THEME} ${GNOME_DOC_UTILS} ${TETEX_SRC
} ${GHOSTSCRIPT} ${T1LIB} ${LIBSPECTRE}
+${EVINCE}: ${POPPLER} ${
GNOME_ICON_THEME} ${TEXLIVE
} ${GHOSTSCRIPT} ${T1LIB} ${LIBSPECTRE}
${DBUS}: ${EXPAT} ${LIBXML2} ${XORG_LIBS}
${GLIB}: ${PCRE}
${DBUS}: ${EXPAT} ${LIBXML2} ${XORG_LIBS}
${GLIB}: ${PCRE}
diff --git
a/config/packages-list
b/config/packages-list
index
07f20f8
..
67105c9
100644
(file)
--- a/
config/packages-list
+++ b/
config/packages-list
@@
-132,7
+132,7
@@
LIBGNOMECANVAS="libgnomecanvas-2.26.0"
LIBBONOBOUI="libbonoboui-2.24.2"
GNOME_KEYRING="gnome-keyring-2.32.1"
ICON_NAMING_UTILS="icon-naming-utils-0.8.90"
LIBBONOBOUI="libbonoboui-2.24.2"
GNOME_KEYRING="gnome-keyring-2.32.1"
ICON_NAMING_UTILS="icon-naming-utils-0.8.90"
-GNOME_ICON_THEME="gnome-icon-theme-2.
28.0
"
+GNOME_ICON_THEME="gnome-icon-theme-2.
30.3
"
LIBGNOMEUI="libgnomeui-2.24.2"
LIBGAIL_GNOME="libgail-gnome-1.18.0"
LIBGNOMEUI="libgnomeui-2.24.2"
LIBGAIL_GNOME="libgail-gnome-1.18.0"
@@
-170,7
+170,7
@@
GIFLIB="giflib-4.1.6"
# Gnome Additional Packages - Utilities
GEDIT="gedit-2.18.2"
EOG="eog-2.18.2"
# Gnome Additional Packages - Utilities
GEDIT="gedit-2.18.2"
EOG="eog-2.18.2"
-EVINCE="evince-2.
28.2
"
+EVINCE="evince-2.
32.0
"
FILE_ROLLER="file-roller-2.18.4"
GCONF_EDITOR="gconf-editor-2.18.0"
GNOME_UTILS="gnome-utils-2.18.1"
FILE_ROLLER="file-roller-2.18.4"
GCONF_EDITOR="gconf-editor-2.18.0"
GNOME_UTILS="gnome-utils-2.18.1"
@@
-280,6
+280,7
@@
LIBSIGCPP="libsigc++-2.2.8"
LIBSNDFILE="libsndfile-1.0.23"
LIBSOUP="libsoup-2.32.2"
LIBSPF2="libspf2-1.2.5"
LIBSNDFILE="libsndfile-1.0.23"
LIBSOUP="libsoup-2.32.2"
LIBSPF2="libspf2-1.2.5"
+LIBSPECTRE="libspectre-0.2.6"
LIBTASN1="libtasn1-2.8"
LIBTHEORA="libtheora-1.1.1"
LIBTOOL="libtool-2.2.10"
LIBTASN1="libtasn1-2.8"
LIBTHEORA="libtheora-1.1.1"
LIBTOOL="libtool-2.2.10"
diff --git
a/stage5/hv-install-1
b/stage5/hv-install-1
index
c127016
..
6691ecc
100755
(executable)
--- a/
stage5/hv-install-1
+++ b/
stage5/hv-install-1
@@
-53,6
+53,7
@@
ipkg -m acnb ${CUPS}
ipkg -m noac ${CUPS_PDF}
ipkg -m noac ${SPLIX}
ipkg -m acnb ${GHOSTSCRIPT}
ipkg -m noac ${CUPS_PDF}
ipkg -m noac ${SPLIX}
ipkg -m acnb ${GHOSTSCRIPT}
+ipkg ${LIBSPECTRE}
if [ "x${INST_TYPE}" = "xworkstation" -o \
"x${INST_TYPE}" = "xltsp-server" ]; then
if [ "x${INST_TYPE}" = "xworkstation" -o \
"x${INST_TYPE}" = "xltsp-server" ]; then
@@
-89,8
+90,17
@@
ipkg -m pm ${PERL_MOD_PARSE_REDESCENT}
ipkg ${ICON_NAMING_UTILS}
ipkg ${TANGO_ICON_THEME}
ipkg ${TANGO_ICON_THEME_EXTRAS}
ipkg ${ICON_NAMING_UTILS}
ipkg ${TANGO_ICON_THEME}
ipkg ${TANGO_ICON_THEME_EXTRAS}
+ipkg ${GNOME_ICON_THEME}
if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+ ipkg ${EVINCE} "\
+ --without-keyring \
+ --disable-nautilus \
+ --disable-help \
+ --enable-pixbuf \
+ --enable-dvi \
+ --enable-t1lib"
+
# Audio
if [ "x${SOUND_CARD}" = "xyes" ]; then
# Needed by some packages, mostly audio applications.
# Audio
if [ "x${SOUND_CARD}" = "xyes" ]; then
# Needed by some packages, mostly audio applications.
diff --git
a/stage5/packages-update
b/stage5/packages-update
index
0aee6f3
..
5b334d7
100755
(executable)
--- a/
stage5/packages-update
+++ b/
stage5/packages-update
@@
-55,6
+55,7
@@
fpkg -m sf -e "tar.bz2" ${SPLIX}
fpkg -m sf ${GHOSTSCRIPT}
fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_STD}
fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
fpkg -m sf ${GHOSTSCRIPT}
fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_STD}
fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
+fpkg -e "tar.gz" ${LIBSPECTRE} "http://libspectre.freedesktop.org/releases"
fpkg ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
fpkg -m fd -s "none" ${POPPLER}
fpkg ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
fpkg -m fd -s "none" ${POPPLER}
@@
-84,6
+85,9
@@
fpkg ${ICON_NAMING_UTILS} "http://tango.freedesktop.org/releases"
fpkg ${TANGO_ICON_THEME} "http://tango.freedesktop.org/releases"
fpkg -e "tar.gz" ${TANGO_ICON_THEME_EXTRAS} \
"http://tango.freedesktop.org/releases"
fpkg ${TANGO_ICON_THEME} "http://tango.freedesktop.org/releases"
fpkg -e "tar.gz" ${TANGO_ICON_THEME_EXTRAS} \
"http://tango.freedesktop.org/releases"
+fpkg -m gnome ${GNOME_ICON_THEME}
+
+fpkg -m gnome ${EVINCE}
fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
fpkg -m sf ${GRIP}
fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
fpkg -m sf ${GRIP}
diff --git
a/stage6/hv-install-1
b/stage6/hv-install-1
index
3708f6d
..
c3ba2fa
100755
(executable)
--- a/
stage6/hv-install-1
+++ b/
stage6/hv-install-1
@@
-12,7
+12,6
@@
ipkg_gnome ${GNOME_MIME_DATA}
ipkg_gnome ${LIBGNOME}
ipkg_gnome ${LIBGNOMECANVAS}
ipkg_gnome ${LIBBONOBOUI}
ipkg_gnome ${LIBGNOME}
ipkg_gnome ${LIBGNOMECANVAS}
ipkg_gnome ${LIBBONOBOUI}
-ipkg ${GNOME_ICON_THEME}
##ipkg_gnome ${GNOME_KEYRING}
ipkg_gnome ${LIBGNOMEUI}
ipkg ${GNOME_THEMES}
##ipkg_gnome ${GNOME_KEYRING}
ipkg_gnome ${LIBGNOMEUI}
ipkg ${GNOME_THEMES}
@@
-52,7
+51,6
@@
ipkg ${GNOME_AUDIO}
ipkg_gnome ${EOG}
ipkg ${LIBSPECTRE}
ipkg_gnome ${EOG}
ipkg ${LIBSPECTRE}
-ipkg_gnome ${EVINCE}
ipkg_gnome ${FILE_ROLLER}
ipkg_gnome ${GCONF_EDITOR}
ipkg_gnome ${GNOME_UTILS}
ipkg_gnome ${FILE_ROLLER}
ipkg_gnome ${GCONF_EDITOR}
ipkg_gnome ${GNOME_UTILS}
diff --git
a/stage6/packages-update
b/stage6/packages-update
index
c50b9f4
..
db8583e
100755
(executable)
--- a/
stage6/packages-update
+++ b/
stage6/packages-update
@@
-16,7
+16,7
@@
fpkg -m gnome ${GNOME_VFS_MONIKERS}
fpkg -m gnome ${LIBGNOME}
fpkg -m gnome ${LIBGNOMECANVAS}
fpkg -m gnome ${LIBBONOBOUI}
fpkg -m gnome ${LIBGNOME}
fpkg -m gnome ${LIBGNOMECANVAS}
fpkg -m gnome ${LIBBONOBOUI}
-fpkg -m gnome ${GNOME_ICON_THEME}
+
fpkg -m gnome ${LIBGNOMEUI}
fpkg -m gnome ${GNOME_THEMES}
fpkg -m gnome ${SCROLLKEEPER}
fpkg -m gnome ${LIBGNOMEUI}
fpkg -m gnome ${GNOME_THEMES}
fpkg -m gnome ${SCROLLKEEPER}
@@
-51,7
+51,6
@@
fpkg -m gnome ${GNOME_AUDIO}
# Gnome 2 additional packages - Utilities
fpkg -m gnome ${EOG}
# Gnome 2 additional packages - Utilities
fpkg -m gnome ${EOG}
-fpkg -m gnome ${EVINCE}
fpkg -m gnome ${FILE_ROLLER}
fpkg -m gnome ${GCONF_EDITOR}
fpkg -m gnome ${GNOME_UTILS}
fpkg -m gnome ${FILE_ROLLER}
fpkg -m gnome ${GCONF_EDITOR}
fpkg -m gnome ${GNOME_UTILS}