summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO20
-rw-r--r--0001-Makefile-DESTDIR-support.patch2
-rw-r--r--0002-Makefile-general-fixes.patch2
-rw-r--r--0003-Rework-firmware-loading.patch2
-rw-r--r--0004-Makefile-fix-generating-.ppd-in-place.patch2
-rw-r--r--0005-Makefile-leverage-default-rules-as-much-as-possible-.patch2
-rw-r--r--0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch2
-rw-r--r--0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch2
-rw-r--r--0008-hplj10xx.rules-substitute-PREFIX.patch53
-rw-r--r--0009-hplj10xx.rules.in-run-firmware-loader-directly.patch26
-rw-r--r--PKGBUILD20
11 files changed, 110 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f361eab1d888..febcb603fa25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = foo2zjs-nightly
pkgdesc = foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
pkgver = 20180920
- pkgrel = 1
+ pkgrel = 2
url = http://foo2zjs.rkkda.com/
install = foo2zjs.install
arch = i686
@@ -53,6 +53,8 @@ pkgbase = foo2zjs-nightly
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 = 0008-hplj10xx.rules-substitute-PREFIX.patch
+ source = 0009-hplj10xx.rules.in-run-firmware-loader-directly.patch
source = http://foo2hiperc.rkkda.com/icm/okic301.tar.gz
source = http://foo2hiperc.rkkda.com/icm/okic310.tar.gz
source = http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz
@@ -81,13 +83,15 @@ pkgbase = foo2zjs-nightly
source = listweb.patch
source = unweb.patch
sha256sums = SKIP
- sha256sums = f9b39a2e0d379d631e70e5e7499d310c50151783d1f5fc2ed4af1c68b2d10d15
- sha256sums = e55a9767886f517d794a06a5d272f87b4f26686a6058bc758841e0a13f7ede56
- sha256sums = 2e045dd9c7f04f5bf0dca1c8ff538ec52e3902f93e795ca6e4c089dff0dd77f8
- sha256sums = e4eb7d768d6f3c8d7a5387b2e23686b94576027f79912bbfec6db7856a8380a0
- sha256sums = 7f6d5e7d3c7631461eaa6b24f632e4ba0bfab11b29bc7ac3b1c0dfae4aa5a510
- sha256sums = 91329cb3cb34f72f7b5ea7663e0f421274da4393aaa91e8fa70240846ac7876f
- sha256sums = 9db83cb68d9277b6e0b4b607d5b662ac8935e5cee75a65bc7a000242c4528ed9
+ sha256sums = 430881c9ac27cddf584103445f91741ded6798b8a1e96c94e9153f9af4f70994
+ sha256sums = e00c67c20db3e035dbef9561b87289481741c7cc7e7a00594ade2b519f544f95
+ sha256sums = 60d6752a125e0c886f529514d005af573828c2c4c7781103f5edd1c9f03f040e
+ sha256sums = b6ec41a41c7a13223792daf1444803e389127885e5b2bdd932a1cb693143fd8f
+ sha256sums = 52f149a0e13a6d208fc49b8168a61349989b99ab2b2fdebf3334e23a38ed5c16
+ sha256sums = 89c929daedb6e7ad610676eabecfb9b1f1f5244ace2c443508c55171be340944
+ sha256sums = 2dddff7c7994e0a77bf4aace39f03167722a1db58092cd0744f5b9c5aa1bc465
+ sha256sums = 479156130620348bca6accb83f218563c3835133f179116e1f14adfcee70c997
+ sha256sums = 4a203e0bd83b184f796ec9f7fcc528d9838012db395d09ddce6da6d551ee8324
sha256sums = f2fffb9adb0d3a9be617fb760ee2ad416cf5a0473f8a7637a591355ef50cf029
sha256sums = 362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0
sha256sums = 5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608
diff --git a/0001-Makefile-DESTDIR-support.patch b/0001-Makefile-DESTDIR-support.patch
index eb6d7c941bc9..13274b0ba958 100644
--- a/0001-Makefile-DESTDIR-support.patch
+++ b/0001-Makefile-DESTDIR-support.patch
@@ -1,7 +1,7 @@
From 130ecd15116cf45d70a88be3870749888a571f8d 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/7] Makefile: DESTDIR support
+Subject: [PATCH 1/9] Makefile: DESTDIR support
---
Makefile | 27 ++++++++++++++-------------
diff --git a/0002-Makefile-general-fixes.patch b/0002-Makefile-general-fixes.patch
index ebb763080e3f..f0b2294635bc 100644
--- a/0002-Makefile-general-fixes.patch
+++ b/0002-Makefile-general-fixes.patch
@@ -1,7 +1,7 @@
From 0f4f8ae377fc6e5f5e92f0e732919a94ea6e6b07 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/7] Makefile: general fixes
+Subject: [PATCH 2/9] Makefile: general fixes
---
Makefile | 58 ++++++++++++++++++++++++++++----------------------------
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index d4cc734c3260..5badb1c13412 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,7 +1,7 @@
From fcdfba61f1288bfe15e887a2248380d7f696151f 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/7] Rework firmware loading
+Subject: [PATCH 3/9] Rework firmware loading
---
Makefile | 101 ++++++++-------------------
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index 26da699598c7..406ca2d5d656 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,7 +1,7 @@
From 3a0ebed262a7706faa25697d96f1967b058e8157 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/7] Makefile: fix generating *.ppd in-place
+Subject: [PATCH 4/9] Makefile: fix generating *.ppd in-place
---
Makefile | 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 7f9d5ca21fed..bafa507dd321 100644
--- a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
+++ b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,7 +1,7 @@
From 3f9cb399e0c847f7d3a47d8b6a5e2be10950f3a8 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/7] Makefile: leverage default rules as much as possible to
+Subject: [PATCH 5/9] Makefile: leverage default rules as much as possible to
fix behavior wrt user compile flags
---
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 9f81c466c19b..f13ff45f7019 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 87c6890e500d00f605530f842e187a67695f5908 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/7] Makefile: do not blacklist usblp (seems unnecessary;
+Subject: [PATCH 6/9] Makefile: do not blacklist usblp (seems unnecessary;
collateral damage reported)
---
diff --git a/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch b/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
index f922cc2ae790..771bce72447e 100644
--- a/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
+++ b/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
@@ -1,7 +1,7 @@
From a5060279e9f57e0fb6a3d66ff1512c954482c19e 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
+Subject: [PATCH 7/9] 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
diff --git a/0008-hplj10xx.rules-substitute-PREFIX.patch b/0008-hplj10xx.rules-substitute-PREFIX.patch
new file mode 100644
index 000000000000..3d9e6031abd3
--- /dev/null
+++ b/0008-hplj10xx.rules-substitute-PREFIX.patch
@@ -0,0 +1,53 @@
+From 95c0e0e37893fe3d3ab4feafb91cf91da9e916ba Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Tue, 9 Oct 2018 00:53:44 +0300
+Subject: [PATCH 8/9] hplj10xx.rules: substitute @PREFIX@
+
+---
+ Makefile | 10 ++++++++--
+ hplj10xx.rules => hplj10xx.rules.in | 0
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+ rename hplj10xx.rules => hplj10xx.rules.in (100%)
+
+diff --git a/Makefile b/Makefile
+index f4a806b..b7c6d34 100644
+--- a/Makefile
++++ b/Makefile
+@@ -221,7 +221,7 @@ FILES = \
+ usb_printerid.c \
+ usb_printerid.1in \
+ hplj1000 \
+- hplj10xx.rules* \
++ hplj10xx.rules \
+ msexpand \
+ oak.h \
+ foo2oak.c \
+@@ -299,7 +299,7 @@ MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
+ MANPAGES+= printer-profile.1
+ LIBJBG = jbig.o jbig_ar.o
+ BINPROGS=
+-MISC= foo2zjs-loadfw foo2zjs-loadfw@.service
++MISC= foo2zjs-loadfw foo2zjs-loadfw@.service hplj10xx.rules
+
+ # Compiler flags
+ #CFLAGS += -O2 -Wall -Wno-unused-but-set-variable
+@@ -491,6 +491,12 @@ foo2zjs-loadfw@.service: foo2zjs-loadfw@.service.in Makefile
+ -e 's:@PREFIX@:$(PREFIX):' || (rm -f $@ && exit 1)
+ chmod 444 $@
+
++hplj10xx.rules: hplj10xx.rules.in Makefile
++ [ ! -f $@ ] || chmod +w $@
++ sed < $@.in > $@ \
++ -e 's:@PREFIX@:$(PREFIX):' || (rm -f $@ && exit 1)
++ chmod 444 $@
++
+ foo2ddst-wrapper: foo2ddst-wrapper.in Makefile
+ [ ! -f $@ ] || chmod +w $@
+ sed < $@.in > $@ \
+diff --git a/hplj10xx.rules b/hplj10xx.rules.in
+similarity index 100%
+rename from hplj10xx.rules
+rename to hplj10xx.rules.in
+--
+2.19.0
+
diff --git a/0009-hplj10xx.rules.in-run-firmware-loader-directly.patch b/0009-hplj10xx.rules.in-run-firmware-loader-directly.patch
new file mode 100644
index 000000000000..b5ee9a098e59
--- /dev/null
+++ b/0009-hplj10xx.rules.in-run-firmware-loader-directly.patch
@@ -0,0 +1,26 @@
+From 1f3c60d28f2bbf118843795e4ac0c75e3efcf6b7 Mon Sep 17 00:00:00 2001
+From: Ivan Shapovalov <intelfx@intelfx.name>
+Date: Tue, 9 Oct 2018 00:54:14 +0300
+Subject: [PATCH 9/9] hplj10xx.rules.in: run firmware loader directly
+
+---
+ hplj10xx.rules.in | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/hplj10xx.rules.in b/hplj10xx.rules.in
+index dec1cdd..3f903a6 100644
+--- a/hplj10xx.rules.in
++++ b/hplj10xx.rules.in
+@@ -14,8 +14,6 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3f17", ENV{FOO2ZJS_FW_MODEL}="P1505"
+ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="4017", ENV{FOO2ZJS_FW_MODEL}="P1505n"
+ ENV{FOO2ZJS_FW_MODEL}=="", GOTO="foo2zjs_fw_end"
+
+-# Inherit the instance name from the parent unit's instance name (or unit name, if there is no instance name).
+-# In our case -- the printer's full devpath gets passed.
+-TAG+="systemd", ENV{SYSTEMD_WANTS}+="foo2zjs-loadfw@.service"
++RUN+="@PREFIX@/bin/foo2zjs-loadfw %S%p"
+
+ LABEL="foo2zjs_fw_end"
+--
+2.19.0
+
diff --git a/PKGBUILD b/PKGBUILD
index d0f2ce4d382b..5325c049ae5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=foo2zjs-nightly
pkgver=20180920
-pkgrel=1
+pkgrel=2
pkgdesc="foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
url="http://foo2zjs.rkkda.com/"
license=('GPL' 'custom')
@@ -27,6 +27,8 @@ _patches=(
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
+ 0008-hplj10xx.rules-substitute-PREFIX.patch
+ 0009-hplj10xx.rules.in-run-firmware-loader-directly.patch
)
_firmware=(
@@ -80,13 +82,15 @@ noextract=(
"${_firmware[@]##*/}"
)
sha256sums=('SKIP'
- 'f9b39a2e0d379d631e70e5e7499d310c50151783d1f5fc2ed4af1c68b2d10d15'
- 'e55a9767886f517d794a06a5d272f87b4f26686a6058bc758841e0a13f7ede56'
- '2e045dd9c7f04f5bf0dca1c8ff538ec52e3902f93e795ca6e4c089dff0dd77f8'
- 'e4eb7d768d6f3c8d7a5387b2e23686b94576027f79912bbfec6db7856a8380a0'
- '7f6d5e7d3c7631461eaa6b24f632e4ba0bfab11b29bc7ac3b1c0dfae4aa5a510'
- '91329cb3cb34f72f7b5ea7663e0f421274da4393aaa91e8fa70240846ac7876f'
- '9db83cb68d9277b6e0b4b607d5b662ac8935e5cee75a65bc7a000242c4528ed9'
+ '430881c9ac27cddf584103445f91741ded6798b8a1e96c94e9153f9af4f70994'
+ 'e00c67c20db3e035dbef9561b87289481741c7cc7e7a00594ade2b519f544f95'
+ '60d6752a125e0c886f529514d005af573828c2c4c7781103f5edd1c9f03f040e'
+ 'b6ec41a41c7a13223792daf1444803e389127885e5b2bdd932a1cb693143fd8f'
+ '52f149a0e13a6d208fc49b8168a61349989b99ab2b2fdebf3334e23a38ed5c16'
+ '89c929daedb6e7ad610676eabecfb9b1f1f5244ace2c443508c55171be340944'
+ '2dddff7c7994e0a77bf4aace39f03167722a1db58092cd0744f5b9c5aa1bc465'
+ '479156130620348bca6accb83f218563c3835133f179116e1f14adfcee70c997'
+ '4a203e0bd83b184f796ec9f7fcc528d9838012db395d09ddce6da6d551ee8324'
'f2fffb9adb0d3a9be617fb760ee2ad416cf5a0473f8a7637a591355ef50cf029'
'362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0'
'5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608'