X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpackages-update;h=3d484deefa88dc7cb8ced6ee11452ca124d651a4;hb=eab0363888c361ccd0dd37de76f0634239f12ffa;hp=83f1a85f8928523ac5c50a88a221b44d6b56c112;hpb=47b23eff793721903e93f18f2ca444ad52d1e305;p=hvlinux.git

diff --git a/stage5/packages-update b/stage5/packages-update
index 83f1a85..3d484de 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
@@ -12,8 +9,8 @@ lpkg 3 ${SUBVERSION}
 
 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 -s "$(get_pkg_ver3 ${CUPS})" -f "${CUPS}-source" ${CUPS} \
+    "http://www.cups.org/software"
 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}
@@ -27,7 +24,7 @@ fpkg -m gnome ${GLIB_NETWORKING}
 fpkg -m gnome ${LIBSIGCPP}
 fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
 fpkg -m gnome ${GLIBMM}
-fpkg -e "tar.gz" ${CAIRO} ${CAIRO_URL}
+fpkg ${CAIRO} ${CAIRO_URL}
 fpkg -e "tar.gz" ${CAIROMM} ${CAIRO_URL}
 fpkg -m gnome ${PANGO}
 fpkg -m gnome ${PANGOMM}
@@ -66,7 +63,7 @@ fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
 fpkg -e "tar.gz" ${LIBSPECTRE} "http://libspectre.freedesktop.org/releases"
 fpkg -e "tar.xz" ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
 fpkg -e "tar.gz" ${VIEWNIOR} "http://cloud.github.com/downloads/xsisqox/Viewnior"
-fpkg -m fd -s "none" ${POPPLER}
+fpkg -e "tar.xz" -m fd -s "none" ${POPPLER}
 fpkg -m gnome ${LIBCROCO}
 fpkg -m gnome ${LIBRSVG}
 fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver2 ${BABL})"
@@ -98,6 +95,7 @@ fpkg -e "tar.gz" ${TANGO_ICON_THEME_EXTRAS} \
     "http://tango.freedesktop.org/releases"
 fpkg -m gnome ${GNOME_ICON_THEME}
 
+fpkg -m gnome ${GSETTINGS_DESKTOP_SCHEMAS}
 fpkg -m gnome ${EVINCE}
 
 fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
@@ -106,7 +104,9 @@ fpkg -m sf ${GRIP}
 fpkg -m sf -e "tar.bz2" ${CDRDAO}
 fpkg -m sf ${ID3LIB}
 fpkg -e "tar.xz" ${EASYTAG} "https://download.gnome.org/sources/easytag/$(get_pkg_ver2 ${EASYTAG})"
-fpkg -m sf -e "tar.bz2" -s "fontforge/fontforge-source" ${FONTFORGE}
+fpkg -e "tar.gz" -f "fontforge-2014-11-26-Unix-Source" -s "" ${FONTFORGE} \
+    "https://github.com/fontforge/fontforge/releases/download/$(get_pkg_ver ${FONTFORGE})"
+
 fpkg -m gnu ${GUILE1}
 fpkg -e "tar.gz" ${LILYPOND} \
     "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})"