Update to cups-filters-1.0.73.
Add "ldap" FLAVOR for for browsing remote printer queues via LDAP.
This commit is contained in:
ajacoutot
parent
a71d123c73
commit
d85abda00e
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.72 2015/07/03 07:41:51 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.73 2015/08/19 07:45:35 ajacoutot Exp $
|
||||
|
||||
BROKEN-alpha= ICE in cupsfilters/image-jpeg.c:316
|
||||
|
||||
COMMENT= OpenPrinting CUPS filters
|
||||
|
||||
DISTNAME= cups-filters-1.0.71
|
||||
DISTNAME= cups-filters-1.0.73
|
||||
CATEGORIES= print
|
||||
|
||||
SHARED_LIBS += cupsfilters 1.0 # 1.0
|
||||
@ -72,15 +72,25 @@ CONFIGURE_ARGS += --with-pdftops=pdftops
|
||||
BUILD_DEPENDS += print/poppler,-utils
|
||||
RUN_DEPENDS += print/poppler,-utils
|
||||
|
||||
FLAVORS= ldap
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:Mldap}
|
||||
WANTLIB += crypto lber-2.4 ldap-2.4 sasl2 ssl
|
||||
LIB_DEPENDS += databases/openldap
|
||||
.else
|
||||
CONFIGURE_ARGS += --disable-ldap
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
perl -pi -e 's,/usr/share/cups,${LOCALBASE}/share/cups,g;' \
|
||||
sed -i -e 's,/usr/share/cups,${LOCALBASE}/share/cups,g;' \
|
||||
-e 's,/usr/bin,${LOCALBASE}/bin,g' \
|
||||
${WRKSRC}/filter/{gstoraster.c,gstopxl}
|
||||
perl -pi -e 's,/etc/cups,${SYSCONFDIR}/cups,g' \
|
||||
sed -i 's,/etc/cups,${SYSCONFDIR}/cups,g' \
|
||||
${WRKSRC}/filter/foomatic-rip/spooler.c
|
||||
perl -pi -e 's,/usr/local,${LOCALBASE},g' \
|
||||
sed -i 's,/usr/local,${LOCALBASE},g' \
|
||||
${WRKSRC}/filter/foomatic-rip/foomaticrip.c
|
||||
perl -pi -e 's,/bin/bash,/bin/ksh,g' ${WRKSRC}/filter/textonly
|
||||
sed -i 's,/bin/bash,/bin/ksh,g' ${WRKSRC}/filter/textonly
|
||||
|
||||
post-install:
|
||||
rm -rf ${WRKINST}/rc?.d
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (cups-filters-1.0.71.tar.gz) = eEMNd9AyxEdZ2dDy4fS04lZEJ94C5VTPKHzbGtk4TVw=
|
||||
SIZE (cups-filters-1.0.71.tar.gz) = 1715599
|
||||
SHA256 (cups-filters-1.0.73.tar.gz) = zFlhVmOURU3tw0O0srbWrIjlVLroy1n7wbb4kNBDr58=
|
||||
SIZE (cups-filters-1.0.73.tar.gz) = 1732490
|
||||
|
||||
16
print/cups-filters/patches/patch-backend_implicitclass_c
Normal file
16
print/cups-filters/patches/patch-backend_implicitclass_c
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-backend_implicitclass_c,v 1.1 2015/08/19 07:45:35 ajacoutot Exp $
|
||||
|
||||
XXX push upstream
|
||||
warning: implicit declaration of function 'open'
|
||||
error: 'O_RDONLY' undeclared (first use in this function)
|
||||
|
||||
--- backend/implicitclass.c.orig Wed Aug 19 09:21:58 2015
|
||||
+++ backend/implicitclass.c Wed Aug 19 09:22:10 2015
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "backend-private.h"
|
||||
#include <cups/array.h>
|
||||
#include <ctype.h>
|
||||
+#include <fcntl.h>
|
||||
|
||||
/*
|
||||
* Local globals...
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-filter_foomatic-rip_foomaticrip_c,v 1.5 2015/06/27 11:00:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-filter_foomatic-rip_foomaticrip_c,v 1.6 2015/08/19 07:45:35 ajacoutot Exp $
|
||||
|
||||
XXX from pkgsrc (foomatic-filters).
|
||||
Prevent bogus 'Job does not start with "%!", is it PostScript?' errors.
|
||||
|
||||
--- filter/foomatic-rip/foomaticrip.c.orig Fri Jun 26 17:45:26 2015
|
||||
+++ filter/foomatic-rip/foomaticrip.c Sat Jun 27 12:50:26 2015
|
||||
@@ -653,6 +653,7 @@ int print_file(const char *filename, int convert)
|
||||
--- filter/foomatic-rip/foomaticrip.c.orig Tue Aug 4 06:01:48 2015
|
||||
+++ filter/foomatic-rip/foomaticrip.c Wed Aug 19 09:11:32 2015
|
||||
@@ -655,6 +655,7 @@ int print_file(const char *filename, int convert)
|
||||
if (dup2(fileno(out), fileno(stdin)) < 0)
|
||||
rip_die(EXIT_PRNERR_NORETRY_BAD_SETTINGS,
|
||||
"Couldn't dup stdout of pdf-to-ps\n");
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-filter_foomatic-rip_process_c,v 1.2 2014/03/13 18:29:39 ajacoutot Exp $
|
||||
|
||||
XXX push upstream
|
||||
|
||||
--- filter/foomatic-rip/process.c.orig Thu Dec 12 08:38:04 2013
|
||||
+++ filter/foomatic-rip/process.c Thu Dec 12 08:38:21 2013
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <sys/wait.h>
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
+#include <signal.h> /* kill(2) */
|
||||
|
||||
int kidgeneration = 0;
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-filter_pdftoopvp_OPVPOutputDev_cxx,v 1.3 2015/07/12 19:14:54 kili Exp $
|
||||
|
||||
Let it build with poppler-0.34.
|
||||
|
||||
--- filter/pdftoopvp/OPVPOutputDev.cxx.orig Fri Jun 26 17:45:26 2015
|
||||
+++ filter/pdftoopvp/OPVPOutputDev.cxx Sun Jul 12 17:35:33 2015
|
||||
@@ -1811,8 +1811,12 @@ void OPVPOutputDev::drawSoftMaskedImage(GfxState *stat
|
||||
#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
|
||||
maskSplash->drawImage(&imageSrc, &imgMaskData,
|
||||
splashModeMono8, gFalse, maskWidth, maskHeight, mat);
|
||||
-#else
|
||||
+#elseif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
|
||||
maskSplash->drawImage(&imageSrc, &imgMaskData,
|
||||
+ splashModeMono8, gFalse, maskWidth, maskHeight,
|
||||
+ mat,gFalse);
|
||||
+#else
|
||||
+ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData,
|
||||
splashModeMono8, gFalse, maskWidth, maskHeight,
|
||||
mat,gFalse);
|
||||
#endif
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-filter_pdftoopvp_oprs_OPRS_cxx,v 1.7 2015/07/12 19:14:54 kili Exp $
|
||||
|
||||
Let it build with poppler-0.34.
|
||||
|
||||
--- filter/pdftoopvp/oprs/OPRS.cxx.orig Fri Jun 26 17:45:26 2015
|
||||
+++ filter/pdftoopvp/oprs/OPRS.cxx Sun Jul 12 17:28:18 2015
|
||||
@@ -240,8 +240,10 @@ SplashError OPRS::drawImage(SplashImageSource src, voi
|
||||
if (rasterMode) {
|
||||
#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
|
||||
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
|
||||
-#else
|
||||
+#elseif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
|
||||
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
|
||||
+#else
|
||||
+ return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
|
||||
#endif
|
||||
} else {
|
||||
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
|
||||
@ -1,3 +1,6 @@
|
||||
This package provides additional CUPS filters which are not provided by
|
||||
the CUPS project itself. This includes filters for a PDF based printing
|
||||
workflow.
|
||||
|
||||
Available flavor:
|
||||
ldap support for browsing remote printer queues via LDAP
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.22 2015/06/12 08:09:16 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.23 2015/08/19 07:45:35 ajacoutot Exp $
|
||||
@conflict cups-<1.6.0
|
||||
@conflict ghostscript-<9.06p3
|
||||
@conflict foomatic-filters-*
|
||||
@ -26,6 +26,7 @@ lib/libfontembed.la
|
||||
lib/pkgconfig/libcupsfilters.pc
|
||||
lib/pkgconfig/libfontembed.pc
|
||||
libexec/cups/backend/
|
||||
@bin libexec/cups/backend/implicitclass
|
||||
@bin libexec/cups/backend/parallel
|
||||
@bin libexec/cups/backend/serial
|
||||
libexec/cups/filter/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user