Re: [ptxdist] [PATCH 7/7] cups-filters: new package: additional filters and backends for CUPS
On 28.08.2017 15:03, Michael Olbrich wrote: On Thu, Aug 24, 2017 at 12:39:11AM +0200, Roland Hieber wrote: Upstream is very responsive, merged some patches and made a new release while I was still packaging the old one :) Please update to the new release, so we can avoid the patch. Oh, that sentence referred to 1.14, and I already did a version bump to 1.16.1 shortly before writing the patch. But now I see there is already a 1.17.2! I'll do another version bump then :) - Roland ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 7/7] cups-filters: new package: additional filters and backends for CUPS
On Thu, Aug 24, 2017 at 12:39:11AM +0200, Roland Hieber wrote: > Upstream is very responsive, merged some patches and made a new release > while I was still packaging the old one :) Please update to the new release, so we can avoid the patch. > Signed-off-by: Roland Hieber> --- > .../0001-configure.ac-check-for-C-11-support.patch | 1019 > > patches/cups-filters-1.16.1/autogen.sh |2 + > patches/cups-filters-1.16.1/series |4 + > rules/cups-filters.in | 69 ++ > rules/cups-filters.make| 96 ++ > 5 files changed, 1190 insertions(+) > create mode 100644 > patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch > create mode 100755 patches/cups-filters-1.16.1/autogen.sh > create mode 100644 patches/cups-filters-1.16.1/series > create mode 100644 rules/cups-filters.in > create mode 100644 rules/cups-filters.make > > diff --git > a/patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch > b/patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch > new file mode 100644 > index 0..a7d308e0e > --- /dev/null > +++ > b/patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch > @@ -0,0 +1,1019 @@ > +From: Roland Hieber > +Date: Tue, 15 Aug 2017 12:53:14 +0200 > +Subject: [PATCH] configure.ac: check for C++11 support > + > +The filters pdftoopvp, bannertopdf and pdftoraster depend on features > +only available in C++11, indirectly also because poppler does not put > +-std=c++11 on its pkg-config CFLAGS (but I'm not sure whether it should > +even do this). Solve this problems by adding -std=c++1 to $(CXX), if > +necessary, or fail if the compiler does not support C++11. > + > +Forwarded: https://bugs.linuxfoundation.org/show_bug.cgi?id=1404 > +Applied-Upstream: > http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7674 > +Signed-off-by: Roland Hieber > +--- > + configure.ac| 1 + > + m4/ax_cxx_compile_stdcxx.m4 | 982 > > + 2 files changed, 983 insertions(+) > + create mode 100644 m4/ax_cxx_compile_stdcxx.m4 > + > +diff --git a/configure.ac b/configure.ac > +index 6ce671e6026a..7ad5592e0423 100644 > +--- a/configure.ac > b/configure.ac > +@@ -52,6 +52,7 @@ AH_BOTTOM([ > + # === > + AC_PROG_CC > + AC_PROG_CXX > ++AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory]) > + AM_PROG_CC_C_O > + AC_PROG_CPP > + AC_PROG_INSTALL > +diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 > +new file mode 100644 > +index ..5032bba8091d > +--- /dev/null > b/m4/ax_cxx_compile_stdcxx.m4 > +@@ -0,0 +1,982 @@ > ++# > === > ++# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html > ++# > === > ++# > ++# SYNOPSIS > ++# > ++# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) > ++# > ++# DESCRIPTION > ++# > ++# Check for baseline language coverage in the compiler for the specified > ++# version of the C++ standard. If necessary, add switches to CXX and > ++# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) > ++# or '14' (for the C++14 standard). > ++# > ++# The second argument, if specified, indicates whether you insist on an > ++# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. > ++# -std=c++11). If neither is specified, you get whatever works, with > ++# preference for an extended mode. > ++# > ++# The third argument, if specified 'mandatory' or if left unspecified, > ++# indicates that baseline support for the specified C++ standard is > ++# required and that the macro should error out if no mode with that > ++# support is found. If specified 'optional', then configuration proceeds > ++# regardless, after defining HAVE_CXX${VERSION} if and only if a > ++# supporting mode is found. > ++# > ++# LICENSE > ++# > ++# Copyright (c) 2008 Benjamin Kosnik > ++# Copyright (c) 2012 Zack Weinberg > ++# Copyright (c) 2013 Roy Stogner > ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov > > ++# Copyright (c) 2015 Paul Norman > ++# Copyright (c) 2015 Moritz Klammler > ++# Copyright (c) 2016 Krzesimir Nowak > ++# > ++# Copying and distribution of this file, with or without modification, are > ++# permitted in any medium without royalty provided the copyright notice > ++# and this notice are preserved. This file is offered as-is, without any > ++# warranty. > ++ > ++#serial 7 > ++ >
[ptxdist] [PATCH 7/7] cups-filters: new package: additional filters and backends for CUPS
Upstream is very responsive, merged some patches and made a new release while I was still packaging the old one :) Signed-off-by: Roland Hieber--- .../0001-configure.ac-check-for-C-11-support.patch | 1019 patches/cups-filters-1.16.1/autogen.sh |2 + patches/cups-filters-1.16.1/series |4 + rules/cups-filters.in | 69 ++ rules/cups-filters.make| 96 ++ 5 files changed, 1190 insertions(+) create mode 100644 patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch create mode 100755 patches/cups-filters-1.16.1/autogen.sh create mode 100644 patches/cups-filters-1.16.1/series create mode 100644 rules/cups-filters.in create mode 100644 rules/cups-filters.make diff --git a/patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch b/patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch new file mode 100644 index 0..a7d308e0e --- /dev/null +++ b/patches/cups-filters-1.16.1/0001-configure.ac-check-for-C-11-support.patch @@ -0,0 +1,1019 @@ +From: Roland Hieber +Date: Tue, 15 Aug 2017 12:53:14 +0200 +Subject: [PATCH] configure.ac: check for C++11 support + +The filters pdftoopvp, bannertopdf and pdftoraster depend on features +only available in C++11, indirectly also because poppler does not put +-std=c++11 on its pkg-config CFLAGS (but I'm not sure whether it should +even do this). Solve this problems by adding -std=c++1 to $(CXX), if +necessary, or fail if the compiler does not support C++11. + +Forwarded: https://bugs.linuxfoundation.org/show_bug.cgi?id=1404 +Applied-Upstream: http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7674 +Signed-off-by: Roland Hieber +--- + configure.ac| 1 + + m4/ax_cxx_compile_stdcxx.m4 | 982 + 2 files changed, 983 insertions(+) + create mode 100644 m4/ax_cxx_compile_stdcxx.m4 + +diff --git a/configure.ac b/configure.ac +index 6ce671e6026a..7ad5592e0423 100644 +--- a/configure.ac b/configure.ac +@@ -52,6 +52,7 @@ AH_BOTTOM([ + # === + AC_PROG_CC + AC_PROG_CXX ++AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory]) + AM_PROG_CC_C_O + AC_PROG_CPP + AC_PROG_INSTALL +diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 +new file mode 100644 +index ..5032bba8091d +--- /dev/null b/m4/ax_cxx_compile_stdcxx.m4 +@@ -0,0 +1,982 @@ ++# === ++# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html ++# === ++# ++# SYNOPSIS ++# ++# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) ++# ++# DESCRIPTION ++# ++# Check for baseline language coverage in the compiler for the specified ++# version of the C++ standard. If necessary, add switches to CXX and ++# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) ++# or '14' (for the C++14 standard). ++# ++# The second argument, if specified, indicates whether you insist on an ++# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. ++# -std=c++11). If neither is specified, you get whatever works, with ++# preference for an extended mode. ++# ++# The third argument, if specified 'mandatory' or if left unspecified, ++# indicates that baseline support for the specified C++ standard is ++# required and that the macro should error out if no mode with that ++# support is found. If specified 'optional', then configuration proceeds ++# regardless, after defining HAVE_CXX${VERSION} if and only if a ++# supporting mode is found. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Benjamin Kosnik ++# Copyright (c) 2012 Zack Weinberg ++# Copyright (c) 2013 Roy Stogner ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov ++# Copyright (c) 2015 Paul Norman ++# Copyright (c) 2015 Moritz Klammler ++# Copyright (c) 2016 Krzesimir Nowak ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 7 ++ ++dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro ++dnl (serial version number 13). ++ ++AX_REQUIRE_DEFINED([AC_MSG_WARN]) ++AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl ++ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], ++[$1], [14], [ax_cxx_compile_alternatives="14 1y"], ++[$1], [17],