Add color option and auto tray patches from xerox-workcentre-78xx

4 files changed, 182 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65c81c8c252f..7da0c6f497ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Nov  7 10:41:10 UTC 2017
 pkgbase = xerox-workcentre-72xx
 	pkgdesc = Xerox WorkCentre 7220/7225 printer driver for CUPS
 	pkgver = 5.482.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.support.xerox.com/support/workcentre-7220-7225/file-download/enus.html?operatingSystem=winxp&fileLanguage=en&contentId=133852&from=downloads&viewArchived=false
 	arch = i686
 	arch = x86_64
@@ -11,8 +9,12 @@ pkgbase = xerox-workcentre-72xx
 	makedepends = unrar
 	source = xerox-workcentre-72xx.exe::http://download.support.xerox.com/pub/drivers/WC7220_WC7225/drivers/win10/en_GB/WC72XX_5.482.0.0_PPD_en-US.exe
 	source = LICENSE.txt
+	source = 0001-color-option.patch
+	source = 0002-auto-tray.patch
 	sha256sums = 0b8d1421212ce62669f3da449c049b11878da227e84ebb809dcf3dc32e5157ee
 	sha256sums = d0eedafe4aeae9bff7218085eff9315ce25e6a39b3e6ebdd0fdebf7fb1440e31
+	sha256sums = abe7f947884638e00c4f4263b73ed7c57769bf25bbd67cb519abc54ac98320f7
+	sha256sums = f3720e2d6ecc43230308e161a9fbd6185d895e1e86dcc368e7a62c144c43f471
 
 pkgname = xerox-workcentre-72xx
 
diff --git a/0001-color-option.patch b/0001-color-option.patch
new file mode 100644
index 000000000000..233696f877a9
--- /dev/null
+++ b/0001-color-option.patch
@@ -0,0 +1,144 @@
+--- a/xrx7220.ppd	2018-02-13 10:32:58.693777982 +0100
++++ b/xrx7220.ppd	2018-02-13 10:35:53.580007899 +0100
+@@ -1173,6 +1173,69 @@
+ *InputSlot Tray5/Tray 5 (Bypass): "<< (bypass-tray) xerox$MediaInputTray >> setpagedevice"

+ *CloseUI: *InputSlot

+ 

++*OpenUI *ColorModel/Output Color: PickOne

++*OrderDependency: 20.0 AnySetup *ColorModel

++*DefaultColorModel: Color

++*ColorModel Grayscale/Grayscale: "

++    1 dict dup 2 dict dup /Type 26 put dup /RGBCorrection 3 put /DeviceRenderingInfo exch put setpagedevice

++    currentpagedevice /DeviceRenderingInfo get /Brightness known {

++        1 dict dup

++        1 dict dup

++        /Custom /ProcSet findresource dup

++        /currentregioncode known {

++            begin

++            currentregioncode

++            dup -1 eq { pop 0  } if

++            setcmykcorrection

++            end

++            pop

++        }{

++            pop

++            /CMYKCorrection 4 put

++        }ifelse

++        /DeviceRenderingInfo exch put

++        setpagedevice

++    }if

++    1 dict dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /EngineScreen 2 put put dup /PostRenderingEnhance true put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/GammaCorrection 4 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBToK 1 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBSpace 0 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/WhitePoint 1 put/DeviceRenderingInfo exch put setpagedevice

++    2 dict dup /PostRenderingEnhance true put dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /REValue 1 put put setpagedevice

++    1 dict dup/ProcessColorModel/DeviceGray put setpagedevice

++"

++*End

++*ColorModel Color/Color: "

++    1 dict dup 2 dict dup /Type 26 put dup /RGBCorrection 3 put /DeviceRenderingInfo exch put setpagedevice

