summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian2017-10-03 02:03:24 +0200
committerAlexander Sulfrian2017-10-03 02:15:26 +0200
commitf0c9d6036c4d8a0929bd1ae40161bc38f7585b4b (patch)
tree379b91f10e609715ccc7fbd57c1623e966539e5a
parent6f498012e1272ef8665989a0c9d60b8546ab8a1f (diff)
downloadaur-f0c9d6036c4d8a0929bd1ae40161bc38f7585b4b.tar.gz
Add (debian) patch for cups 2.2 compatibility
Cups2.2 moved some definitions in other header files and requires the additional include of ppd.h.
-rw-r--r--.SRCINFO4
-rw-r--r--Add-include-cups-ppd.h.patch22
-rw-r--r--PKGBUILD10
3 files changed, 32 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b291373bacdd..387658bf84e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = printer-driver-ptouch
pkgdesc = printer driver Brother P-touch label printers
pkgver = 1.4.2
- pkgrel = 1
+ pkgrel = 2
url = https://bitbucket.org/philpem/printer-driver-ptouch
arch = i686
arch = x86_64
@@ -12,7 +12,9 @@ pkgbase = printer-driver-ptouch
depends = ghostscript
depends = foomatic-db
source = printer-driver-ptouch-1.4.2.tar.bz2::https://bitbucket.org/philpem/printer-driver-ptouch/get/1.4.2.tar.bz2
+ source = Add-include-cups-ppd.h.patch
sha256sums = 588b6ef0d10a693a8e8fc3e6e01dcbe31d502410a2a37ff99db3198ffe0516a2
+ sha256sums = 22721f6f371114f8725b70cc2877276bce1a38eb9680dcaa7d268eba990e8b4c
pkgname = printer-driver-ptouch
diff --git a/Add-include-cups-ppd.h.patch b/Add-include-cups-ppd.h.patch
new file mode 100644
index 000000000000..266906d5dfbd
--- /dev/null
+++ b/Add-include-cups-ppd.h.patch
@@ -0,0 +1,22 @@
+From a5cd2164661b2b8d7bf3ffc64f0632541088a028 Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 24 Sep 2016 19:04:32 +0200
+Subject: Add 'include <cups/ppd.h>' as CUPS 2.2 moved some definitions to
+ ppd.h
+
+---
+ rastertoptch.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rastertoptch.c b/rastertoptch.c
+index 33e7193..9d4db16 100644
+--- a/rastertoptch.c
++++ b/rastertoptch.c
+@@ -312,6 +312,7 @@
+ #include <math.h>
+ #include <cups/raster.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+
+ #if STDC_HEADERS
+ # include <string.h>
diff --git a/PKGBUILD b/PKGBUILD
index 256388b37577..897b91f85bfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname="printer-driver-ptouch"
pkgver=1.4.2
-pkgrel=1
+pkgrel=2
pkgdesc='printer driver Brother P-touch label printers'
arch=('i686' 'x86_64')
url='https://bitbucket.org/philpem/printer-driver-ptouch'
@@ -11,12 +11,16 @@ license=('GPL')
depends=('ghostscript' 'foomatic-db')
makedepends=('autoconf' 'libcups' 'foomatic-db-engine')
-source=("$pkgname-$pkgver.tar.bz2::https://bitbucket.org/philpem/$pkgname/get/$pkgver.tar.bz2")
-sha256sums=('588b6ef0d10a693a8e8fc3e6e01dcbe31d502410a2a37ff99db3198ffe0516a2')
+source=("$pkgname-$pkgver.tar.bz2::https://bitbucket.org/philpem/$pkgname/get/$pkgver.tar.bz2"
+ 'Add-include-cups-ppd.h.patch')
+sha256sums=('588b6ef0d10a693a8e8fc3e6e01dcbe31d502410a2a37ff99db3198ffe0516a2'
+ '22721f6f371114f8725b70cc2877276bce1a38eb9680dcaa7d268eba990e8b4c')
prepare() {
ln -sf --no-dereference "philpem-$pkgname-"*/ "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
+
+ patch -p1 < ../Add-include-cups-ppd.h.patch
}
build() {