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=35

Browse Source
This commit is contained in:
OBS User unknown 2008-05-07 20:02:05 +00:00 committed by Git OBS Bridge
parent 7c8207e514
commit d92948c55c
5 changed files with 83 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cups-1.3.7-keeping_recommended.patch Normal file
View File

@ -0,0 +1,27 @@
--- cups-1.3.7/scheduler/cups-driverd.c.orig 2008-04-01 00:33:33.000000000 +0200
+++ cups-1.3.7/scheduler/cups-driverd.c 2008-05-07 12:19:40.000000000 +0200
@@ -180,8 +180,6 @@
int type) /* I - Driver type */
{
ppd_info_t *ppd; /* PPD */
- char *recommended; /* Foomatic driver string */
-
/*
* Add a new PPD file...
@@ -238,15 +236,6 @@
strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
/*
- * Strip confusing (and often wrong) "recommended" suffix added by
- * Foomatic drivers...
- */
-
- if ((recommended = strstr(ppd->record.make_and_model,
- " (recommended)")) != NULL)
- *recommended = '\0';
-
- /*
* Return the new PPD pointer...
*/

71
cups-1.4svn-pdftops_as_filter.patch
View File

@ -55,35 +55,6 @@
# #
# rastertolabel # rastertolabel
--- cups-1.3.7/config-scripts/cups-pdf.m4.orig 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.3.7/config-scripts/cups-pdf.m4 2008-04-09 18:21:35.000000000 +0200
@@ -18,12 +18,20 @@
PDFTOPS=""
if test "x$enable_pdftops" != xno; then
- AC_MSG_CHECKING(whether to build pdftops filter)
- if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
- PDFTOPS="pdftops"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
+ AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
+
+ if test "x$CUPS_PDFTOPS" != x; then
+ AC_MSG_CHECKING(whether to build pdftops filter)
+ if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
+ PDFTOPS="pdftops"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ elif test x$enable_pdftops = xyes; then
+ AC_MSG_ERROR(Unable to find pdftops program!)
+ exit 1
fi
fi
--- cups-1.3.7/config.h.in.orig 2008-01-07 19:26:57.000000000 +0100 --- cups-1.3.7/config.h.in.orig 2008-01-07 19:26:57.000000000 +0100
+++ cups-1.3.7/config.h.in 2008-04-09 18:22:50.000000000 +0200 +++ cups-1.3.7/config.h.in 2008-04-09 18:22:50.000000000 +0200
@@ -420,6 +420,12 @@ @@ -420,6 +420,12 @@
@ -157,3 +128,45 @@
perror("ERROR: Unable to execute gs program"); perror("ERROR: Unable to execute gs program");
#endif /* HAVE_PDFTOPS */ #endif /* HAVE_PDFTOPS */
--- cups-1.3.7/config-scripts/cups-pdf.m4.orig 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.3.7/config-scripts/cups-pdf.m4 2008-05-07 13:34:07.000000000 +0200
@@ -13,18 +13,31 @@
dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
-AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ])
+AC_ARG_WITH(pdftops, [ --with-pdftops build pdftops filter, default=auto ],[],with_pdftops=auto)
PDFTOPS=""
-if test "x$enable_pdftops" != xno; then
- AC_MSG_CHECKING(whether to build pdftops filter)
- if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
- PDFTOPS="pdftops"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
+if test "x$with_pdftops" != xno; then
+ if test "x$with_pdftops" != xyes -a "x$with_pdftops" != xauto ; then
+ CUPS_PDFTOPS=$with_pdftops
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
+ else
+ AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
+
+ if test "x$CUPS_PDFTOPS" != x; then
+ AC_MSG_CHECKING(whether to build pdftops filter)
+ if test "x$with_pdftops" = xyes -o $uname != Darwin; then
+ PDFTOPS="pdftops"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ elif test x$with_pdftops = xyes; then
+ AC_MSG_ERROR(Unable to find pdftops program!)
+ exit 1
fi
+ fi
fi
AC_SUBST(PDFTOPS)

38
cups-hardcode_pdftops.patch
View File

@ -1,38 +0,0 @@
--- config-scripts/cups-pdf.m4
+++ config-scripts/cups-pdf.m4
@@ -13,26 +13,31 @@
dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
-AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ])
+AC_ARG_WITH(pdftops, [ --with-pdftops build pdftops filter, default=auto ],[],with_pdftops=auto)
PDFTOPS=""
-if test "x$enable_pdftops" != xno; then
+if test "x$with_pdftops" != xno; then
+ if test "x$with_pdftops" != xyes -a "x$with_pdftops" != xauto ; then
+ CUPS_PDFTOPS=$with_pdftops
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
+ else
AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
if test "x$CUPS_PDFTOPS" != x; then
AC_MSG_CHECKING(whether to build pdftops filter)
- if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
+ if test "x$with_pdftops" = xyes -o $uname != Darwin; then
PDFTOPS="pdftops"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
- elif test x$enable_pdftops = xyes; then
+ elif test x$with_pdftops = xyes; then
AC_MSG_ERROR(Unable to find pdftops program!)
exit 1
fi
+ fi
fi
AC_SUBST(PDFTOPS)

6
cups.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 7 13:39:21 CEST 2008 - kssingvo@suse.de
- merged both pdftops patches to one
- removed "recommended" remover (bugzilla#387267)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 22 20:24:19 CEST 2008 - kssingvo@suse.de Tue Apr 22 20:24:19 CEST 2008 - kssingvo@suse.de

13
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: 11 Release: 15
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
@ -64,10 +64,10 @@ Patch15: cups-1.2.11-testppd_filename.patch
Patch16: cups-1.2.5-desktop_file.patch Patch16: cups-1.2.5-desktop_file.patch
Patch17: cups-1.3.3-testppd_none.patch Patch17: cups-1.3.3-testppd_none.patch
Patch18: cups-1.4svn-pdftops_as_filter.patch Patch18: cups-1.4svn-pdftops_as_filter.patch
Patch19: cups-hardcode_pdftops.patch Patch19: cups-1.3.7-filter_png_overflow.patch
Patch20: cups-1.3.7-filter_png_overflow.patch
# next is found as http://www.cups.org/strfiles/2808/str2808.patch # next is found as http://www.cups.org/strfiles/2808/str2808.patch
Patch21: cups-1.4svn-pdftops_dont_fail_on_cancel.patch Patch20: cups-1.4svn-pdftops_dont_fail_on_cancel.patch
Patch21: cups-1.3.7-keeping_recommended.patch
Patch100: cups-1.1.23-testpage.patch Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -165,7 +165,7 @@ mv pdftops pdftos.use_filter_pdftops_c
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
if [ -f /.buildenv ]; then if [ -f /.buildenv ]; then
@ -423,6 +423,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
%{_datadir}/locale/*/cups_* %{_datadir}/locale/*/cups_*
%changelog %changelog
* Wed May 07 2008 kssingvo@suse.de
- merged both pdftops patches to one
- removed "recommended" remover (bugzilla#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