1 |
commit: bd12de08e6eb80fb0916964bacc9fceabe74c495 |
2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 23 08:16:51 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 23 12:11:44 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd12de08 |
7 |
|
8 |
net-print/dymo-cups-drivers: Use newer cups headers |
9 |
|
10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610468 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
12 |
|
13 |
.../dymo-cups-drivers-1.4.0.ebuild | 3 +- |
14 |
.../files/port_to_newer_cups_headers.patch | 78 ++++++++++++++++++++++ |
15 |
2 files changed, 80 insertions(+), 1 deletion(-) |
16 |
|
17 |
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 |
18 |
index 93bcc93cda4..3e7e04d9b91 100644 |
19 |
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild |
20 |
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
+# Copyright 1999-2017 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=5 |
27 |
@@ -25,6 +25,7 @@ RESTRICT=test |
28 |
|
29 |
src_prepare() { |
30 |
epatch "${FILESDIR}"/${PN}-1.2.0-cxxflags.patch |
31 |
+ epatch "${FILESDIR}"/port_to_newer_cups_headers.patch |
32 |
eautoreconf |
33 |
} |
34 |
|
35 |
|
36 |
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 |
37 |
new file mode 100644 |
38 |
index 00000000000..86776647949 |
39 |
--- /dev/null |
40 |
+++ b/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch |
41 |
@@ -0,0 +1,78 @@ |
42 |
+Bug: https://bugs.gentoo.org/610468 |
43 |
+ |
44 |
+Description: Port to newer cups headers: ppd_file_t is only defined in ppd.h |
45 |
+Author: Didier Raboud <odyx@××××××.org> |
46 |
+Origin: vendor |
47 |
+Last-Update: 2016-09-24 |
48 |
+ |
49 |
+--- a/configure.ac |
50 |
++++ b/configure.ac |
51 |
+@@ -94,7 +94,7 @@ |
52 |
+ |
53 |
+ AC_CHECK_LIB(cups, cupsMarkOptions, , AC_ERROR([Can't find cups library])) |
54 |
+ AC_CHECK_LIB(cupsimage, cupsRasterReadHeader, , AC_ERROR([Can't find cupsimage library])) |
55 |
+-AC_CHECK_HEADERS([cups/cups.h cups/raster.h],, AC_ERROR([Can't find cups headers])) |
56 |
++AC_CHECK_HEADERS([cups/cups.h cups/raster.h cups/ppd.h],, AC_ERROR([Can't find cups headers])) |
57 |
+ |
58 |
+ #CUPS_LIBS=`cups-config --image --libs` |
59 |
+ #CUPS_LIBS="-lcups -lcupsimage" |
60 |
+--- a/src/common/CupsFilter.h |
61 |
++++ b/src/common/CupsFilter.h |
62 |
+@@ -23,6 +23,7 @@ |
63 |
+ |
64 |
+ #include <cups/cups.h> |
65 |
+ #include <cups/raster.h> |
66 |
++#include <cups/ppd.h> |
67 |
+ #include <memory> |
68 |
+ #include <string> |
69 |
+ #include "CupsPrintEnvironment.h" |
70 |
+--- a/src/lm/CupsFilterLabelManager.h |
71 |
++++ b/src/lm/CupsFilterLabelManager.h |
72 |
+@@ -23,6 +23,7 @@ |
73 |
+ |
74 |
+ #include <cups/cups.h> |
75 |
+ #include <cups/raster.h> |
76 |
++#include <cups/ppd.h> |
77 |
+ #include "LabelManagerDriver.h" |
78 |
+ #include "LabelManagerLanguageMonitor.h" |
79 |
+ #include "DummyLanguageMonitor.h" |
80 |
+--- a/src/lw/CupsFilterLabelWriter.h |
81 |
++++ b/src/lw/CupsFilterLabelWriter.h |
82 |
+@@ -23,6 +23,7 @@ |
83 |
+ |
84 |
+ #include <cups/cups.h> |
85 |
+ #include <cups/raster.h> |
86 |
++#include <cups/ppd.h> |
87 |
+ #include "LabelWriterDriver.h" |
88 |
+ #include "LabelWriterLanguageMonitor.h" |
89 |
+ #include "DummyLanguageMonitor.h" |
90 |
+--- a/src/lw/raster2dymolw.cpp |
91 |
++++ b/src/lw/raster2dymolw.cpp |
92 |
+@@ -20,6 +20,7 @@ |
93 |
+ |
94 |
+ #include <cups/cups.h> |
95 |
+ #include <cups/raster.h> |
96 |
++#include <cups/ppd.h> |
97 |
+ #include <stdlib.h> |
98 |
+ #include <unistd.h> |
99 |
+ #include <string.h> |
100 |
+--- a/src/lw/tests/TestLabelWriterFilter.h |
101 |
++++ b/src/lw/tests/TestLabelWriterFilter.h |
102 |
+@@ -27,6 +27,7 @@ |
103 |
+ #include "../DummyLanguageMonitor.h" |
104 |
+ |
105 |
+ #include <cups/cups.h> |
106 |
++#include <cups/ppd.h> |
107 |
+ |
108 |
+ class LabelWriterFilterTest: public CPPUNIT_NS::TestFixture |
109 |
+ { |
110 |
+--- a/src/lm/tests/TestLabelManagerFilter.h |
111 |
++++ b/src/lm/tests/TestLabelManagerFilter.h |
112 |
+@@ -26,6 +26,7 @@ |
113 |
+ #include "../LabelManagerDriver.h" |
114 |
+ #include "DummyLanguageMonitor.h" |
115 |
+ #include <cups/cups.h> |
116 |
++#include <cups/ppd.h> |
117 |
+ |
118 |
+ class LabelManagerFilterTest: public CPPUNIT_NS::TestFixture |
119 |
+ { |