[gentoo-commits] repo/gentoo:master commit in: net-print/dymo-cups-drivers/files/, net-print/dymo-cups-drivers/

[gentoo-commits] repo/gentoo:master commit in: net-print/dymo-cups-drivers/files/, net-print/dymo-cups-drivers/

[Manuel Rüger]

commit:     dc651553cf0ae7be5ab248477eaff67873bc7c3e
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 18:26:38 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 18:26:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc651553

net-print/dymo-cups-drivers: Remove old

Package-Manager: portage-2.2.23

 net-print/dymo-cups-drivers/Manifest               |  1 -
 .../dymo-cups-drivers-1.2.0.ebuild                 | 40 ------------------
 .../files/dymo-cups-drivers-1.2.0+gcc-4.6.patch    | 48 ----------------------
 3 files changed, 89 deletions(-)

diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
index b66b72a..fdcb0ad 100644
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -1,2 +1 @@
-DIST dymo-cups-drivers-1.2.0.tar.gz 280453 SHA256 23cc45f9e128ec229c3fcdcbf4e6e7b16fc196be466c24dd4e39dcc3432df5af SHA512 b53f0f248d7da03c4b3c691d8f07a1f0818160df1b596bc7ea734f50fdb0973a12bd564abeb6be6595a828aa8e3b10384c9d85c1199e98ddb72bbb74b1ec067d WHIRLPOOL 0be85646208036dee05c13790accdbd0dbc42c4abecc8f5094eb9fbc2fdf5b8112aa2497fbfc84b04971be03d3902608b72202f66847c2c50dce745e7170952d
 DIST dymo-cups-drivers-1.4.0.tar.gz 420068 SHA256 c60797e7e986ca329f46e9a6ab1cb6382383952b15685ed69fd91f3c7ed64f71 SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c WHIRLPOOL 6f05c6717bb51a5dbfa8e0ed1581745787f0e2f26d24b36ab7c566160947f5baf3bff5db4e4e7c365ca1b82d526fcd3af3ec4607ec6804a6883fa6a70c146c4b

diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
deleted file mode 100644
index b68a021..0000000
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
-HOMEPAGE="http://sites.dymo.com/DeveloperProgram/Pages/LW_SDK_Linux.aspx"
-SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-# tests fail but needs to be investigated
-RESTRICT=test
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}+gcc-4.6.patch \
-		"${FILESDIR}"/${P}-cxxflags.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}
-	doins docs/*.{txt,rtf,ps,png}
-}

diff --git a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch
deleted file mode 100644
index 3f60290..0000000
--- a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: dymo-cups-drivers-1.2.0/src/common/Halftoning.h
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/common/Halftoning.h
-+++ dymo-cups-drivers-1.2.0/src/common/Halftoning.h
-@@ -22,6 +22,7 @@
- #ifndef h4D098F6A_47C6_4e9d_BD74_2DC6034F8EEF
- #define h4D098F6A_47C6_4e9d_BD74_2DC6034F8EEF
- 
-+#include <cstdlib>
- #include "CommonTypedefs.h"
- 
- //namespace dymo
-Index: dymo-cups-drivers-1.2.0/src/lw/LabelWriterDriver.h
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/lw/LabelWriterDriver.h
-+++ dymo-cups-drivers-1.2.0/src/lw/LabelWriterDriver.h
-@@ -21,6 +21,7 @@
- #ifndef h53a93353_4968_443a_a5aa_1167526295fc
- #define h53a93353_4968_443a_a5aa_1167526295fc
- 
-+#include <cstdlib>
- #include "PrinterDriver.h"
- 
- namespace DymoPrinterDriver
-Index: dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.h
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/lw/tests/MOCK_LWLMPrintEnvironment.h
-+++ dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.h
-@@ -21,6 +21,7 @@
- #ifndef hc8e31bb3_01a5_4422_84b8_64c017e18521
- #define hc8e31bb3_01a5_4422_84b8_64c017e18521
- 
-+#include <cstdlib>
- #include "../PrinterDriver.h"
- #include "MOCK_PrintEnvironment.h"
- 
-Index: dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
-+++ dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
-@@ -20,6 +20,7 @@
- 
- #include "MOCK_LWLMPrintEnvironment.h"
- #include "../LabelWriterDriver.h"
-+#include <cassert>
- 
- static const byte TOF_BIT           = 0x02;
- static const byte ROLL_CHANGED_BIT  = 0x08;

[gentoo-commits] repo/gentoo:master commit in: net-print/dymo-cups-drivers/files/, net-print/dymo-cups-drivers/

[Robin H. Johnson]

commit:     467014aadc7dd5e85c0aa4e25083d7a67b8c95c5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 23:01:14 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 23:03:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467014aa

net-print/dymo-cups-drivers: compile-fix for cups-2.3

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=693652
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../dymo-cups-drivers-1.4.0-r2.ebuild              | 55 ++++++++++++++++++++++
 .../files/cups-2.3.0-headers.patch                 | 24 ++++++++++
 2 files changed, 79 insertions(+)

diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
new file mode 100644
index 00000000000..bd4c15c361e
--- /dev/null
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils autotools
+
+DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
+HOMEPAGE="https://newellrubbermaid.secure.force.com/dymopkb"
+SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
+
+S="${WORKDIR}/${P}.5"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test usb_modeswitch"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=net-print/cups-2.3.0"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )
+	usb_modeswitch? ( sys-apps/usb_modeswitch )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-cxxflags.patch
+	"${FILESDIR}"/port_to_newer_cups_headers.patch
+	"${FILESDIR}"/dymo-cups-drivers-1.4.0.5-flexible-tests.patch
+	"${FILESDIR}"/cups-2.3.0-headers.patch
+)
+
+DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
+
+src_prepare() {
+	default
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc docs/*.{txt,rtf,ps,png}
+}
+
+src_test() {
+	# upstream tests are designed to be run AFTER make install, because they depend on final paths.
+	testroot="${T}/testroot"
+	mkdir -p "${testroot}"
+	emake install DESTDIR="${testroot}"
+	# -W filters is because CUPS tries really hard for secure filters: they must be root/root for the filter tests to pass
+	#chown root:root "${testroot}"/usr/libexec/cups/filter/{raster2dymolm,raster2dymolw} || die "failed to set ownership for tests"
+	# This will trigger the following warning repeatedly
+	#Bad permissions on cupsFilter file "..${testroot}/usr/libexec/cups/filter/raster2dymolm"
+	emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters"
+}

diff --git a/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch b/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
new file mode 100644
index 00000000000..059c3d0c29c
--- /dev/null
+++ b/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
@@ -0,0 +1,24 @@
+https://github.com/codeprofis/dymo-cups-drivers/commit/948abc3500f45578a386182c0d2a55bcfcbc2c66.patch
+
+From 948abc3500f45578a386182c0d2a55bcfcbc2c66 Mon Sep 17 00:00:00 2001
+From: Florian Knodt <adlerweb@adlerweb.info>
+Date: Fri, 28 Feb 2020 23:26:34 +0100
+Subject: [PATCH] Add missing backend header. Fixes #11.
+
+---
+ src/common/CupsPrintEnvironment.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/CupsPrintEnvironment.h b/src/common/CupsPrintEnvironment.h
+index 23043d8..76ecefc 100644
+--- a/src/common/CupsPrintEnvironment.h
++++ b/src/common/CupsPrintEnvironment.h
+@@ -21,6 +21,8 @@
+ #ifndef h952b1c81_8931_433a_8479_7ae6d8e85a86
+ #define h952b1c81_8931_433a_8479_7ae6d8e85a86
+ 
++#include <cups/backend.h>
++#include <cups/sidechannel.h>
+ #include "PrinterDriver.h"
+ 
+ namespace DymoPrinterDriver