Update to cups-filters-1.0.23.
with help from espie@
This commit is contained in:
ajacoutot
parent
d1af360949
commit
0b558f5f5b
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2012/08/04 14:36:09 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2012/09/01 18:35:14 ajacoutot Exp $
|
||||
|
||||
COMMENT= OpenPrinting CUPS filters
|
||||
|
||||
DISTNAME= cups-filters-1.0.20
|
||||
DISTNAME= cups-filters-1.0.23
|
||||
CATEGORIES= print
|
||||
|
||||
SHARED_LIBS += cupsfilters 0.0 # 1.0
|
||||
@ -12,7 +12,7 @@ HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/openprinting
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
# GPLv3 - LGPLv2 - GPLv2 - MIT
|
||||
# GPLv3 - LGPLv2 - GPLv2+ - MIT
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -20,17 +20,22 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB += asn1 c crypto cups cupsimage expat fontconfig freetype
|
||||
WANTLIB += gssapi ijs jpeg krb5 lcms2 m openjpeg png poppler pthread
|
||||
WANTLIB += ssl stdc++ tiff z
|
||||
WANTLIB += ssl stdc++ tiff z pcre qpdf
|
||||
|
||||
MASTER_SITES= http://www.openprinting.org/download/cups-filters/
|
||||
|
||||
# cc1plus: error: unrecognized command line option "-std=c++0x"
|
||||
MODULES += gcc4
|
||||
MODGCC4_ARCHS= *
|
||||
MODGCC4_LANGS= c++
|
||||
MODGCC4_VERSION=4.6
|
||||
|
||||
BUILD_DEPENDS= print/ghostscript/gnu
|
||||
|
||||
LIB_DEPENDS= print/cups,-libs \
|
||||
print/ijs \
|
||||
print/poppler
|
||||
|
||||
RUN_DEPENDS= print/ghostscript/gnu
|
||||
print/poppler \
|
||||
print/qpdf
|
||||
|
||||
# make it easier for users: bring in foomatic-filters, ghostscript
|
||||
# (with gstoraster) and allow the regeneration of PPD files from
|
||||
@ -52,4 +57,9 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-test-font-path=${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf \
|
||||
--without-php
|
||||
|
||||
# prefer pdftops over gs -- see README under ${WRKSRC}
|
||||
CONFIGURE_ARGS += --with-pdftops=pdftops
|
||||
BUILD_DEPENDS += print/poppler,-utils
|
||||
RUN_DEPENDS += print/poppler,-utils # print/ghostscript/gnu
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (cups-filters-1.0.20.tar.gz) = bcv1YvquXEfPsqsKujtsSejolFNFKfgufbIeni9yNc8=
|
||||
SIZE (cups-filters-1.0.20.tar.gz) = 1302977
|
||||
SHA256 (cups-filters-1.0.23.tar.gz) = olTRzo7CKPkuOXwPoETfe4JkEvPR92AufsPEzXu+FSo=
|
||||
SIZE (cups-filters-1.0.23.tar.gz) = 1262559
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2012/08/04 14:36:09 ajacoutot Exp $
|
||||
--- configure.orig Thu Jul 26 21:52:18 2012
|
||||
+++ configure Thu Jul 26 21:52:34 2012
|
||||
@@ -17720,8 +17720,8 @@ fi
|
||||
if test x"$GCC" = "xyes"; then :
|
||||
|
||||
# Be tough with warnings and produce less careless code
|
||||
- CFLAGS="$CFLAGS -Wall -pedantic -std=gnu99"
|
||||
- CXXFLAGS="$CXXFLAGS -Wall -pedantic" # -Weffc++" # TODO: enable when it does not print 1MB of warnings
|
||||
+ CFLAGS="$CFLAGS -Wall -std=gnu99"
|
||||
+ CXXFLAGS="$CXXFLAGS -Wall" # -Weffc++" # TODO: enable when it does not print 1MB of warnings
|
||||
|
||||
fi
|
||||
CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
||||
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-filter_pdftoopvp_oprs_OPRS_cxx,v 1.1 2012/09/01 18:35:15 ajacoutot Exp $
|
||||
--- filter/pdftoopvp/oprs/OPRS.cxx.orig Thu Aug 23 20:06:55 2012
|
||||
+++ filter/pdftoopvp/oprs/OPRS.cxx Thu Aug 23 20:15:31 2012
|
||||
@@ -15,6 +15,15 @@
|
||||
#include <string.h>
|
||||
#include <dlfcn.h>
|
||||
#include <stdarg.h>
|
||||
+#if defined __OpenBSD__
|
||||
+#include <sys/endian.h>
|
||||
+#if BYTE_ORDER == BIG_ENDIAN
|
||||
+#define __BYTE_ORDER __BIG_ENDIAN
|
||||
+#else
|
||||
+#define __BYTE_ORDER __LITTLE_ENDIAN
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
#include "goo/gmem.h"
|
||||
#include "splash/SplashErrorCodes.h"
|
||||
#include "splash/SplashMath.h"
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-filter_pdftopdf_P2POutputStream_h,v 1.1.1.1 2012/08/04 14:36:09 ajacoutot Exp $
|
||||
|
||||
C allows headers to define function-like macros in addition to normal
|
||||
functions, C++ doesn't permit this... but we do so for putchar(3).
|
||||
We should only provide the function-like macros when __cplusplus is not
|
||||
defined (bug in our stdio.h header?).
|
||||
|
||||
--- filter/pdftopdf/P2POutputStream.h.orig Thu Jul 26 21:49:07 2012
|
||||
+++ filter/pdftopdf/P2POutputStream.h Thu Jul 26 21:49:32 2012
|
||||
@@ -40,6 +40,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
||||
+#ifdef putchar
|
||||
+#undef putchar
|
||||
+#endif
|
||||
+
|
||||
class P2POutputStream {
|
||||
public:
|
||||
P2POutputStream(FILE *fpA);
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-filter_pdftopdf_PDFFTrueTypeFont_h,v 1.1.1.1 2012/08/04 14:36:09 ajacoutot Exp $
|
||||
--- filter/pdftopdf/PDFFTrueTypeFont.h.orig Fri Jul 20 10:22:23 2012
|
||||
+++ filter/pdftopdf/PDFFTrueTypeFont.h Fri Jul 27 10:10:59 2012
|
||||
@@ -30,9 +30,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#define _PDFFTRUTYPEFONT_H_
|
||||
|
||||
#include <config.h>
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <sys/endian.h>
|
||||
+#ifdef _LITTLE_ENDIAN
|
||||
+#define __BYTE_ORDER __LITTLE_ENDIAN
|
||||
+#else
|
||||
+#define __BYTE_ORDER __BIG_ENDIAN
|
||||
+#endif
|
||||
+#else
|
||||
#ifdef HAVE_ENDIAN_H
|
||||
#include <endian.h>
|
||||
#endif
|
||||
+#endif
|
||||
#include "UGooString.h"
|
||||
#ifdef PDFTOPDF
|
||||
#include "P2POutputStream.h"
|
||||
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-filter_pdftopdf_intervalset_cc,v 1.1 2012/09/01 18:35:15 ajacoutot Exp $
|
||||
|
||||
https://bugs.linuxfoundation.org/show_bug.cgi?id=1062
|
||||
|
||||
--- filter/pdftopdf/intervalset.cc.orig Sat Sep 1 15:35:55 2012
|
||||
+++ filter/pdftopdf/intervalset.cc Sat Sep 1 15:37:38 2012
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <limits>
|
||||
#include <algorithm>
|
||||
|
||||
-const key_t IntervalSet::npos=std::numeric_limits<key_t>::max();
|
||||
+const IntervalSet::key_t IntervalSet::npos=std::numeric_limits<IntervalSet::key_t>::max();
|
||||
|
||||
void IntervalSet::clear() // {{{
|
||||
{
|
||||
@@ -56,7 +56,7 @@ bool IntervalSet::contains(key_t val) const // {{{
|
||||
}
|
||||
// }}}
|
||||
|
||||
-key_t IntervalSet::next(key_t val) const // {{{
|
||||
+IntervalSet::key_t IntervalSet::next(key_t val) const // {{{
|
||||
{
|
||||
val++;
|
||||
data_t::const_iterator it=std::upper_bound(data.begin(),data.end(),std::make_pair(val,npos));
|
||||
21
print/cups-filters/patches/patch-filter_pdftopdf_pptypes_cc
Normal file
21
print/cups-filters/patches/patch-filter_pdftopdf_pptypes_cc
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-filter_pdftopdf_pptypes_cc,v 1.1 2012/09/01 18:35:15 ajacoutot Exp $
|
||||
|
||||
filter/pdftopdf/pptypes.cc:166:21: error: 'isnan' was not declared in this scope
|
||||
|
||||
--- filter/pdftopdf/pptypes.cc.orig Sat Aug 25 15:42:18 2012
|
||||
+++ filter/pdftopdf/pptypes.cc Sat Aug 25 15:42:40 2012
|
||||
@@ -163,10 +163,10 @@ void PageRect::translate(float tx,float ty) // {{{
|
||||
|
||||
void PageRect::set(const PageRect &rhs) // {{{
|
||||
{
|
||||
- if (!isnan(rhs.top)) top=rhs.top;
|
||||
- if (!isnan(rhs.left)) left=rhs.left;
|
||||
- if (!isnan(rhs.right)) right=rhs.right;
|
||||
- if (!isnan(rhs.bottom)) bottom=rhs.bottom;
|
||||
+ if (!std::isnan(rhs.top)) top=rhs.top;
|
||||
+ if (!std::isnan(rhs.left)) left=rhs.left;
|
||||
+ if (!std::isnan(rhs.right)) right=rhs.right;
|
||||
+ if (!std::isnan(rhs.bottom)) bottom=rhs.bottom;
|
||||
}
|
||||
// }}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user