++    currentpagedevice /DeviceRenderingInfo get /Brightness known {

++        1 dict dup

++        1 dict dup

++        /Custom /ProcSet findresource dup

++        /currentregioncode known {

++            begin

++            currentregioncode

++            dup -1 eq { pop 0  } if

++            setcmykcorrection

++            end

++            pop

++        }{

++            pop

++            /CMYKCorrection 4 put

++        }ifelse

++        /DeviceRenderingInfo exch put

++        setpagedevice

++    }if

++    1 dict dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /EngineScreen 2 put put dup /PostRenderingEnhance true put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/GammaCorrection 4 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBToK 1 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBSpace 0 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/WhitePoint 1 put/DeviceRenderingInfo exch put setpagedevice

++    2 dict dup /PostRenderingEnhance true put dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /REValue 1 put put setpagedevice

++    1 dict dup/ProcessColorModel/DeviceCMYK put setpagedevice

++"

++*End

++*CloseUI: *ColorModel

++

+ *OpenGroup: PrintQuality/Print Quality/Color	

+ 

+ *OpenUI *OutputMode/Print Quality: PickOne

+--- a/xrx7225.ppd	2018-02-13 10:41:35.779810547 +0100
++++ b/xrx7225.ppd	2018-02-13 10:42:03.894742658 +0100
+@@ -1173,6 +1173,69 @@
+ *InputSlot Tray5/Tray 5 (Bypass): "<< (bypass-tray) xerox$MediaInputTray >> setpagedevice"

+ *CloseUI: *InputSlot

+ 

++*OpenUI *ColorModel/Output Color: PickOne

++*OrderDependency: 20.0 AnySetup *ColorModel

++*DefaultColorModel: Color

++*ColorModel Grayscale/Grayscale: "

++    1 dict dup 2 dict dup /Type 26 put dup /RGBCorrection 3 put /DeviceRenderingInfo exch put setpagedevice

++    currentpagedevice /DeviceRenderingInfo get /Brightness known {

++        1 dict dup

++        1 dict dup

++        /Custom /ProcSet findresource dup

++        /currentregioncode known {

++            begin

++            currentregioncode

++            dup -1 eq { pop 0  } if

++            setcmykcorrection

++            end

++            pop

++        }{

++            pop

++            /CMYKCorrection 4 put

++        }ifelse

++        /DeviceRenderingInfo exch put

++        setpagedevice

++    }if

++    1 dict dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /EngineScreen 2 put put dup /PostRenderingEnhance true put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/GammaCorrection 4 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBToK 1 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBSpace 0 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/WhitePoint 1 put/DeviceRenderingInfo exch put setpagedevice

++    2 dict dup /PostRenderingEnhance true put dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /REValue 1 put put setpagedevice

++    1 dict dup/ProcessColorModel/DeviceGray put setpagedevice

++"

++*End

++*ColorModel Color/Color: "

++    1 dict dup 2 dict dup /Type 26 put dup /RGBCorrection 3 put /DeviceRenderingInfo exch put setpagedevice

++    currentpagedevice /DeviceRenderingInfo get /Brightness known {

++        1 dict dup

++        1 dict dup

++        /Custom /ProcSet findresource dup

++        /currentregioncode known {

++            begin

++            currentregioncode

++            dup -1 eq { pop 0  } if

++            setcmykcorrection

++            end

++            pop

++        }{

++            pop

++            /CMYKCorrection 4 put

++        }ifelse

++        /DeviceRenderingInfo exch put

++        setpagedevice

++    }if

++    1 dict dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /EngineScreen 2 put put dup /PostRenderingEnhance true put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/GammaCorrection 4 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBToK 1 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/RGBSpace 0 put/DeviceRenderingInfo exch put setpagedevice

++    1 dict dup 2 dict dup/Type 26 put dup/WhitePoint 1 put/DeviceRenderingInfo exch put setpagedevice

++    2 dict dup /PostRenderingEnhance true put dup /PostRenderingEnhanceDetails 2 dict dup /Type 32 put dup /REValue 1 put put setpagedevice

++    1 dict dup/ProcessColorModel/DeviceCMYK put setpagedevice

++"

++*End

