Bump; fix nightly source checksum; rebase patches; fix a race in Makefile

9 files changed, 93 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3146b71fdfce..1906e53b1d07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri May 11 14:26:09 UTC 2018
+# Sat Jun  2 23:07:24 UTC 2018
 pkgbase = foo2zjs-nightly
 	pkgdesc = foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
-	pkgver = 20180508
+	pkgver = 20180519
 	pkgrel = 1
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
@@ -51,13 +51,14 @@ pkgbase = foo2zjs-nightly
 	noextract = okic5600.tar.gz
 	options = !emptydirs
 	options = !ccache
-	source = foo2zjs-20180508.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+	source = foo2zjs-20180519.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
 	source = 0001-Makefile-DESTDIR-support.patch
 	source = 0002-Makefile-general-fixes.patch
 	source = 0003-Rework-firmware-loading.patch
 	source = 0004-Makefile-fix-generating-.ppd-in-place.patch
 	source = 0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
 	source = 0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
+	source = 0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
 	source = http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz
 	source = http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz
 	source = http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz
@@ -89,13 +90,14 @@ pkgbase = foo2zjs-nightly
 	source = http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz
 	source = listweb.patch
 	source = unweb.patch
-	sha256sums = 54d377b9c7d1f8c4d721265dc44e3096aa7fbced6b6eb3e215a33d286de9a7be
-	sha256sums = 620e4bd9da088c96843f2a124301e5529bc6a3c92b87b535ee907042cdb46756
-	sha256sums = 4110354cdbdf73349585a7d823f7c0b4aac0ff930ce718cb59a7e28c9ead57bb
-	sha256sums = 50b8c3403403bfe36730db2a04b47c7f8c1afd36115edb8474aaa09c8b75d0f9
-	sha256sums = 4a399fb37b061cad3c506ad4d3584f3d547c2ed1434c4b245ca5fde94ea313a3
-	sha256sums = c92a8ce7b49cc69271ae4ea1338ebf65632bfce6c9e68d959e9fd1391f23e1bb
-	sha256sums = 32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e
+	sha256sums = SKIP
+	sha256sums = d12e2ffea475e5cbebc019069c2702ac8b3b8c91d753798b1c733875c242c7c9
+	sha256sums = b087a81daae9ea61c2a6fb82b53e72fe05b0fde6ca5bde490121ef873b3c3205
+	sha256sums = 572cdc9800e6a66b1e565f727067e7b31c0232385b1986fda7a0cac2303767f5
+	sha256sums = b48d2d59a8575ccf1f0c7c53a694ab8a68b0822331a20be3ec8ee5d3712c1684
+	sha256sums = 131a8f3fab237656fbaadac7ec3aacdc1d118d30b9f6a46bd63b03c2b06e2f49
+	sha256sums = 6787431ba763653c75cd0e2699cbf6496710fddd0896bfdd60f8fa8d7625c6f4
+	sha256sums = c704dc6989a9f005627ee7eca1e60a3cd57ec786e9812972624ddbc56b5cd3ec
 	sha256sums = 61a4ac9f94e9749a4e3c8971a7bb8d610608bea6bd2aedcb98a4f307553955f6
 	sha256sums = 42d6ab614d998a274ac3b8a4520595dcb251a9b051ba9f1e2a70e6ad54cce7b3
 	sha256sums = a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0
diff --git a/0001-Makefile-DESTDIR-support.patch b/0001-Makefile-DESTDIR-support.patch
index d865e82cd762..b3486b4a81e0 100644
--- a/0001-Makefile-DESTDIR-support.patch
+++ b/0001-Makefile-DESTDIR-support.patch
@@ -1,14 +1,14 @@
-From 0deabbd1bd926c10b83776251262e7ae2707b455 Mon Sep 17 00:00:00 2001
+From 37a1925c090e6960d2e01e2ebe3c759f3e190ebb Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 22 Oct 2016 12:35:14 +0300
-Subject: [PATCH 1/6] Makefile: DESTDIR support
+Subject: [PATCH 1/7] Makefile: DESTDIR support
 
 ---
  Makefile | 27 ++++++++++++++-------------
  1 file changed, 14 insertions(+), 13 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 450ad58..bcbb4a3 100644
