From d079e225501fe3df032f4f56b081c558f6341a3f Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 25 Dec 2014 12:47:46 -0500
Subject: [PATCH] Add cups-filters and its dependencies

---
 config/packages-list   |  3 +++
 stage5/hv-install-1    | 20 ++++++++++++++++----
 stage5/packages-update | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 02ef0fe..057b3c1 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -50,6 +50,7 @@ COLORDIFF="colordiff-1.0.10"
 COREUTILS="coreutils-8.21"
 CPIO="cpio-2.11"
 CUPS="cups-2.0.1"
+CUPS_FILTERS="cups-filters-1.0.61"
 CUPS_PDF="cups-pdf-2.5.1"
 CURL="curl-7.27.0"
 CVS="cvs-1.11.23"
@@ -179,6 +180,7 @@ IANA="iana-etc-2.30"
 ICON_NAMING_UTILS="icon-naming-utils-0.8.90"
 ICU="icu4c-54_1"
 ID3LIB="id3lib-3.8.3"
+IJS="ijs-0.35"
 IMAGE_MAGICK="ImageMagick-6.9.0-0"
 IMLIB2="imlib-1.4.2"
 INDENT="indent-2.2.10"
@@ -345,6 +347,7 @@ PYTHON="Python-2.7.3"
 P11KIT="p11-kit-0.22.1"
 
 QEMU="qemu-2.2.0"
+QPDF="qpdf-5.1.2"
 QT="qt-everywhere-opensource-src-4.8.5"
 
 RALENTI="ralenti-0.1"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index d18b863..153e599 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -12,10 +12,10 @@ ipkg ${GSL}
 ipkg -m acnb ${CUPS}
 ipkg -m acnb ${GHOSTSCRIPT}
 ipkg ${LIBSPECTRE}
-ipkg -m noac ${CUPS_PDF}
-ipkg -m noac ${SPLIX}
-ipkg ${FOOMATIC_FILTERS}
-ipkg -m noac ${FOO2ZJS}
+ipkg ${IJS} " \
+    --mandir=/usr/share/man \
+    --enable-shared \
+    --disable-static"
 
 ipkg ${ITSTOOL}
 
@@ -91,6 +91,18 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
+ipkg -m acnb ${QPDF}
+ipkg ${CUPS_FILTERS} " \
+    --localstatedir=/var \
+    --without-rcdir \
+    --with-gs-path=/usr/bin/gs \
+    --with-pdftops-path=/usr/bin/gs \
+    --disable-static"
+ipkg -m noac ${CUPS_PDF}
+ipkg -m noac ${SPLIX}
+ipkg ${FOOMATIC_FILTERS}
+ipkg -m noac ${FOO2ZJS}
+
 ipkg -m noac ${CDRTOOLS}
 ipkg -m noac ${DVDRWTOOLS}
 ipkg ${LIBDVDCSS}
diff --git a/stage5/packages-update b/stage5/packages-update
index 2e8a260..cf1c2b5 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -11,11 +11,8 @@ lpkg 3 ${FREETYPE}
 fpkg -m gnu ${HELP2MAN}
 fpkg -m gnu ${GSL}
 fpkg -v 3 -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}
-fpkg -e "tar.gz" ${FOOMATIC_FILTERS} "http://www.openprinting.org/download/foomatic/"
-fpkg -e "tar.gz" ${FOO2ZJS} "http://foo2zjs.rkkda.com"
+fpkg -e "tar.bz2" ${IJS} \
+    "https://www.openprinting.org/download/ijs/download"
 
 fpkg ${ITSTOOL} "http://files.itstool.org/itstool"
 
@@ -83,6 +80,15 @@ fpkg -m sf -s "gimp-print" -e "tar.bz2" ${GUTENPRINT}
 fpkg -m sf -s "boost" ${BOOST}
 fpkg -m sf ${INKSCAPE}
 
+fpkg -m sf ${QPDF}
+fpkg -e "tar.gz" ${CUPS_FILTERS} \
+    "https://www.openprinting.org/download/cups-filters"
+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 -e "tar.gz" ${FOOMATIC_FILTERS} "http://www.openprinting.org/download/foomatic/"
+fpkg -e "tar.gz" ${FOO2ZJS} "http://foo2zjs.rkkda.com"
+
 fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
 fpkg -e "tar.gz" ${DVDRWTOOLS} \
     "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
-- 
2.20.1