++*CloseUI: *ColorModel

++

+ *OpenGroup: PrintQuality/Print Quality/Color	

+ 

+ *OpenUI *OutputMode/Print Quality: PickOne

diff --git a/0002-auto-tray.patch b/0002-auto-tray.patch
new file mode 100644
index 000000000000..4e0b248ec50a
--- /dev/null
+++ b/0002-auto-tray.patch
@@ -0,0 +1,24 @@
+--- a/xrx7220.ppd	2018-02-13 10:36:54.818880723 +0100
++++ b/xrx7220.ppd	2018-02-13 10:37:38.829388263 +0100
+@@ -1165,7 +1165,8 @@
+ *% Input Slot

+ *OpenUI *InputSlot/Paper Tray: PickOne

+ *OrderDependency: 46.5 AnySetup *InputSlot

+-*DefaultInputSlot: Tray1

++*DefaultInputSlot: Auto

++*InputSlot Auto/Automatically Select: ""

+ *InputSlot Tray1/Tray 1: "<< (tray-1) xerox$MediaInputTray >> setpagedevice"

+ *InputSlot Tray2/Tray 2: "<< (tray-2) xerox$MediaInputTray >> setpagedevice"

+ *InputSlot Tray3/Tray 3: "<< (tray-3) xerox$MediaInputTray >> setpagedevice"

+--- a/xrx7225.ppd	2018-02-13 10:42:35.190288983 +0100
++++ b/xrx7225.ppd	2018-02-13 10:42:45.929390252 +0100
+@@ -1165,7 +1165,8 @@
+ *% Input Slot

+ *OpenUI *InputSlot/Paper Tray: PickOne

+ *OrderDependency: 46.5 AnySetup *InputSlot

+-*DefaultInputSlot: Tray1

++*DefaultInputSlot: Auto

++*InputSlot Auto/Automatically Select: ""

+ *InputSlot Tray1/Tray 1: "<< (tray-1) xerox$MediaInputTray >> setpagedevice"

+ *InputSlot Tray2/Tray 2: "<< (tray-2) xerox$MediaInputTray >> setpagedevice"

+ *InputSlot Tray3/Tray 3: "<< (tray-3) xerox$MediaInputTray >> setpagedevice"

diff --git a/PKGBUILD b/PKGBUILD
index 6b7637763f1a..570caaec4b7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,25 @@
 
 pkgname=xerox-workcentre-72xx
 pkgver=5.482.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xerox WorkCentre 7220/7225 printer driver for CUPS"
 arch=('i686' 'x86_64')
 url="http://www.support.xerox.com/support/workcentre-7220-7225/file-download/enus.html?operatingSystem=winxp&fileLanguage=en&contentId=133852&from=downloads&viewArchived=false"
 license=('custom')
 makedepends=('unrar')
 source=("$pkgname.exe::http://download.support.xerox.com/pub/drivers/WC7220_WC7225/drivers/win10/en_GB/WC72XX_${pkgver}_PPD_en-US.exe"
-        "LICENSE.txt")
+        "LICENSE.txt"
+	"0001-color-option.patch"
+	"0002-auto-tray.patch")
 sha256sums=('0b8d1421212ce62669f3da449c049b11878da227e84ebb809dcf3dc32e5157ee'
-            'd0eedafe4aeae9bff7218085eff9315ce25e6a39b3e6ebdd0fdebf7fb1440e31')
+            'd0eedafe4aeae9bff7218085eff9315ce25e6a39b3e6ebdd0fdebf7fb1440e31'
+            'abe7f947884638e00c4f4263b73ed7c57769bf25bbd67cb519abc54ac98320f7'
+            'f3720e2d6ecc43230308e161a9fbd6185d895e1e86dcc368e7a62c144c43f471')
 
 prepare() {
   unrar x "$pkgname.exe"
+  patch -p1 -i 0001-color-option.patch
+  patch -p1 -i 0002-auto-tray.patch
 }
 
 package() {