+index 6287cbc..e58ce3a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -39,7 +39,7 @@ INSTALL=install
@@ -88,5 +88,5 @@ index 450ad58..bcbb4a3 100644
  LIBUDEVDIR=/lib/udev/rules.d
  RULES=hplj10xx.rules
 -- 
-2.15.1
+2.17.1
 
diff --git a/0002-Makefile-general-fixes.patch b/0002-Makefile-general-fixes.patch
index 050be4ae8822..9a97ba163a70 100644
--- a/0002-Makefile-general-fixes.patch
+++ b/0002-Makefile-general-fixes.patch
@@ -1,14 +1,14 @@
-From 1e082c4ed1be48954ff9f61384789525e5bda80e Mon Sep 17 00:00:00 2001
+From a50b72cf74ed3ea65776be1d25860899809c9950 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 10:21:54 +0300
-Subject: [PATCH 2/6] Makefile: general fixes
+Subject: [PATCH 2/7] Makefile: general fixes
 
 ---
- Makefile | 58 +++++++++++++++++++++++++++++-----------------------------
+ Makefile | 58 ++++++++++++++++++++++++++++----------------------------
  1 file changed, 29 insertions(+), 29 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index bcbb4a3..09388c1 100644
+index e58ce3a..c19f0c4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -43,7 +43,7 @@ FOODB=$(PREFIX)/share/foomatic/db/source
@@ -235,5 +235,5 @@ index bcbb4a3..09388c1 100644
  
  CUPSDCONF=/etc/cups/cupsd.conf
 -- 
-2.15.1
+2.17.1
 
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index 8be92be65e18..583206f3b63d 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,13 +1,13 @@
-From 30bf1a17b94d95e550fa5528260c63f745d74c20 Mon Sep 17 00:00:00 2001
+From 101a7bea0ebcd50fbf7467128e628fcb24ad0b01 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 10:18:08 +0300
-Subject: [PATCH 3/6] Rework firmware loading
+Subject: [PATCH 3/7] Rework firmware loading
 
 ---
- Makefile                   | 101 ++++++++++-----------------------
- foo2zjs-loadfw.in          | 138 +++++++++++++++++++++++++++++++++++++++++++++
+ Makefile                   | 101 ++++++++-------------------
+ foo2zjs-loadfw.in          | 138 +++++++++++++++++++++++++++++++++++++
  foo2zjs-loadfw@.service.in |   6 ++
- hplj10xx.rules             |  60 +++++++-------------
+ hplj10xx.rules             |  60 ++++++----------
  usblp.conf                 |   1 +
  5 files changed, 196 insertions(+), 110 deletions(-)
  create mode 100644 foo2zjs-loadfw.in
@@ -15,7 +15,7 @@ Subject: [PATCH 3/6] Rework firmware loading
  create mode 100644 usblp.conf
 
 diff --git a/Makefile b/Makefile
-index 09388c1..429b842 100644
+index c19f0c4..bac37c4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -173,6 +173,7 @@ FILES	=	\
@@ -392,5 +392,5 @@ index 0000000..5a604bf
 @@ -0,0 +1 @@
 +blacklist usblp
 -- 
-2.15.1
+2.17.1
 
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index b506928090e9..d8e5ef8d7f22 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,29 +1,24 @@
-From 01eb8e0e1fd6447d7931f33718da760f050fdb34 Mon Sep 17 00:00:00 2001
+From bb8cb495855b1d4fc9ba0037f6298d35ccda6cc1 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 01:01:17 +0300
-Subject: [PATCH 4/6] Makefile: fix generating *.ppd in-place
+Subject: [PATCH 4/7] Makefile: fix generating *.ppd in-place
 
 ---
