From 081a04339d8454848014909c0b4a430c70b7fff1 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 10 Sep 2011 21:12:45 +0000
Subject: [PATCH] -Removed GSL (only needed for tests in GStreamer) -Installing
 CUPS before Gtk+, so that Gtk+ applications can print

---
 config/dependencies    |  4 ++++
 config/packages-list   |  1 -
 stage5/hv-install-1    | 12 ++++++------
 stage5/packages-update | 14 +++++++-------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/config/dependencies b/config/dependencies
index 115a983..9f24395 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -21,6 +21,8 @@ ${GIT}: cpio
 
 ${GIMP}: ${BABL} ${INTTOOL} ${PYGTK}
 
+${GSTREAMER}:
+
 ${GNASH}: ${AGG} ${CAIRO} ${GSTREAMER} ${FFMPEG} ${SDL} ${FIREFOX}
 
 ${FIREFOX}: ${SQLITE} ${LIBNOTIFY} ${YASM}
@@ -128,3 +130,5 @@ ${TRASMISSION}: ${LIBEVENT}
 ${VLC}: ${QT} ${LUA} ${FIREFOX}
 
 ${PCMANFM}: ${MENU_CACHE} ${LIBFM}
+
+${CUPS}: ${LIBJPEG} ${LIBPNG} ${LIBTIFF} ${OPENSSL}
diff --git a/config/packages-list b/config/packages-list
index 25d835b..31b66cd 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -202,7 +202,6 @@ GREP="grep-2.6.3"
 GRIP="grip-3.4.0"
 GROFF="groff-1.20.1"
 GRUB="grub-1.99"
-GSL="gsl-1.15"
 GSTREAMER="gstreamer-0.10.35"
 GST_PLUGINS_BASE="gst-plugins-base-0.10.35"
 GST_PLUGINS_GOOD="gst-plugins-good-0.10.30"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 0e6ea3f..918d148 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -6,6 +6,11 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
+ipkg ${HELP2MAN}
+ipkg -m acnb ${CUPS}
+ipkg -m noac ${CUPS_PDF}
+ipkg -m noac ${SPLIX}
+
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
     # Gtk
@@ -46,11 +51,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBSOUP} "--without-gnome"
 fi
 
-ipkg ${HELP2MAN}
-ipkg ${GSL}
-ipkg -m acnb ${CUPS}
-ipkg -m noac ${CUPS_PDF}
-ipkg -m noac ${SPLIX}
 ipkg -m acnb ${GHOSTSCRIPT}
 ipkg ${LIBSPECTRE}
 
@@ -120,7 +120,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
         ipkg ${FFMPEG}
 
-        ipkg ${GSTREAMER}
+        ipkg ${GSTREAMER} "--disable-tests"
         ipkg ${GST_PLUGINS_BASE}
         ipkg ${GST_PLUGINS_GOOD}
         ipkg ${GST_PLUGINS_BAD}
diff --git a/stage5/packages-update b/stage5/packages-update
index 2f76d93..7852e3f 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -8,6 +8,13 @@ source ../functions/main
 
 update_packages_init ${*}
 
+fpkg -m gnu ${HELP2MAN}
+fpkg -s "$(get_pkg_ver ${CUPS})" -f "${CUPS}-source" ${CUPS} \
+    "http://ftp.easysw.com/pub/cups"
+fpkg -e "tar.gz" -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" ${CUPS_PDF} \
+    "http://www.cups-pdf.de/src"
+fpkg -m sf -e "tar.bz2" ${SPLIX}
+
 fpkg -m gnome ${LIBSIGCPP}
 fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
 fpkg -m gnome ${GLIBMM}
@@ -44,13 +51,6 @@ fpkg -m gnome ${GCONF}
 fpkg -m gnome ${GNOME_KEYRING}
 fpkg -m gnome ${LIBSOUP}
 
-fpkg -m gnu ${HELP2MAN}
-fpkg -m gnu ${GSL}
-fpkg -s "$(get_pkg_ver ${CUPS})" -f "${CUPS}-source" ${CUPS} \
-    "http://ftp.easysw.com/pub/cups"
-fpkg -e "tar.gz" -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" ${CUPS_PDF} \
-    "http://www.cups-pdf.de/src"
-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}
-- 
2.20.1