pool/cups
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=36

Browse Source
This commit is contained in:
OBS User unknown 2008-05-16 20:35:30 +00:00 committed by Git OBS Bridge
parent d92948c55c
commit 366d4bc321
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups-1.4svn-pdftops.c
View File

@ -298,7 +298,7 @@ main(int argc, /* I - Number of command-line args */
*/ */
#ifdef HAVE_PDFTOPS #ifdef HAVE_PDFTOPS
execv(CUPS_PDFTOPS, pdfargv); execv(HAVE_PDFTOPS, pdfargv);
_cupsLangPrintError(_("ERROR: Unable to execute pdftops program")); _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
#else #else
execv(CUPS_GHOSTSCRIPT, pdfargv); execv(CUPS_GHOSTSCRIPT, pdfargv);

16
cups-1.4svn-pdftops_as_filter.patch
View File

@ -65,7 +65,7 @@
+ * Location of the poppler/Xpdf pdftops program... + * Location of the poppler/Xpdf pdftops program...
+ */ + */
+ +
+#define CUPS_PDFTOPS "/usr/bin/pdftops" +#define HAVE_PDFTOPS "/usr/bin/pdftops"
+ +
/* /*
@ -95,7 +95,7 @@
@@ -299,10 +299,10 @@ main(int argc, /* I - Number of comm @@ -299,10 +299,10 @@ main(int argc, /* I - Number of comm
#ifdef HAVE_PDFTOPS #ifdef HAVE_PDFTOPS
execv(CUPS_PDFTOPS, pdfargv); execv(HAVE_PDFTOPS, pdfargv);
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program")); - _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
+ perror("ERROR: Unable to execute pdftops program"); + perror("ERROR: Unable to execute pdftops program");
#else #else
@ -120,7 +120,7 @@
--- cups-1.3.7/filter/pdftops.c.orig 2008-04-22 20:24:15.000000000 +0200 --- cups-1.3.7/filter/pdftops.c.orig 2008-04-22 20:24:15.000000000 +0200
+++ cups-1.3.7/filter/pdftops.c 2008-04-22 20:26:20.000000000 +0200 +++ cups-1.3.7/filter/pdftops.c 2008-04-22 20:26:20.000000000 +0200
@@ -301,7 +301,7 @@ main(int argc, /* I - Number of comm @@ -301,7 +301,7 @@ main(int argc, /* I - Number of comm
execv(CUPS_PDFTOPS, pdfargv); execv(HAVE_PDFTOPS, pdfargv);
perror("ERROR: Unable to execute pdftops program"); perror("ERROR: Unable to execute pdftops program");
#else #else
- execv(CUPS_GHOSTSCRIPT, pdfargv); - execv(CUPS_GHOSTSCRIPT, pdfargv);
@ -148,13 +148,13 @@
- AC_MSG_RESULT(no) - AC_MSG_RESULT(no)
+if test "x$with_pdftops" != xno; then +if test "x$with_pdftops" != xno; then
+ if test "x$with_pdftops" != xyes -a "x$with_pdftops" != xauto ; then + if test "x$with_pdftops" != xyes -a "x$with_pdftops" != xauto ; then
+ CUPS_PDFTOPS=$with_pdftops + HAVE_PDFTOPS=$with_pdftops
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS") + AC_DEFINE_UNQUOTED(HAVE_PDFTOPS, "$HAVE_PDFTOPS")
+ else + else
+ AC_PATH_PROG(CUPS_PDFTOPS, pdftops) + AC_PATH_PROG(HAVE_PDFTOPS, pdftops)
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS") + AC_DEFINE_UNQUOTED(HAVE_PDFTOPS, "$HAVE_PDFTOPS")
+ +
+ if test "x$CUPS_PDFTOPS" != x; then + if test "x$HAVE_PDFTOPS" != x; then
+ AC_MSG_CHECKING(whether to build pdftops filter) + AC_MSG_CHECKING(whether to build pdftops filter)
+ if test "x$with_pdftops" = xyes -o $uname != Darwin; then + if test "x$with_pdftops" = xyes -o $uname != Darwin; then
+ PDFTOPS="pdftops" + PDFTOPS="pdftops"

10
cups.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Thu May 15 11:53:11 CEST 2008 - kssingvo@suse.de
- renamed use of CUPS_PDFTOPS to HAVE_PDFTOPS in pdftops.c, to
avoid execute of gs (bnc#390435)
- removed earlykdm from init script, due to new less CPU consuming
start of daemon now (bnc#388007)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 7 13:39:21 CEST 2008 - kssingvo@suse.de Wed May 7 13:39:21 CEST 2008 - kssingvo@suse.de
- merged both pdftops patches to one - merged both pdftops patches to one
- removed "recommended" remover (bugzilla#387267) - removed "recommended" remover (bnc#387267)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 22 20:24:19 CEST 2008 - kssingvo@suse.de Tue Apr 22 20:24:19 CEST 2008 - kssingvo@suse.de

2
cups.init
View File

@ -19,7 +19,7 @@
# Provides: cupsd # Provides: cupsd
# Required-Start: $local_fs $remote_fs $syslog # Required-Start: $local_fs $remote_fs $syslog
# Required-Stop: $remote_fs $syslog # Required-Stop: $remote_fs $syslog
# Should-Start: earlykdm dbus $named $portmap ptal slpd printbill hplip # Should-Start: dbus $named $portmap ptal slpd printbill hplip
# Should-Stop: $portmap # Should-Stop: $portmap
# Default-Start: 2 3 5 # Default-Start: 2 3 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6

9
cups.spec
View File

@ -22,7 +22,7 @@ License: GPL v2 or later
Group: Hardware/Printing Group: Hardware/Printing
Summary: The Common UNIX Printing System Summary: The Common UNIX Printing System
Version: 1.3.7 Version: 1.3.7
Release: 15 Release: 18
Requires: cups-libs = %{version}, cups-client = %{version} Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux /usr/bin/pdftops Requires: util-linux /usr/bin/pdftops
@ -423,9 +423,14 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
%{_datadir}/locale/*/cups_* %{_datadir}/locale/*/cups_*
%changelog %changelog
* Thu May 15 2008 kssingvo@suse.de
- renamed use of CUPS_PDFTOPS to HAVE_PDFTOPS in pdftops.c, to
avoid execute of gs (bnc#390435)
- removed earlykdm from init script, due to new less CPU consuming
start of daemon now (bnc#388007)
* Wed May 07 2008 kssingvo@suse.de * Wed May 07 2008 kssingvo@suse.de
- merged both pdftops patches to one - merged both pdftops patches to one
- removed "recommended" remover (bugzilla#387267) - removed "recommended" remover (bnc#387267)
* Tue Apr 22 2008 kssingvo@suse.de * Tue Apr 22 2008 kssingvo@suse.de
- new version of pdftops filter from svn extracted - new version of pdftops filter from svn extracted
- changed the perror() calls in pdftops.c for cups-1.3.x compatibility - changed the perror() calls in pdftops.c for cups-1.3.x compatibility