- Makefile | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 429b842..6282bda 100644
+index bac37c4..0365139 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1452,10 +1452,8 @@ ppd:
+@@ -1454,6 +1454,7 @@ ppd:
  	    *)                  driver=foo2zjs;; \
  	    esac; \
  	    echo $$driver - $$printer; \
--	    ENGINE=../foomatic/foomatic-db-engine; \
--	    PERL5LIB=$$ENGINE/lib \
--		FOOMATICDB=foomatic-db \
--		$$ENGINE/foomatic-ppdfile \
 +	    FOOMATICDB=foomatic-db \
-+		foomatic-ppdfile \
- 		-d $$driver -p $$printer \
- 		> PPD/$$printer.ppd; \
- 	done
+ 	    foomatic-ppdfile -d $$driver -p $$printer > PPD/$$printer.ppd; \
+ 	    #ENGINE=../foomatic/foomatic-db-engine; \
+ 	    #PERL5LIB=$$ENGINE/lib \
 -- 
-2.15.1
+2.17.1
 
diff --git a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
index fc53bbcbf8f2..c2d557602984 100644
--- a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
+++ b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,16 +1,16 @@
-From 2fe5c4fe3103d63b4d2f26168316fa746d6e4b2a Mon Sep 17 00:00:00 2001
+From 5d5608db6e5d8999c594f8f955d810755030742c Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sun, 23 Oct 2016 01:01:59 +0300
-Subject: [PATCH 5/6] Makefile: leverage default rules as much as possible to
+Subject: [PATCH 5/7] Makefile: leverage default rules as much as possible to
  fix behavior wrt user compile flags
 
 ---
- Makefile        | 100 +++++++++++++++-----------------------------------------
- icc2ps/Makefile |  13 ++++----
+ Makefile        | 100 +++++++++++++-----------------------------------
+ icc2ps/Makefile |  13 ++++---
  2 files changed, 33 insertions(+), 80 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 6282bda..c724547 100644
+index 0365139..0b30c87 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -466,35 +466,17 @@ all-done:
@@ -165,5 +165,5 @@ index f3abb99..5be5749 100644
  install: all
  	$(INSTALL) -c foo2zjs-icc2ps $(BIN)
 -- 
-2.15.1
+2.17.1
 
