diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | Add-PT-2430PC.patch | 560 | ||||
| -rw-r--r-- | Add-include-cups-ppd.h.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 40 |
4 files changed, 18 insertions, 619 deletions
@@ -1,7 +1,7 @@ pkgbase = printer-driver-ptouch - pkgdesc = printer driver Brother P-touch label printers - pkgver = 1.4.2 - pkgrel = 4 + pkgdesc = P-Touch PT-series and QL-series printer driver for Linux (under CUPS) + pkgver = 1.5.1 + pkgrel = 1 url = https://github.com/philpem/printer-driver-ptouch arch = i686 arch = x86_64 @@ -10,13 +10,8 @@ pkgbase = printer-driver-ptouch makedepends = libcups makedepends = foomatic-db-engine depends = ghostscript - depends = foomatic-db - source = https://github.com/philpem/printer-driver-ptouch/archive/5fe72de0577215eb04a6fcbe49b24bcf5e228dec.tar.gz - source = Add-include-cups-ppd.h.patch - source = Add-PT-2430PC.patch - sha256sums = d12c4cdd57013536e2803a8d9579cb2260c29a225ac23c7868016549c3d6b06b - sha256sums = 22721f6f371114f8725b70cc2877276bce1a38eb9680dcaa7d268eba990e8b4c - sha256sums = 363313b9cce5a223ab4a72e7423f32d73b17bafc334454a99da8c0c1363983ca + source = printer-driver-ptouch-1.5.1.tar.gz::https://github.com/philpem/printer-driver-ptouch/archive/v1.5.1.tar.gz + sha256sums = 92de714d5b0103a7216812b4a497edeb879405fa57acace65e2c7b226e9e71de pkgname = printer-driver-ptouch diff --git a/Add-PT-2430PC.patch b/Add-PT-2430PC.patch deleted file mode 100644 index 5514cc5165eb..000000000000 --- a/Add-PT-2430PC.patch +++ /dev/null @@ -1,560 +0,0 @@ -diff -ur a/driver/ptouch.xml b/driver/ptouch.xml ---- a/driver/ptouch.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/driver/ptouch.xml 2017-10-03 01:34:27.128783723 +0200 -@@ -97,6 +97,9 @@ - <id>printer/Brother-PT-2420PC</id><!-- Brother P-touch PT-2420PC --> - </printer> - <printer> -+ <id>printer/Brother-PT-2430PC</id><!-- Brother P-touch PT-2430PC --> -+ </printer> -+ <printer> - <id>printer/Brother-PT-2450DX</id><!-- Brother P-touch PT-2450DX --> - </printer> - <printer> -diff -ur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2016-07-29 20:28:29.000000000 +0200 -+++ b/Makefile.am 2017-10-03 01:34:27.128783723 +0200 -@@ -36,6 +36,7 @@ - printer/Brother-PT-1960.xml \ - printer/Brother-PT-2300.xml \ - printer/Brother-PT-2420PC.xml \ -+ printer/Brother-PT-2430PC.xml \ - printer/Brother-PT-2450DX.xml \ - printer/Brother-PT-2500PC.xml \ - printer/Brother-PT-2600.xml \ -@@ -50,6 +51,7 @@ - opt/Brother-Ptouch-AdvanceDistance.xml \ - opt/Brother-Ptouch-Align.xml \ - opt/Brother-Ptouch-BytesPerLine.xml \ -+ opt/Brother-Ptouch-ChainPrint.xml \ - opt/Brother-Ptouch-ConcatPages.xml \ - opt/Brother-Ptouch-CutMark.xml \ - opt/Brother-Ptouch-CutMedia.xml \ -diff -ur a/opt/Brother-Ptouch-Align.xml b/opt/Brother-Ptouch-Align.xml ---- a/opt/Brother-Ptouch-Align.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-Align.xml 2017-10-03 01:34:27.138783958 +0200 -@@ -111,6 +111,11 @@ - </constraint> - <constraint sense='true'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>ev/Center</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>ev/Center</arg_defval> - </constraint> -diff -ur a/opt/Brother-Ptouch-BytesPerLine.xml b/opt/Brother-Ptouch-BytesPerLine.xml ---- a/opt/Brother-Ptouch-BytesPerLine.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-BytesPerLine.xml 2017-10-03 01:34:27.138783958 +0200 -@@ -116,6 +116,11 @@ - </constraint> - <constraint sense='true'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>16</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>16</arg_defval> - </constraint> -diff -ur /dev/null b/opt/Brother-Ptouch-ChainPrint.xml ---- /dev/null 2017-10-01 19:39:54.599409226 +0200 -+++ b/opt/Brother-Ptouch-ChainPrint.xml 2017-10-03 01:09:03.979289693 +0200 -@@ -0,0 +1,31 @@ -+<option type='bool' id='Brother-Ptouch-ChainPrint'> -+ <!-- A multilingual <comments> block can appear here, too; -+ it should be treated as documentation for the user. --> -+ <arg_longname> -+ <en>Chain Print</en> -+ </arg_longname> -+ <arg_shortname> -+ <en>ChainPrint</en><!-- backends only know <en> shortnames! --> -+ </arg_shortname> -+ <arg_shortname_false> -+ <en>noChainPrint</en><!-- backends only know <en> shortnames! --> -+ </arg_shortname_false> -+ <arg_execution> -+ <arg_group>Finishing</arg_group> -+ <arg_order>120</arg_order> -+ <arg_spot>B</arg_spot> -+ <arg_substitution /> -+ <arg_proto> ChainPrint </arg_proto> -+ </arg_execution> -+ <constraints> -+ <constraint sense='false'> -+ <driver>ptouch</driver> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>0</arg_defval> -+ </constraint> -+ </constraints> -+</option> -diff -ur a/opt/Brother-Ptouch-CutMark.xml b/opt/Brother-Ptouch-CutMark.xml ---- a/opt/Brother-Ptouch-CutMark.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-CutMark.xml 2017-10-03 01:34:27.138783958 +0200 -@@ -91,6 +91,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -diff -ur a/opt/Brother-Ptouch-HalfCut.xml b/opt/Brother-Ptouch-HalfCut.xml ---- a/opt/Brother-Ptouch-HalfCut.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-HalfCut.xml 2017-10-03 01:34:27.138783958 +0200 -@@ -109,6 +109,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -diff -ur a/opt/Brother-Ptouch-LabelPreamble.xml b/opt/Brother-Ptouch-LabelPreamble.xml ---- a/opt/Brother-Ptouch-LabelPreamble.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-LabelPreamble.xml 2017-10-03 01:34:27.138783958 +0200 -@@ -113,6 +113,11 @@ - </constraint> - <constraint sense='true'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>0</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>0</arg_defval> - </constraint> -diff -ur a/opt/Brother-Ptouch-PageSize.xml b/opt/Brother-Ptouch-PageSize.xml ---- a/opt/Brother-Ptouch-PageSize.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-PageSize.xml 2017-10-03 01:34:27.142117368 +0200 -@@ -102,6 +102,11 @@ - </constraint> - <constraint sense='true'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>ev/Ptouch-PageSize-24x100mm</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>ev/Ptouch-PageSize-24x100mm</arg_defval> - </constraint> -@@ -212,6 +217,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -322,6 +332,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -432,6 +447,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -542,6 +562,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -652,6 +677,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -762,6 +792,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -872,6 +907,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -982,6 +1022,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1092,6 +1137,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1202,6 +1252,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1312,6 +1367,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1422,6 +1482,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1532,6 +1597,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1642,6 +1712,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -1752,6 +1827,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -2071,6 +2151,11 @@ - <arg_defval>na</arg_defval> - </constraint> - <constraint sense='false'> -+ <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> - <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> -diff -ur a/opt/Brother-Ptouch-PixelTransfer.xml b/opt/Brother-Ptouch-PixelTransfer.xml ---- a/opt/Brother-Ptouch-PixelTransfer.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-PixelTransfer.xml 2017-10-03 01:34:27.142117368 +0200 -@@ -86,6 +86,11 @@ - </constraint> - <constraint sense='true'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>ev/RLE</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>ev/RLE</arg_defval> - </constraint> -@@ -196,6 +201,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -360,6 +370,11 @@ - <arg_defval>na</arg_defval> - </constraint> - <constraint sense='false'> -+ <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> - <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> -diff -ur a/opt/Brother-Ptouch-Resolution.xml b/opt/Brother-Ptouch-Resolution.xml ---- a/opt/Brother-Ptouch-Resolution.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-Resolution.xml 2017-10-03 01:34:27.142117368 +0200 -@@ -106,6 +106,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -301,6 +306,11 @@ - </constraint> - <constraint sense='false'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> - </constraint> -@@ -400,6 +410,11 @@ - <arg_defval>na</arg_defval> - </constraint> - <constraint sense='false'> -+ <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>na</arg_defval> -+ </constraint> -+ <constraint sense='false'> - <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>na</arg_defval> -diff -ur a/opt/Brother-Ptouch-SoftwareMirror.xml b/opt/Brother-Ptouch-SoftwareMirror.xml ---- a/opt/Brother-Ptouch-SoftwareMirror.xml 2016-07-29 20:28:29.000000000 +0200 -+++ b/opt/Brother-Ptouch-SoftwareMirror.xml 2017-10-03 01:34:27.142117368 +0200 -@@ -113,6 +113,11 @@ - </constraint> - <constraint sense='true'> - <driver>ptouch</driver> -+ <printer>printer/Brother-PT-2430PC</printer><!-- Brother P-touch PT-2430PC --> -+ <arg_defval>0</arg_defval> -+ </constraint> -+ <constraint sense='true'> -+ <driver>ptouch</driver> - <printer>printer/Brother-PT-2450DX</printer><!-- Brother P-touch PT-2450DX --> - <arg_defval>0</arg_defval> - </constraint> -diff -ur /dev/null b/printer/Brother-PT-2430PC.xml ---- /dev/null 2017-10-01 19:39:54.599409226 +0200 -+++ b/printer/Brother-PT-2430PC.xml 2017-10-03 00:38:37.899489208 +0200 -@@ -0,0 +1,58 @@ -+<printer id="printer/Brother-PT-2430PC"> -+ <make>Brother</make> -+ <model>PT-2430PC</model> -+ <pcmodel>BR2430</pcmodel> -+ <mechanism> -+ <thermal/> -+ <!--not "color"--> -+ <resolution> -+ <dpi> -+ <x>180</x> -+ <y>180</y> -+ </dpi> -+ </resolution> -+ <consumables> -+ <comments> -+ <en> -+ Black on White Thermal Paper -+ Fabric Tape Blue on White -+ Flexi Tape -+ Iron on Black Tape -+ Security Tape Black on White -+ Strong Adhesive Tape -+ TZ tape widths w: 1=3.5mm, 2=6mm, 3=9mm, 4=12mm, 5=18mm, 6=24mm -+ TZ foreground colours f: 1=black, 2=red, 3=blue, 4=gold, 5=white, -+ TZ background colours b: 1=berry, 2=black, 3=blue, 4=clear, 5=gold geometric, 6=green, 7=grey, 8=lime green, 9=navy blue, 10=orange, 11=pastel blue, 12=pastel pink, 13=pastel purple, 14=pink, 15=pink hearts, 16=red, 17=red gingham, 18=silver, 19=silver lace, 20=white, 21=wine red, 22=yellow -+ </en> -+ </comments> -+ <partno>ALK251</partno> -+ <partno>TZFAw</partno> -+ <partno>TZFXbwf</partno> -+ <partno>TZIYwf</partno> -+ <partno>TZSEw</partno> -+ <partno>TZSbwf</partno> -+ </consumables> -+ </mechanism> -+ <url>https://www.brother.co.uk/labelling/ptouch-labellers/pt2430pc</url> -+ <lang> -+ <proprietary /> -+ </lang> -+ <autodetect> -+ <general> -+ <ieee1284>MFG:Brother;CMD:PT-CBP;MDL:2430PC;CLS:PRINTER;</ieee1284> -+ <commandset>PT-CBP</commandset> -+ <description>Brother PT-2430PC</description> -+ <manufacturer>Brother</manufacturer> -+ <model>PT-2430PC</model> -+ </general> -+ </autodetect> -+ <functionality>D</functionality> -+ <driver>ptouch</driver> -+ <unverified/> -+ <!--no "contrib_url"--> -+ <comments> -+ <en> -+ Prints 10mm per second. -+ </en> -+ </comments> -+</printer> -diff -ur a/rastertoptch.c b/rastertoptch.c ---- a/rastertoptch.c 2016-07-29 20:28:29.000000000 +0200 -+++ b/rastertoptch.c 2017-10-03 01:34:27.128783723 +0200 -@@ -263,6 +263,8 @@ - #define PRINT_QUALITY_HIGH_DEFAULT true - /** Default half cut mode */ - #define HALF_CUT_DEFAULT false -+/** Default chain print mode */ -+#define CHAIN_PRINT_DEFAULT false - /** Maximum number of bytes per line */ - #define BYTES_PER_LINE_MAX 255 /* cf. ULP_emit_line */ - /** Default number of bytes per line */ -@@ -425,6 +427,7 @@ - xfer_t pixel_xfer; /**< pixel transfer mode */ - cups_bool_t print_quality_high; /**< print quality is high */ - bool half_cut; /**< half cut */ -+ bool chain_print; /**< chain print */ - int bytes_per_line; /**< bytes per line (print head width) */ - align_t align; /**< pixel data alignment */ - int software_mirror; /**< mirror pixel data if mirror printing */ -@@ -461,6 +464,7 @@ - PIXEL_XFER_DEFAULT, - PRINT_QUALITY_HIGH_DEFAULT, - HALF_CUT_DEFAULT, -+ CHAIN_PRINT_DEFAULT, - BYTES_PER_LINE_DEFAULT, - ALIGN_DEFAULT, - SOFTWARE_MIRROR_DEFAULT, -@@ -532,6 +536,7 @@ - } - } - OBTAIN_BOOL_OPTION ("HalfCut", half_cut); -+ OBTAIN_BOOL_OPTION ("ChainPrint", chain_print); - OBTAIN_INT_OPTION ("BytesPerLine", bytes_per_line, - 1, BYTES_PER_LINE_MAX); - cups_option -@@ -833,7 +838,10 @@ - */ - - unsigned char escik_half_cut_bit = (job_options->half_cut); -- unsigned char escik_auto_cut_bit = (cut_page || cut_job) ? 0x08 : 0x00; -+ unsigned char escik_auto_cut_bit = 0x00; -+ if (!job_options->chain_print && (cut_page || cut_job)) { -+ escik_auto_cut_bit = 0x08; -+ } - - putchar(ESC); putchar('i'); putchar('K'); putchar((char)(escik_half_cut_bit | escik_auto_cut_bit)); - } -@@ -1612,6 +1620,7 @@ - fprintf (stderr, "DEBUG: pixel_xfer = %d\n", job_options->pixel_xfer); - fprintf (stderr, "DEBUG: print_quality_high = %d\n", job_options->print_quality_high); - fprintf (stderr, "DEBUG: half_cut = %d\n", job_options->half_cut); -+ fprintf (stderr, "DEBUG: chain_print = %d\n", job_options->chain_print); - fprintf (stderr, "DEBUG: bytes_per_line = %d\n", job_options->bytes_per_line); - fprintf (stderr, "DEBUG: align = %d\n", job_options->align); - fprintf (stderr, "DEBUG: software_mirror = %d\n", job_options->software_mirror); diff --git a/Add-include-cups-ppd.h.patch b/Add-include-cups-ppd.h.patch deleted file mode 100644 index 266906d5dfbd..000000000000 --- a/Add-include-cups-ppd.h.patch +++ /dev/null @@ -1,22 +0,0 @@ -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> @@ -1,33 +1,21 @@ # Maintainer: Alexander Sulfrian <asulfrian at zedat dot fu-berlin dot de> pkgname=printer-driver-ptouch -pkgver=1.4.2 -pkgrel=4 -_commit=5fe72de0577215eb04a6fcbe49b24bcf5e228dec -pkgdesc='printer driver Brother P-touch label printers' +pkgver=1.5.1 +pkgrel=1 +pkgdesc='P-Touch PT-series and QL-series printer driver for Linux (under CUPS)' arch=('i686' 'x86_64') url='https://github.com/philpem/printer-driver-ptouch' license=('GPL') -depends=('ghostscript' 'foomatic-db') +depends=('ghostscript') makedepends=('autoconf' 'libcups' 'foomatic-db-engine') -source=("https://github.com/philpem/printer-driver-ptouch/archive/5fe72de0577215eb04a6fcbe49b24bcf5e228dec.tar.gz" - 'Add-include-cups-ppd.h.patch' - 'Add-PT-2430PC.patch') -sha256sums=('d12c4cdd57013536e2803a8d9579cb2260c29a225ac23c7868016549c3d6b06b' - '22721f6f371114f8725b70cc2877276bce1a38eb9680dcaa7d268eba990e8b4c' - '363313b9cce5a223ab4a72e7423f32d73b17bafc334454a99da8c0c1363983ca') - -prepare() { - cd "$srcdir/$pkgname-$_commit" - - patch -p1 < ../Add-include-cups-ppd.h.patch - patch -p1 < ../Add-PT-2430PC.patch -} +source=("$pkgname-$pkgver.tar.gz::https://github.com/philpem/printer-driver-ptouch/archive/v$pkgver.tar.gz") +sha256sums=('92de714d5b0103a7216812b4a497edeb879405fa57acace65e2c7b226e9e71de') build() { - cd "$srcdir/$pkgname-$_commit" + cd "$srcdir/$pkgname-$pkgver" autoreconf --force ./configure --prefix=/usr @@ -35,15 +23,13 @@ build() { } package() { - cd "$srcdir/$pkgname-$_commit" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - # Remove files already installed by foomatic-db - for printer in PT-1500PC PT-18R PT-1950VP PT-1950 PT-1960 PT-2300 \ - PT-2420PC PT-2450DX PT-2500PC PT-2600 PT-2610 PT-3600 \ - PT-550A PT-9200DX PT-9200PC PT-9400 PT-9500PC PT-9600 \ - PT-PC QL-500 QL-550 QL-650TD; do - rm "$pkgdir/usr/share/foomatic/db/source/printer/Brother-$printer.xml" - done + # Compile and remove foomatic database + mkdir -p "$pkgdir/usr/share/ppd/" + echo "dummy dummy" > "$pkgdir/usr/share/foomatic/db/oldprinterids" + FOOMATICDB="$pkgdir/usr/share/foomatic" foomatic-compiledb -t ppd -d "$pkgdir/usr/share/ppd/Brother/" + rm -r "$pkgdir/usr/share/foomatic/" } |