diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-07-23 04:16:51 -0400 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2017-07-23 22:11:44 +1000 |
| commit | bd12de08e6eb80fb0916964bacc9fceabe74c495 (patch) | |
| tree | ff3418ec3ab10f8803081fb65b9fa8553dd1e14b /net-print | |
| parent | dev-python/responses: Drop myself as a maintainer (diff) | |
| download | gentoo-bd12de08e6eb80fb0916964bacc9fceabe74c495.tar.gz gentoo-bd12de08e6eb80fb0916964bacc9fceabe74c495.tar.bz2 gentoo-bd12de08e6eb80fb0916964bacc9fceabe74c495.zip | |
net-print/dymo-cups-drivers: Use newer cups headers
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610468
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild | 3 | ||||
| -rw-r--r-- | net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch | 78 |
2 files changed, 80 insertions, 1 deletions
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild index 93bcc93cda46..3e7e04d9b913 100644 --- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild +++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,6 +25,7 @@ RESTRICT=test src_prepare() { epatch "${FILESDIR}"/${PN}-1.2.0-cxxflags.patch + epatch "${FILESDIR}"/port_to_newer_cups_headers.patch eautoreconf } diff --git a/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch b/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch new file mode 100644 index 000000000000..867766479492 --- /dev/null +++ b/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch @@ -0,0 +1,78 @@ +Bug: https://bugs.gentoo.org/610468 + +Description: Port to newer cups headers: ppd_file_t is only defined in ppd.h +Author: Didier Raboud <odyx@debian.org> +Origin: vendor +Last-Update: 2016-09-24 + +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ + + AC_CHECK_LIB(cups, cupsMarkOptions, , AC_ERROR([Can't find cups library])) + AC_CHECK_LIB(cupsimage, cupsRasterReadHeader, , AC_ERROR([Can't find cupsimage library])) +-AC_CHECK_HEADERS([cups/cups.h cups/raster.h],, AC_ERROR([Can't find cups headers])) ++AC_CHECK_HEADERS([cups/cups.h cups/raster.h cups/ppd.h],, AC_ERROR([Can't find cups headers])) + + #CUPS_LIBS=`cups-config --image --libs` + #CUPS_LIBS="-lcups -lcupsimage" +--- a/src/common/CupsFilter.h ++++ b/src/common/CupsFilter.h +@@ -23,6 +23,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include <memory> + #include <string> + #include "CupsPrintEnvironment.h" +--- a/src/lm/CupsFilterLabelManager.h ++++ b/src/lm/CupsFilterLabelManager.h +@@ -23,6 +23,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include "LabelManagerDriver.h" + #include "LabelManagerLanguageMonitor.h" + #include "DummyLanguageMonitor.h" +--- a/src/lw/CupsFilterLabelWriter.h ++++ b/src/lw/CupsFilterLabelWriter.h +@@ -23,6 +23,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include "LabelWriterDriver.h" + #include "LabelWriterLanguageMonitor.h" + #include "DummyLanguageMonitor.h" +--- a/src/lw/raster2dymolw.cpp ++++ b/src/lw/raster2dymolw.cpp +@@ -20,6 +20,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include <stdlib.h> + #include <unistd.h> + #include <string.h> +--- a/src/lw/tests/TestLabelWriterFilter.h ++++ b/src/lw/tests/TestLabelWriterFilter.h +@@ -27,6 +27,7 @@ + #include "../DummyLanguageMonitor.h" + + #include <cups/cups.h> ++#include <cups/ppd.h> + + class LabelWriterFilterTest: public CPPUNIT_NS::TestFixture + { +--- a/src/lm/tests/TestLabelManagerFilter.h ++++ b/src/lm/tests/TestLabelManagerFilter.h +@@ -26,6 +26,7 @@ + #include "../LabelManagerDriver.h" + #include "DummyLanguageMonitor.h" + #include <cups/cups.h> ++#include <cups/ppd.h> + + class LabelManagerFilterTest: public CPPUNIT_NS::TestFixture + { |