diff --git a/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch b/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
index d18080e203f2..4fd15a75b07f 100644
--- a/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
+++ b/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
@@ -1,7 +1,7 @@
-From ceb2ab1395079c55723f3df6cb2b592dc00da459 Mon Sep 17 00:00:00 2001
+From b747647bbf295c437fce85d5f26bad7a127a489e Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Fri, 8 Dec 2017 14:54:15 +0300
-Subject: [PATCH 6/6] Makefile: do not blacklist usblp (seems unnecessary;
+Subject: [PATCH 6/7] Makefile: do not blacklist usblp (seems unnecessary;
  collateral damage reported)
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 6/6] Makefile: do not blacklist usblp (seems unnecessary;
  delete mode 100644 usblp.conf
 
 diff --git a/Makefile b/Makefile
-index c724547..8a003d7 100644
+index 0b30c87..dd13c5d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -924,12 +924,10 @@ install-gui:
@@ -44,5 +44,5 @@ index 5a604bf..0000000
 @@ -1 +0,0 @@
 -blacklist usblp
 -- 
-2.15.1
+2.17.1
 
diff --git a/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch b/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
new file mode 100644
index 000000000000..4f220eee6bdf
--- /dev/null
+++ b/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
@@ -0,0 +1,29 @@
+From 646853351461539c95cca6b89accc4d06308407e Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Sun, 3 Jun 2018 00:14:45 +0300
+Subject: [PATCH 7/7] Makefile: create manpages in subdirs via their Makefiles
+
+Consistently use icc2ps/Makefile and osx-hotplug/Makefile
+to generate respective makefiles. Otherwise subtle races can happen if
+the same man page is generated both via the top-level Makefile and the
+subdir Makefile.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index dd13c5d..5cbbb39 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1512,7 +1512,7 @@ install-doc: doc
+ 
+ GROFF=/usr/local/test/bin/groff
+ GROFF=groff
+-manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1
++manual.pdf: man
+ 	-$(GROFF) -t -man \
+ 	    `ls $(MANPAGES) \
+ 		icc2ps/foo2zjs-icc2ps.1 \
+-- 
+2.17.1
+
diff --git a/PKGBUILD b/PKGBUILD
index c149f7645bc5..fe86e893daa8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 #Contributor: Muhammed Uluyol <uluyol0@gmail.com>
 
 pkgname=foo2zjs-nightly
-pkgver=20180508
+pkgver=20180519
 pkgrel=1
 pkgdesc="foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
@@ -20,12 +20,13 @@ options=('!emptydirs' '!ccache')
 install='foo2zjs.install'
 
 _patches=(
-	'0001-Makefile-DESTDIR-support.patch'
-	'0002-Makefile-general-fixes.patch'
-	'0003-Rework-firmware-loading.patch'
-	'0004-Makefile-fix-generating-.ppd-in-place.patch'
-	'0005-Makefile-leverage-default-rules-as-much-as-possible-.patch'
-	'0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch'
+	0001-Makefile-DESTDIR-support.patch
+	0002-Makefile-general-fixes.patch
+	0003-Rework-firmware-loading.patch
+	0004-Makefile-fix-generating-.ppd-in-place.patch
+	0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
+	0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
+	0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
 )
 
 _firmware=(
@@ -82,13 +83,14 @@ source=(
 noextract=(
 	"${_firmware[@]##*/}"
 )
-sha256sums=('54d377b9c7d1f8c4d721265dc44e3096aa7fbced6b6eb3e215a33d286de9a7be'
-            '620e4bd9da088c96843f2a124301e5529bc6a3c92b87b535ee907042cdb46756'
-            '4110354cdbdf73349585a7d823f7c0b4aac0ff930ce718cb59a7e28c9ead57bb'
-            '50b8c3403403bfe36730db2a04b47c7f8c1afd36115edb8474aaa09c8b75d0f9'
-            '4a399fb37b061cad3c506ad4d3584f3d547c2ed1434c4b245ca5fde94ea313a3'
-            'c92a8ce7b49cc69271ae4ea1338ebf65632bfce6c9e68d959e9fd1391f23e1bb'
-            '32255dbd841facc8aa17e89668d499760395e3d750aa9ee8750e0fbd9afa574e'
+sha256sums=('SKIP'
+            'd12e2ffea475e5cbebc019069c2702ac8b3b8c91d753798b1c733875c242c7c9'
+            'b087a81daae9ea61c2a6fb82b53e72fe05b0fde6ca5bde490121ef873b3c3205'
+            '572cdc9800e6a66b1e565f727067e7b31c0232385b1986fda7a0cac2303767f5'
+            'b48d2d59a8575ccf1f0c7c53a694ab8a68b0822331a20be3ec8ee5d3712c1684'
+            '131a8f3fab237656fbaadac7ec3aacdc1d118d30b9f6a46bd63b03c2b06e2f49'
+            '6787431ba763653c75cd0e2699cbf6496710fddd0896bfdd60f8fa8d7625c6f4'
+            'c704dc6989a9f005627ee7eca1e60a3cd57ec786e9812972624ddbc56b5cd3ec'
             '61a4ac9f94e9749a4e3c8971a7bb8d610608bea6bd2aedcb98a4f307553955f6'
             '42d6ab614d998a274ac3b8a4520595dcb251a9b051ba9f1e2a70e6ad54cce7b3'
             'a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0'