summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn K. Luebs2016-10-27 20:15:34 -0400
committerJohn K. Luebs2016-10-27 20:17:54 -0400
commitfff1bbd2f6cc73270cbd38fa5fefda7b60260eef (patch)
treed0886e1a7ea553f69fb3d7eeb4fa9b404c860fd8
parente79d84a2b4ef7d3248b32f82c41d5756746ad9c9 (diff)
downloadaur-fff1bbd2f6cc73270cbd38fa5fefda7b60260eef.tar.gz
add fix for changed cups library header files
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
-rw-r--r--cups-ppd-header.patch40
3 files changed, 56 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0cce5e517780..cd7ddd3c85fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 27 00:23:15 UTC 2016
+# Fri Oct 28 00:15:16 UTC 2016
pkgbase = dymo-cups-drivers
pkgdesc = Official Dymo supplied Linux Cups drivers for LabelWriter series
pkgver = 1.4.0.5
- pkgrel = 2
+ pkgrel = 3
url = http://global.dymo.com/
arch = i686
arch = x86_64
@@ -11,7 +11,9 @@ pkgbase = dymo-cups-drivers
license = LGPL
depends = libcups
source = http://download.dymo.com/Software/Linux/dymo-cups-drivers-1.4.0.tar.gz
- sha1sums = 3576496a1afd5a0e076821081a1919468b50d347
+ source = cups-ppd-header.patch
+ sha256sums = c60797e7e986ca329f46e9a6ab1cb6382383952b15685ed69fd91f3c7ed64f71
+ sha256sums = 3a11eaffc5295e4811721b1bd1e51d79ed5e2c5e7665d4be7fc9ce0579fd2a17
pkgname = dymo-cups-drivers
diff --git a/PKGBUILD b/PKGBUILD
index f48edde6afb7..a4609d8dba61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,23 @@
pkgname=dymo-cups-drivers
pkgver=1.4.0.5
-pkgrel=2
+pkgrel=3
_archive_ver=1.4.0
url=http://global.dymo.com/
pkgdesc="Official Dymo supplied Linux Cups drivers for LabelWriter series"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL')
depends=('libcups')
-source=(http://download.dymo.com/Software/Linux/${pkgname}-${_archive_ver}.tar.gz)
-sha1sums=('3576496a1afd5a0e076821081a1919468b50d347')
+source=(http://download.dymo.com/Software/Linux/${pkgname}-${_archive_ver}.tar.gz
+ cups-ppd-header.patch)
+sha256sums=('c60797e7e986ca329f46e9a6ab1cb6382383952b15685ed69fd91f3c7ed64f71'
+ '3a11eaffc5295e4811721b1bd1e51d79ed5e2c5e7665d4be7fc9ce0579fd2a17')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/cups-ppd-header.patch"
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/cups-ppd-header.patch b/cups-ppd-header.patch
new file mode 100644
index 000000000000..46b366915d9f
--- /dev/null
+++ b/cups-ppd-header.patch
@@ -0,0 +1,40 @@
+diff -ur dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h
+--- dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h 2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h 2016-10-27 20:13:46.267013540 -0400
+@@ -23,6 +23,7 @@
+
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include <memory>
+ #include <string>
+ #include "CupsPrintEnvironment.h"
+diff -ur dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h
+--- dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h 2012-02-07 08:22:38.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h 2016-10-27 20:14:00.407310094 -0400
+@@ -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"
+@@ -50,4 +51,4 @@
+
+ /*
+ * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+- */
+\ No newline at end of file
++ */
+diff -ur dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h
+--- dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h 2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h 2016-10-27 20:14:23.717798963 -0400
+@@ -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"