gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 02:39:08 -07:00
Code Issues Projects Releases Wiki Activity

net-print/dymo-cups-drivers: Use newer cups headers

Browse Source 
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610468
Package-Manager: Portage-2.3.6, Repoman-2.3.2
This commit is contained in:
Peter Levine
2017-07-23 04:16:51 -04:00
committed by Michael Palimaka
parent 6fe2d04fa7
commit bd12de08e6
2 changed files with 80 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
View File

@@ -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
}

78
net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch Normal file
View File

@@ -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
{