diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-print/dymo-cups-drivers/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-print/dymo-cups-drivers/files')
-rw-r--r-- | net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch | 15 | ||||
-rw-r--r-- | net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch | 78 |
2 files changed, 93 insertions, 0 deletions
diff --git a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch new file mode 100644 index 000000000000..03d233acb1e2 --- /dev/null +++ b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch @@ -0,0 +1,15 @@ +Index: dymo-cups-drivers-1.2.0/configure.ac +=================================================================== +--- dymo-cups-drivers-1.2.0.orig/configure.ac ++++ dymo-cups-drivers-1.2.0/configure.ac +@@ -87,9 +87,7 @@ AM_CONDITIONAL([SAMPLES], [test x$sample + AC_SUBST(cups_cflags) + + warning_flags="-Wall -Wno-unknown-pragmas" +-debug_flags="" +-optimization_flags="-O2" +-CXXFLAGS="${optimization_flags} ${warning_flags} ${debug_flags} ${cups_cflags}" ++CXXFLAGS="${CXXFLAGS} ${warning_flags} ${debug_flags} ${cups_cflags}" + + + AC_CHECK_LIB(cups, cupsMarkOptions, , AC_ERROR([Can't find cups library])) 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 + { |