Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1From 29ac95ac76a9d9977561cef352f8b803579fea2a Mon Sep 17 00:00:00 2001 2From: Shinbar <richard.shine@gmail.com> 3Date: Thu, 26 Mar 2020 19:33:39 +0000 4Subject: [PATCH 1/3] PPDs (e.g. Del-1660.ppd) are specifying paper sizes as 5 parameters e.g. -p1 which are then being picked up as an invalid paper size 6 In cups error_log manifesting as: foo2hbpl1-wrapper: Unimplemented paper code 7 1 8 9Have amended foo2hbpl1-wrapper.in to intepret paper sizes 10paper parameters are also now being interpreted. 11This has fixed for a Dell 1660w printer, running on Ubuntu 18.04 12--- 13 foo2hbpl1-wrapper.in | 28 ++++++++++++++-------------- 14 1 file changed, 14 insertions(+), 14 deletions(-) 15 16diff --git a/foo2hbpl1-wrapper.in b/foo2hbpl1-wrapper.in 17index 567e891..bb20ed5 100644 18--- a/foo2hbpl1-wrapper.in 19+++ b/foo2hbpl1-wrapper.in 20@@ -341,20 +341,20 @@ Custom*) 21 # /usr/share/ghostscript/9.10/Resource/Init/gs_statd.ps 22 # foo2hbpl1 will provide the appropriate numeric value 23 24-letter) DIM=5100x6600 ;; 25-legal) DIM=5100x8400 ;; 26-a4) DIM=4961x7016 ;; 27-executive) DIM=4350x6300 ;; 28-env10) DIM=2475x5700 ;; 29-monarch) DIM=2325x4500 ;; 30-c5) DIM=3827x5409 ;; 31-envDL) DIM=2599x5197 ;; 32-isob5|b5) DIM=4158x5906 ;; 33-jisb5) DIM=4299x6071 ;; 34-a5) DIM=3496x4961 ;; 35-folio) DIM=5100x7800 ;; 36-pa4) DIM=4961x6600 ;; 37-archA) DIM=5400x7200 ;; 38+4|letter|Letter) DIM=5100x6600 ;; 39+7|legal|Legal) DIM=5100x8400 ;; 40+1|a4|A4) DIM=4961x7016 ;; 41+5|executive|Executive) DIM=4350x6300 ;; 42+9|env10|Env10) DIM=2475x5700 ;; 43+10|monarch|EnvMonarch) DIM=2325x4500 ;; 44+11|c5|EnvC5) DIM=3827x5409 ;; 45+12|envDL|EnvDL) DIM=2599x5197 ;; 46+isob5|b5) DIM=4158x5906 ;; 47+2|jisb5|B5jis) DIM=4299x6071 ;; 48+a5) DIM=3496x4961 ;; 49+6|folio|Folio) DIM=5100x7800 ;; 50+pa4) DIM=4961x6600 ;; 51+archA) DIM=5400x7200 ;; 52 *) error "Unimplemented paper code $PAPER";; 53 esac 54 55 56From 289d55ded5af7d84a91b0ecf26bbea18f3cb2d9e Mon Sep 17 00:00:00 2001 57From: Shinbar <richard.shine@gmail.com> 58Date: Fri, 27 Mar 2020 09:19:40 +0000 59Subject: [PATCH 2/3] Added A5 paper size parameter 60 61--- 62 foo2hbpl1-wrapper.in | 2 +- 63 1 file changed, 1 insertion(+), 1 deletion(-) 64 65diff --git a/foo2hbpl1-wrapper.in b/foo2hbpl1-wrapper.in 66index bb20ed5..474972d 100644 67--- a/foo2hbpl1-wrapper.in 68+++ b/foo2hbpl1-wrapper.in 69@@ -351,7 +351,7 @@ Custom*) 70 12|envDL|EnvDL) DIM=2599x5197 ;; 71 isob5|b5) DIM=4158x5906 ;; 72 2|jisb5|B5jis) DIM=4299x6071 ;; 73-a5) DIM=3496x4961 ;; 74+3|a5|A5) DIM=3496x4961 ;; 75 6|folio|Folio) DIM=5100x7800 ;; 76 pa4) DIM=4961x6600 ;; 77 archA) DIM=5400x7200 ;; 78 79From 393f7a7c70bbf9fa0c39ac1504b220793670d201 Mon Sep 17 00:00:00 2001 80From: Shinbar <richard.shine@gmail.com> 81Date: Sun, 29 Mar 2020 10:01:31 +0100 82Subject: [PATCH 3/3] Makefile now works in FreeBSD 83 84--- 85 osx-hotplug/Makefile | 5 +---- 86 1 file changed, 1 insertion(+), 4 deletions(-) 87 88diff --git a/osx-hotplug/Makefile b/osx-hotplug/Makefile 89index 4165085..a9aa06a 100644 90--- a/osx-hotplug/Makefile 91+++ b/osx-hotplug/Makefile 92@@ -64,8 +64,5 @@ clean: 93 rm -f *.o *.1 94 95 uninstall: 96- ( \ 97- echo "g/osx-hplj-hotplug/d"; \ 98- echo "w"; \ 99- ) | ex $(RC) 100+ -(echo "g/osx-hplj-hotplug/d"; echo "w") | ex $(RC) 101 -rm -f $(BIN)/osx-hplj-hotplug