| 1 |
scarabeus 10/12/01 13:03:55 |
| 2 |
|
| 3 |
Added: cups-1.3.11-pdf-m4.patch |
| 4 |
Log: |
| 5 |
Revision bump (directly stable) to fix nasty issue with pstopdf buildtime requirement (only changed the m4 to work properly). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64, RepoMan options: --force) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-print/cups/files/cups-1.3.11-pdf-m4.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.3.11-pdf-m4.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.3.11-pdf-m4.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cups-1.3.11-pdf-m4.patch |
| 16 |
=================================================================== |
| 17 |
# This patch is taken from cups 1.4.5 and fixes annoying requirement to have poppler around during build-time |
| 18 |
|
| 19 |
--- cups-1.3.11/config-scripts/cups-pdf.m4 2009-03-12 22:34:21.000000000 +0100 |
| 20 |
+++ cups-1.4.5/config-scripts/cups-pdf.m4 2009-08-08 00:30:30.000000000 +0200 |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
dnl |
| 23 |
-dnl "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $" |
| 24 |
+dnl "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $" |
| 25 |
dnl |
| 26 |
dnl PDF filter configuration stuff for the Common UNIX Printing System (CUPS). |
| 27 |
dnl |
| 28 |
@@ -13,12 +13,7 @@ |
| 29 |
dnl file is missing or damaged, see the license at "http://www.cups.org/". |
| 30 |
dnl |
| 31 |
|
| 32 |
-AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ]) |
| 33 |
-AC_ARG_WITH(pdftops, [ --with-pdftops set pdftops filter (gs,pdftops,none), default=pdftops ]) |
| 34 |
- |
| 35 |
-if test "x$enable_pdftops" = xno -a "x$with_pdftops" = x; then |
| 36 |
- with_pdftops=no |
| 37 |
-fi |
| 38 |
+AC_ARG_WITH(pdftops, [ --with-pdftops set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ]) |
| 39 |
|
| 40 |
PDFTOPS="" |
| 41 |
CUPS_PDFTOPS="" |
| 42 |
@@ -52,6 +47,12 @@ |
| 43 |
fi |
| 44 |
;; |
| 45 |
|
| 46 |
+ x/*/gs) # Use /path/to/gs without any check: |
| 47 |
+ CUPS_GHOSTSCRIPT="$with_pdftops" |
| 48 |
+ AC_DEFINE(HAVE_GHOSTSCRIPT) |
| 49 |
+ PDFTOPS="pdftops" |
| 50 |
+ ;; |
| 51 |
+ |
| 52 |
xpdftops) |
| 53 |
AC_PATH_PROG(CUPS_PDFTOPS, pdftops) |
| 54 |
if test "x$CUPS_PDFTOPS" != x; then |
| 55 |
@@ -62,6 +63,20 @@ |
| 56 |
exit 1 |
| 57 |
fi |
| 58 |
;; |
| 59 |
+ |
| 60 |
+ x/*/pdftops) # Use /path/to/pdftops without any check: |
| 61 |
+ CUPS_PDFTOPS="$with_pdftops" |
| 62 |
+ AC_DEFINE(HAVE_PDFTOPS) |
| 63 |
+ PDFTOPS="pdftops" |
| 64 |
+ ;; |
| 65 |
+ |
| 66 |
+ xnone) # Make no pdftops filter if with_pdftops=none: |
| 67 |
+ ;; |
| 68 |
+ |
| 69 |
+ *) # Invalid with_pdftops value: |
| 70 |
+ AC_MSG_ERROR(Invalid with_pdftops value!) |
| 71 |
+ exit 1 |
| 72 |
+ ;; |
| 73 |
esac |
| 74 |
|
| 75 |
AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS") |
| 76 |
@@ -69,5 +84,5 @@ |
| 77 |
AC_SUBST(PDFTOPS) |
| 78 |
|
| 79 |
dnl |
| 80 |
-dnl End of "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $". |
| 81 |
+dnl End of "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $". |
| 82 |
dnl |
Archives