summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--0001-Makefile-DESTDIR-support.patch6
-rw-r--r--0002-Makefile-general-fixes.patch6
-rw-r--r--0003-Rework-firmware-loading.patch6
-rw-r--r--0004-Makefile-fix-generating-.ppd-in-place.patch18
-rw-r--r--0005-Makefile-leverage-default-rules-as-much-as-possible-.patch6
-rw-r--r--0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch6
-rw-r--r--0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch8
-rw-r--r--PKGBUILD16
9 files changed, 45 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fd26a215fea3..f361eab1d888 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = foo2zjs-nightly
pkgdesc = foo2zjs Printer Drivers (automatically updated). Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
- pkgver = 20180519
+ pkgver = 20180920
pkgrel = 1
url = http://foo2zjs.rkkda.com/
install = foo2zjs.install
@@ -45,7 +45,7 @@ pkgbase = foo2zjs-nightly
noextract = km2430.tar.gz
options = !emptydirs
options = !ccache
- source = foo2zjs-20180519.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+ source = foo2zjs-20180920.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
@@ -81,13 +81,13 @@ pkgbase = foo2zjs-nightly
source = listweb.patch
source = unweb.patch
sha256sums = SKIP
- sha256sums = d12e2ffea475e5cbebc019069c2702ac8b3b8c91d753798b1c733875c242c7c9
- sha256sums = b087a81daae9ea61c2a6fb82b53e72fe05b0fde6ca5bde490121ef873b3c3205
- sha256sums = 572cdc9800e6a66b1e565f727067e7b31c0232385b1986fda7a0cac2303767f5
- sha256sums = b48d2d59a8575ccf1f0c7c53a694ab8a68b0822331a20be3ec8ee5d3712c1684
- sha256sums = 131a8f3fab237656fbaadac7ec3aacdc1d118d30b9f6a46bd63b03c2b06e2f49
- sha256sums = 6787431ba763653c75cd0e2699cbf6496710fddd0896bfdd60f8fa8d7625c6f4
- sha256sums = c704dc6989a9f005627ee7eca1e60a3cd57ec786e9812972624ddbc56b5cd3ec
+ sha256sums = f9b39a2e0d379d631e70e5e7499d310c50151783d1f5fc2ed4af1c68b2d10d15
+ sha256sums = e55a9767886f517d794a06a5d272f87b4f26686a6058bc758841e0a13f7ede56
+ sha256sums = 2e045dd9c7f04f5bf0dca1c8ff538ec52e3902f93e795ca6e4c089dff0dd77f8
+ sha256sums = e4eb7d768d6f3c8d7a5387b2e23686b94576027f79912bbfec6db7856a8380a0
+ sha256sums = 7f6d5e7d3c7631461eaa6b24f632e4ba0bfab11b29bc7ac3b1c0dfae4aa5a510
+ sha256sums = 91329cb3cb34f72f7b5ea7663e0f421274da4393aaa91e8fa70240846ac7876f
+ sha256sums = 9db83cb68d9277b6e0b4b607d5b662ac8935e5cee75a65bc7a000242c4528ed9
sha256sums = f2fffb9adb0d3a9be617fb760ee2ad416cf5a0473f8a7637a591355ef50cf029
sha256sums = 362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0
sha256sums = 5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608
diff --git a/0001-Makefile-DESTDIR-support.patch b/0001-Makefile-DESTDIR-support.patch
index b3486b4a81e0..eb6d7c941bc9 100644
--- a/0001-Makefile-DESTDIR-support.patch
+++ b/0001-Makefile-DESTDIR-support.patch
@@ -1,4 +1,4 @@
-From 37a1925c090e6960d2e01e2ebe3c759f3e190ebb Mon Sep 17 00:00:00 2001
+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
@@ -8,7 +8,7 @@ Subject: [PATCH 1/7] Makefile: DESTDIR support
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
-index 6287cbc..e58ce3a 100644
+index 7cc2094..2906fec 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ INSTALL=install
@@ -88,5 +88,5 @@ index 6287cbc..e58ce3a 100644
LIBUDEVDIR=/lib/udev/rules.d
RULES=hplj10xx.rules
--
-2.17.1
+2.19.0
diff --git a/0002-Makefile-general-fixes.patch b/0002-Makefile-general-fixes.patch
index 9a97ba163a70..ebb763080e3f 100644
--- a/0002-Makefile-general-fixes.patch
+++ b/0002-Makefile-general-fixes.patch
@@ -1,4 +1,4 @@
-From a50b72cf74ed3ea65776be1d25860899809c9950 Mon Sep 17 00:00:00 2001
+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
@@ -8,7 +8,7 @@ Subject: [PATCH 2/7] Makefile: general fixes
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/Makefile b/Makefile
-index e58ce3a..c19f0c4 100644
+index 2906fec..f18459f 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ FOODB=$(PREFIX)/share/foomatic/db/source
@@ -235,5 +235,5 @@ index e58ce3a..c19f0c4 100644
CUPSDCONF=/etc/cups/cupsd.conf
--
-2.17.1
+2.19.0
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index 583206f3b63d..d4cc734c3260 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,4 +1,4 @@
-From 101a7bea0ebcd50fbf7467128e628fcb24ad0b01 Mon Sep 17 00:00:00 2001
+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
@@ -15,7 +15,7 @@ Subject: [PATCH 3/7] Rework firmware loading
create mode 100644 usblp.conf
diff --git a/Makefile b/Makefile
-index c19f0c4..bac37c4 100644
+index f18459f..0956c79 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,7 @@ FILES = \
@@ -392,5 +392,5 @@ index 0000000..5a604bf
@@ -0,0 +1 @@
+blacklist usblp
--
-2.17.1
+2.19.0
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index d8e5ef8d7f22..26da699598c7 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,4 +1,4 @@
-From bb8cb495855b1d4fc9ba0037f6298d35ccda6cc1 Mon Sep 17 00:00:00 2001
+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
@@ -8,17 +8,17 @@ Subject: [PATCH 4/7] Makefile: fix generating *.ppd in-place
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
-index bac37c4..0365139 100644
+index 0956c79..18f9d5f 100644
--- a/Makefile
+++ b/Makefile
-@@ -1454,6 +1454,7 @@ ppd:
- *) driver=foo2zjs;; \
+@@ -1453,6 +1453,7 @@ ppd:
esac; \
echo $$driver - $$printer; \
-+ FOOMATICDB=foomatic-db \
- foomatic-ppdfile -d $$driver -p $$printer > PPD/$$printer.ppd; \
- #ENGINE=../foomatic/foomatic-db-engine; \
- #PERL5LIB=$$ENGINE/lib \
+ if true; then \
++ FOOMATICDB=foomatic-db \
+ foomatic-ppdfile -d $$driver -p $$printer > PPD/$$printer.ppd; \
+ else \
+ # 09/06/18: Use the older foomatic??? \
--
-2.17.1
+2.19.0
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 c2d557602984..7f9d5ca21fed 100644
--- a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
+++ b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,4 +1,4 @@
-From 5d5608db6e5d8999c594f8f955d810755030742c Mon Sep 17 00:00:00 2001
+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
@@ -10,7 +10,7 @@ Subject: [PATCH 5/7] Makefile: leverage default rules as much as possible to
2 files changed, 33 insertions(+), 80 deletions(-)
diff --git a/Makefile b/Makefile
-index 0365139..0b30c87 100644
+index 18f9d5f..8d112b9 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.17.1
+2.19.0
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 4fd15a75b07f..9f81c466c19b 100644
--- a/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
+++ b/0006-Makefile-do-not-blacklist-usblp-seems-unnecessary-co.patch
@@ -1,4 +1,4 @@
-From b747647bbf295c437fce85d5f26bad7a127a489e Mon Sep 17 00:00:00 2001
+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;
@@ -11,7 +11,7 @@ Subject: [PATCH 6/7] Makefile: do not blacklist usblp (seems unnecessary;
delete mode 100644 usblp.conf
diff --git a/Makefile b/Makefile
-index 0b30c87..dd13c5d 100644
+index 8d112b9..ea75080 100644
--- a/Makefile
+++ b/Makefile
@@ -924,12 +924,10 @@ install-gui:
@@ -44,5 +44,5 @@ index 5a604bf..0000000
@@ -1 +0,0 @@
-blacklist usblp
--
-2.17.1
+2.19.0
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 4f220eee6bdf..f922cc2ae790 100644
--- a/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
+++ b/0007-Makefile-create-manpages-in-subdirs-via-their-Makefi.patch
@@ -1,4 +1,4 @@
-From 646853351461539c95cca6b89accc4d06308407e Mon Sep 17 00:00:00 2001
+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
@@ -12,10 +12,10 @@ subdir Makefile.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index dd13c5d..5cbbb39 100644
+index ea75080..f4a806b 100644
--- a/Makefile
+++ b/Makefile
-@@ -1512,7 +1512,7 @@ install-doc: doc
+@@ -1514,7 +1514,7 @@ install-doc: doc
GROFF=/usr/local/test/bin/groff
GROFF=groff
@@ -25,5 +25,5 @@ index dd13c5d..5cbbb39 100644
`ls $(MANPAGES) \
icc2ps/foo2zjs-icc2ps.1 \
--
-2.17.1
+2.19.0
diff --git a/PKGBUILD b/PKGBUILD
index f8eb5d56f0db..d0f2ce4d382b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Muhammed Uluyol <uluyol0@gmail.com>
pkgname=foo2zjs-nightly
-pkgver=20180519
+pkgver=20180920
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/"
@@ -80,13 +80,13 @@ noextract=(
"${_firmware[@]##*/}"
)
sha256sums=('SKIP'
- 'd12e2ffea475e5cbebc019069c2702ac8b3b8c91d753798b1c733875c242c7c9'
- 'b087a81daae9ea61c2a6fb82b53e72fe05b0fde6ca5bde490121ef873b3c3205'
- '572cdc9800e6a66b1e565f727067e7b31c0232385b1986fda7a0cac2303767f5'
- 'b48d2d59a8575ccf1f0c7c53a694ab8a68b0822331a20be3ec8ee5d3712c1684'
- '131a8f3fab237656fbaadac7ec3aacdc1d118d30b9f6a46bd63b03c2b06e2f49'
- '6787431ba763653c75cd0e2699cbf6496710fddd0896bfdd60f8fa8d7625c6f4'
- 'c704dc6989a9f005627ee7eca1e60a3cd57ec786e9812972624ddbc56b5cd3ec'
+ 'f9b39a2e0d379d631e70e5e7499d310c50151783d1f5fc2ed4af1c68b2d10d15'
+ 'e55a9767886f517d794a06a5d272f87b4f26686a6058bc758841e0a13f7ede56'
+ '2e045dd9c7f04f5bf0dca1c8ff538ec52e3902f93e795ca6e4c089dff0dd77f8'
+ 'e4eb7d768d6f3c8d7a5387b2e23686b94576027f79912bbfec6db7856a8380a0'
+ '7f6d5e7d3c7631461eaa6b24f632e4ba0bfab11b29bc7ac3b1c0dfae4aa5a510'
+ '91329cb3cb34f72f7b5ea7663e0f421274da4393aaa91e8fa70240846ac7876f'
+ '9db83cb68d9277b6e0b4b607d5b662ac8935e5cee75a65bc7a000242c4528ed9'
'f2fffb9adb0d3a9be617fb760ee2ad416cf5a0473f8a7637a591355ef50cf029'
'362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0'
'5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608'