[SM-Commit] GIT changes to master grimoire by Andraž Levstik (de7c5ce2354b4383c505afe4c90c7a091e5c73f0)

Andraž Levstik scm at sourcemage.org
Sat Jul 4 14:13:16 EDT 2009


GIT changes to master grimoire by Andraž Levstik <ruskie+2054d253 at codemages.net>:

 printer/cups/BUILD         |    2 +-
 printer/cups/CONFIGURE     |   30 +++++++++++++++++++++++++++++-
 printer/cups/DEPENDS       |   43 ++++++++++++++++++++++++++++++++++++++++---
 printer/cups/HISTORY       |    5 +++++
 x11-toolkits/gtk+2/DEPENDS |    7 ++++++-
 x11-toolkits/gtk+2/HISTORY |    3 +++
 6 files changed, 84 insertions(+), 6 deletions(-)

New commits:
commit de7c5ce2354b4383c505afe4c90c7a091e5c73f0
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    gtk+2: added cups to DEPENDS

commit 506b8e300891c3be084a8aca4cd97f1828c3ecce
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    cups: updated CONFIGURE and DEPENDS, could people please just check valid/available options when updating spells?

diff --git a/printer/cups/BUILD b/printer/cups/BUILD
index 95953cf..46a86b4 100755
--- a/printer/cups/BUILD
+++ b/printer/cups/BUILD
@@ -12,6 +12,6 @@ else
   fi
 fi &&
 
-OPTS="--libdir=$INSTALL_ROOT/usr/lib $OPTS"  &&
+OPTS="--libdir=$INSTALL_ROOT/usr/lib $CUPS_OPTS $OPTS"  &&
 
 default_build
diff --git a/printer/cups/CONFIGURE b/printer/cups/CONFIGURE
index f2b07e2..03949e7 100755
--- a/printer/cups/CONFIGURE
+++ b/printer/cups/CONFIGURE
@@ -5,4 +5,32 @@ config_query EXTRA_LANG "Do you want to build extra languages?" n
 if [[ $EXTRA_LANG == y ]]; then
   config_query_list CUPS_LANG "Which additional language to install?" \
       all de es fr ja pl sv
-fi
+fi &&
+
+if spell_ok xpdf ; then
+config_query_list CUPS_PDF "Which pdf-to-ps filter do you want to use?" \
+                  xpdf ghostscript none
+elif spell_ok ghostscript ; then
+config_query_list CUPS_PDF "Which pdf-to-ps filter do you want to use?" \
+                  ghostscript xpdf none
+else
+config_query_list CUPS_PDF "Which pdf-to-ps filter do you want to use?" \
+                  none xpdf ghostscript
+fi &&
+
+config_query_option CUPS_OPTS \
+                    "Do you want to use AppleTalk protocol for printers?" \
+                    y \
+                    '--enable-pap' \
+                    '--disable-pap' &&
+config_query_option CUPS_OPTS \
+                    "Do you want to use network default printers" \
+                    y \
+                    '--enable-use-network-default' \
+                    '--disable-use-network-default' &&
+config_query_option CUPS_OPTS \
+                    "Do you want to enable raw printing" \
+                    n \
+                    '--enable-raw-printing' \
+                    '--disable-raw-printing'
+
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 545ccd1..22337d7 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -1,10 +1,47 @@
 depends  zlib                                     &&
-depends  jpeg                                     &&
-depends  tiff                                     &&
-depends  libpng                                   &&
 depends  g++                                      &&
 depends  pkgconfig                                &&
 
+optional_depends  jpeg                            \
+                  '--enable-jpeg'                 \
+                  '--disable-jpeg'                \
+                  'Support for JPEG filter'       &&
+optional_depends  tiff                            \
+                  '--enable-tiff'                 \
+                  '--disable-tiff'                \
+                  'Support for TIFF filter'       &&
+optional_depends  libpng                          \
+                  '--enable-png'                  \
+                  '--disable-png'                 \
+                  'Support PNG filter'            &&
+optional_depends  libpaper                        \
+                  '--enable-libpaper'             \
+                  '--disable-libpaper'            \
+                  'Enable libpaper support'       &&
+optional_depends  JAVA                            \
+                  '--with-java'                   \
+                  '--without-java'                \
+                  'Enable java support'           \
+                  z-rejected                      &&
+optional_depends  perl                            \
+                  '--with-perl'                   \
+                  '--without-perl'                \
+                  'Enable perl support'           &&
+optional_depends  python                          \
+                  '--with-python'                 \
+                  '--without-python'              \
+                  'Enable python support'         &&
+optional_depends  php                             \
+                  '--with-php'                    \
+                  '--without-php'                 \
+                  'Enable php support'            &&
+
+if [[ $CUPS_PDF == xpdf ]] ; then
+depends xpdf '--enable-pdftops --with-pdftops=pdftops'
+elif [[ $CUPS_PDF == ghostscript ]]; then
+depends ghostscript '--enable-pdftops --with-pdftops=gs'
+fi &&
+
 optional_depends  "libusb" \
                   '--enable-libusb' \
                   '--disable-libusb' \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index ae4a332..9140464 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,8 @@
+2009-07-04 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* BUILD: added CUPS_OPTS
+	* CONFIGURE: plenty of extra options
+	* DEPENDS: some dependencies are completely optional
+
 2009-07-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.3.11
 
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 3ce7554..138ea00 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -35,4 +35,9 @@ optional_depends libxinerama \
 optional_depends gtk-doc \
                  "--enable-gtk-doc" \
                  "--disable-gtk-doc" \
-                 "Build documentation with gtk-doc"
+                 "Build documentation with gtk-doc" &&
+
+optional_depends cups \
+                 "--enable-cups" \
+                 "--disable-cups" \
+                 "Enable CUPS print backend support?"
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index aa84d26..abfbd07 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-04 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DEPENDS: added cups
+
 2009-07-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.16.4
 



More information about the SM-Commit mailing list